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

Unified Diff: content/renderer/media/media_stream_video_track.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
Index: content/renderer/media/media_stream_video_track.cc
diff --git a/content/renderer/media/media_stream_video_track.cc b/content/renderer/media/media_stream_video_track.cc
index d5d966d96c02e3e9a3d2eeb586a84e3730a2a307..1d92473c2e78f61825c0f96c1e98478c038afba9 100644
--- a/content/renderer/media/media_stream_video_track.cc
+++ b/content/renderer/media/media_stream_video_track.cc
@@ -391,18 +391,24 @@ void MediaStreamVideoTrack::Stop() {
void MediaStreamVideoTrack::GetSettings(
blink::WebMediaStreamTrack::Settings& settings) {
DCHECK(main_render_thread_checker_.CalledOnValidThread());
+ if (!source_)
+ return;
+
if (width_ && height_) {
settings.width = width_;
settings.height = height_;
}
- if (!source_)
- return;
+ // 0.0 means the track is using the source's frame rate.
+ if (frame_rate_ != 0.0) {
+ settings.frame_rate = frame_rate_;
+ }
base::Optional<media::VideoCaptureFormat> format =
source_->GetCurrentFormat();
if (format) {
- settings.frame_rate = format->frame_rate;
+ if (frame_rate_ == 0.0)
+ settings.frame_rate = format->frame_rate;
settings.video_kind = GetVideoKindForFormat(*format);
}
switch (source_->device_info().device.video_facing) {
« no previous file with comments | « content/renderer/media/media_stream_video_track.h ('k') | content/renderer/media/media_stream_video_track_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698