AndroidVideoCapturer: Delegate framerate choice to VideoCapturerAndroid.java

talk/app/webrtc/videosource.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 139 matching lines @@
     int value = rtc::FromString<int>(constraint.value);
     if (value == 0) {
       if (mandatory) {
         // TODO(ronghuawu): Convert the constraint value to float when sub-1fps
         // is supported by the capturer.
         return false;
       } else {
         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. We should not filter out
formats where supportedFps < constraint.kMaxFrameRate.

-    }
+    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
     // back to a double, so it may have a rounding error.
     // E.g if the value 1/3 is converted to a string, the string will not have
     // infinite length.
     // We add a margin of 0.0005 which is high enough to detect the same aspect
     // ratio but small enough to avoid matching wrong aspect ratios.
     double ratio = static_cast<double>(format_in.width) / format_in.height;
     return  (value <= ratio + kRoundingTruncation);
@@ skipping 289 matching lines @@
 }
 
 void VideoSource::SetState(SourceState new_state) {
   if (VERIFY(state_ != new_state)) {
     state_ = new_state;
     FireOnChanged();
   }
 }
 
 }  // namespace webrtc