Revert of Android: Add FramerateRange class

webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 396 matching lines @@
       Logging.e(TAG, "Calling startPreviewOnCameraThread on stopped camera.");
       return;
     }
 
     requestedWidth = width;
     requestedHeight = height;
     requestedFramerate = framerate;
 
     // Find closest supported format for |width| x |height| @ |framerate|.
     final android.hardware.Camera.Parameters parameters = camera.getParameters();
-    final List<CaptureFormat.FramerateRange> supportedFramerates =
-        CameraEnumerator.convertFramerates(parameters.getSupportedPreviewFpsRange());
-    Logging.d(TAG, "Available fps ranges: " + supportedFramerates);
-
-    final CaptureFormat.FramerateRange bestFpsRange;
-    if (supportedFramerates.isEmpty()) {
-      Logging.w(TAG, "No supported preview fps range");
-      bestFpsRange = new CaptureFormat.FramerateRange(0, 0);
-    } else {
-      bestFpsRange = CameraEnumerationAndroid.getClosestSupportedFramerateRange(
-            supportedFramerates, framerate);
+    for (int[] fpsRange : parameters.getSupportedPreviewFpsRange()) {
+      Logging.d(TAG, "Available fps range: " +
+          fpsRange[android.hardware.Camera.Parameters.PREVIEW_FPS_MIN_INDEX] + ":" +
+          fpsRange[android.hardware.Camera.Parameters.PREVIEW_FPS_MAX_INDEX]);
     }
-
+    final int[] range = CameraEnumerationAndroid.getFramerateRange(parameters, framerate * 1000);
     final android.hardware.Camera.Size previewSize =
         CameraEnumerationAndroid.getClosestSupportedSize(
             parameters.getSupportedPreviewSizes(), width, height);
     final CaptureFormat captureFormat = new CaptureFormat(
-        previewSize.width, previewSize.height, bestFpsRange);
+        previewSize.width, previewSize.height,
+        range[android.hardware.Camera.Parameters.PREVIEW_FPS_MIN_INDEX],
+        range[android.hardware.Camera.Parameters.PREVIEW_FPS_MAX_INDEX]);
 
     // Check if we are already using this capture format, then we don't need to do anything.
     if (captureFormat.isSameFormat(this.captureFormat)) {
       return;
     }
 
     // Update camera parameters.
     Logging.d(TAG, "isVideoStabilizationSupported: " +
         parameters.isVideoStabilizationSupported());
     if (parameters.isVideoStabilizationSupported()) {
       parameters.setVideoStabilization(true);
     }
     // Note: setRecordingHint(true) actually decrease frame rate on N5.
     // parameters.setRecordingHint(true);
-    if (captureFormat.framerate.max > 0) {
-      parameters.setPreviewFpsRange(captureFormat.framerate.min, captureFormat.framerate.max);
+    if (captureFormat.maxFramerate > 0) {
+      parameters.setPreviewFpsRange(captureFormat.minFramerate, captureFormat.maxFramerate);
     }
     parameters.setPreviewSize(captureFormat.width, captureFormat.height);
 
     if (!isCapturingToTexture) {
       parameters.setPreviewFormat(captureFormat.imageFormat);
     }
     // Picture size is for taking pictures and not for preview/video, but we need to set it anyway
     // as a workaround for an aspect ratio problem on Nexus 7.
     final android.hardware.Camera.Size pictureSize =
         CameraEnumerationAndroid.getClosestSupportedSize(
@@ skipping 203 matching lines @@
       // Undo the mirror that the OS "helps" us with.
       // http://developer.android.com/reference/android/hardware/Camera.html#setDisplayOrientation(int)
       transformMatrix =
           RendererCommon.multiplyMatrices(transformMatrix, RendererCommon.horizontalFlipMatrix());
     }
     cameraStatistics.addFrame();
     frameObserver.onTextureFrameCaptured(captureFormat.width, captureFormat.height, oesTextureId,
         transformMatrix, rotation, timestampNs);
   }
 }