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

Unified Diff: talk/app/webrtc/videosource.cc

Issue 1308953004: AndroidVideoCapturer: Delegate framerate choice to VideoCapturerAndroid.java (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: return true Created 5 years, 4 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 | « talk/app/webrtc/androidvideocapturer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/videosource.cc
diff --git a/talk/app/webrtc/videosource.cc b/talk/app/webrtc/videosource.cc
index d6e92b0f33385437da37d8f9a53e8f4073c7290d..bb27b10bcdf54a56b2f131330ae640611c925af2 100644
--- a/talk/app/webrtc/videosource.cc
+++ b/talk/app/webrtc/videosource.cc
@@ -157,12 +157,9 @@ bool NewFormatWithConstraints(
value = 1;
}
}
- if (value <= cricket::VideoFormat::IntervalToFps(format_in.interval)) {
+ if (value <= cricket::VideoFormat::IntervalToFps(format_in.interval))
format_out->interval = cricket::VideoFormat::FpsToInterval(value);
- return true;
- } else {
- return false;
magjed_webrtc 2015/08/27 13:50:23 I removed this because it looks like a bug to me.
- }
+ return true;
} else if (constraint.key == MediaConstraintsInterface::kMinAspectRatio) {
double value = rtc::FromString<double>(constraint.value);
// The aspect ratio in |constraint.value| has been converted to a string and
« no previous file with comments | « talk/app/webrtc/androidvideocapturer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698