Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(723)

Unified Diff: content/renderer/media/media_stream_video_source.cc

Issue 2817673004: Make MediaStreamVideoTrack::GetSettings return the track's frame rate. (Closed)
Patch Set: Remove unnecessary comments Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/media/media_stream_video_track.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_video_source.cc
diff --git a/content/renderer/media/media_stream_video_source.cc b/content/renderer/media/media_stream_video_source.cc
index af0e7ca16c2c6d1abfda720a02a6fe772d8ea123..0425cd3cdaf28ba7be1c4d9271d38d7ff1040235 100644
--- a/content/renderer/media/media_stream_video_source.cc
+++ b/content/renderer/media/media_stream_video_source.cc
@@ -651,7 +651,8 @@ void MediaStreamVideoSource::FinalizeAddTrackLegacy() {
VideoTrackAdapter::CalculateTargetSize(
current_format_.frame_size, gfx::Size(max_width, max_height),
min_aspect_ratio, max_aspect_ratio, &desired_size);
- track.track->SetTargetSize(desired_size.width(), desired_size.height());
+ track.track->SetTargetSizeAndFrameRate(
+ desired_size.width(), desired_size.height(), max_frame_rate);
}
DVLOG(3) << "FinalizeAddTrackLegacy() result " << result;
@@ -687,7 +688,9 @@ void MediaStreamVideoSource::FinalizeAddTrack() {
track.adapter_settings->max_height),
track.adapter_settings->min_aspect_ratio,
track.adapter_settings->max_aspect_ratio, &desired_size);
- track.track->SetTargetSize(desired_size.width(), desired_size.height());
+ track.track->SetTargetSizeAndFrameRate(
+ desired_size.width(), desired_size.height(),
+ track.adapter_settings->max_frame_rate);
}
if (!track.callback.is_null())
« no previous file with comments | « no previous file | content/renderer/media/media_stream_video_track.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698