Fix a bug where Camera2 tried to start on FPS ranges multiplied by 1000.

webrtc/api/android/java/src/org/webrtc/Camera2Enumerator.java

Index: webrtc/api/android/java/src/org/webrtc/Camera2Enumerator.java
diff --git a/webrtc/api/android/java/src/org/webrtc/Camera2Enumerator.java b/webrtc/api/android/java/src/org/webrtc/Camera2Enumerator.java
index fe2b259d2c727af68bef49a2648562796a4b787b..3fd34ddd9236bfe59ff3b5816434c43718c9b8c1 100644
--- a/webrtc/api/android/java/src/org/webrtc/Camera2Enumerator.java
+++ b/webrtc/api/android/java/src/org/webrtc/Camera2Enumerator.java
@@ -97,21 +97,11 @@ public class Camera2Enumerator implements CameraEnumerator {
     return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
   }
 
-  static List<CaptureFormat.FramerateRange> getSupportedFramerateRanges(
-      CameraCharacteristics cameraCharacteristics) {
-    final Range<Integer>[] fpsRanges =
-        cameraCharacteristics.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES);
-
-    if (fpsRanges == null) {
-      return new ArrayList<CaptureFormat.FramerateRange>();
-    }
-
-    int maxFps = 0;
-    for (Range<Integer> fpsRange : fpsRanges) {
-      maxFps = Math.max(maxFps, fpsRange.getUpper());
+  static int getFpsUnitFactor(Range<Integer>[] fpsRanges) {
+    if (fpsRanges.length == 0) {
+      return 1000;
     }
-    int unitFactor = maxFps < 1000 ? 1000 : 1;
-    return convertFramerates(fpsRanges, unitFactor);
+    return fpsRanges[0].getUpper() < 1000 ? 1000 : 1;
   }
 
   static List<Size> getSupportedSizes(
@@ -152,8 +142,10 @@ public class Camera2Enumerator implements CameraEnumerator {
       final StreamConfigurationMap streamMap =
           cameraCharacteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
 
-      List<CaptureFormat.FramerateRange> framerateRanges = getSupportedFramerateRanges(
-          cameraCharacteristics);
+      Range<Integer>[] fpsRanges =
+          cameraCharacteristics.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES);
+      List<CaptureFormat.FramerateRange> framerateRanges =
+          convertFramerates(fpsRanges, getFpsUnitFactor(fpsRanges));
       List<Size> sizes = getSupportedSizes(cameraCharacteristics);
 
       int defaultMaxFps = 0;
@@ -195,7 +187,7 @@ public class Camera2Enumerator implements CameraEnumerator {
   }
 
   // Convert from android.util.Range<Integer> to CaptureFormat.FramerateRange.
-  private static List<CaptureFormat.FramerateRange> convertFramerates(
+  static List<CaptureFormat.FramerateRange> convertFramerates(
       Range<Integer>[] arrayRanges, int unitFactor) {
     final List<CaptureFormat.FramerateRange> ranges = new ArrayList<CaptureFormat.FramerateRange>();
     for (Range<Integer> range : arrayRanges) {