Revert of Android: Add FramerateRange class

webrtc/api/java/android/org/webrtc/CameraEnumerationAndroid.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 25 matching lines @@
     CameraEnumerationAndroid.enumerator = enumerator;
   }
 
   public static synchronized List<CaptureFormat> getSupportedFormats(int cameraId) {
     final List<CaptureFormat> formats = enumerator.getSupportedFormats(cameraId);
     Logging.d(TAG, "Supported formats for camera " + cameraId + ": " + formats);
     return formats;
   }
 
   public static class CaptureFormat {
-    // Class to represent a framerate range. The framerate varies because of lightning conditions.
-    // The values are multiplied by 1000, so 1000 represents one frame per second.
-    public static class FramerateRange {
-      public int min;
-      public int max;
-
-      public FramerateRange(int min, int max) {
-        this.min = min;
-        this.max = max;
-      }
-
-      @Override
-      public String toString() {
-        return "[" + (min / 1000.0f) + ":" + (max / 1000.0f) + "]";
-      }
-
-      @Override
-      public boolean equals(Object other) {
-        if (!(other instanceof FramerateRange)) {
-          return false;
-        }
-        final FramerateRange otherFramerate = (FramerateRange) other;
-        return min == otherFramerate.min && max == otherFramerate.max;
-      }
-
-      @Override
-      public int hashCode() {
-        // Use prime close to 2^16 to avoid collisions for normal values less than 2^16.
-        return 1 + 65537 * min + max;
-      }
-    }
-
     public final int width;
     public final int height;
-    public final FramerateRange framerate;
+    public final int maxFramerate;
+    public final int minFramerate;
     // TODO(hbos): If VideoCapturer.startCapture is updated to support other image formats then this
     // needs to be updated and VideoCapturer.getSupportedFormats need to return CaptureFormats of
     // all imageFormats.
     public final int imageFormat = ImageFormat.NV21;
 
-    public CaptureFormat(int width, int height, int minFramerate, int maxFramerate) {
+    public CaptureFormat(int width, int height, int minFramerate,
+        int maxFramerate) {
       this.width = width;
       this.height = height;
-      this.framerate = new FramerateRange(minFramerate, maxFramerate);
-    }
-
-    public CaptureFormat(int width, int height, FramerateRange framerate) {
-      this.width = width;
-      this.height = height;
-      this.framerate = framerate;
+      this.minFramerate = minFramerate;
+      this.maxFramerate = maxFramerate;
     }
 
     // Calculates the frame size of this capture format.
     public int frameSize() {
       return frameSize(width, height, imageFormat);
     }
 
     // Calculates the frame size of the specified image format. Currently only
     // supporting ImageFormat.NV21.
     // The size is width * height * number of bytes per pixel.
     // http://developer.android.com/reference/android/hardware/Camera.html#addCallbackBuffer(byte[])
     public static int frameSize(int width, int height, int imageFormat) {
       if (imageFormat != ImageFormat.NV21) {
         throw new UnsupportedOperationException("Don't know how to calculate "
             + "the frame size of non-NV21 image formats.");
       }
       return (width * height * ImageFormat.getBitsPerPixel(imageFormat)) / 8;
     }
 
     @Override
     public String toString() {
-      return width + "x" + height + "@" + framerate;
+      return width + "x" + height + "@[" + minFramerate + ":" + maxFramerate + "]";
     }
 
     public boolean isSameFormat(final CaptureFormat that) {
       if (that == null) {
         return false;
       }
-      return width == that.width && height == that.height && framerate.equals(that.framerate);
+      return width == that.width && height == that.height && maxFramerate == that.maxFramerate
+          && minFramerate == that.minFramerate;
     }
   }
 
   // Returns device names that can be used to create a new VideoCapturerAndroid.
   public static String[] getDeviceNames() {
     String[] names = new String[android.hardware.Camera.getNumberOfCameras()];
     for (int i = 0; i < android.hardware.Camera.getNumberOfCameras(); ++i) {
       names[i] = getDeviceName(i);
     }
     return names;
@@ skipping 26 matching lines @@
   public static String getNameOfFrontFacingDevice() {
     return getNameOfDevice(android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT);
   }
 
   // Returns the name of the back facing camera. Returns null if the
   // camera can not be used or does not exist.
   public static String getNameOfBackFacingDevice() {
     return getNameOfDevice(android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK);
   }
 
-  // Helper class for finding the closest supported format for the two functions below. It creates a
-  // comparator based on the difference to some requested parameters, where the element with the
-  // minimum difference is the element that is closest to the requested parameters.
+  // Helper class for finding the closest supported format for the two functions below.
   private static abstract class ClosestComparator<T> implements Comparator<T> {
     // Difference between supported and requested parameter.
     abstract int diff(T supportedParameter);
 
     @Override
     public int compare(T t1, T t2) {
       return diff(t1) - diff(t2);
     }
   }
 
-  public static CaptureFormat.FramerateRange getClosestSupportedFramerateRange(
-      List<CaptureFormat.FramerateRange> supportedFramerates, final int requestedFps) {
-    return Collections.min(supportedFramerates,
-        new ClosestComparator<CaptureFormat.FramerateRange>() {
-          private static final int MAX_FPS_WEIGHT = 10;
-
-          @Override
-          int diff(CaptureFormat.FramerateRange range) {
-            return range.min + MAX_FPS_WEIGHT * abs(requestedFps * 1000 - range.max);
+  public static int[] getFramerateRange(android.hardware.Camera.Parameters parameters,
+      final int framerate) {
+    List<int[]> listFpsRange = parameters.getSupportedPreviewFpsRange();
+    if (listFpsRange.isEmpty()) {
+      Logging.w(TAG, "No supported preview fps range");
+      return new int[]{0, 0};
+    }
+    return Collections.min(listFpsRange,
+        new ClosestComparator<int[]>() {
+          @Override int diff(int[] range) {
+            final int maxFpsWeight = 10;
+            return range[android.hardware.Camera.Parameters.PREVIEW_FPS_MIN_INDEX]
+                + maxFpsWeight * abs(framerate
+                    - range[android.hardware.Camera.Parameters.PREVIEW_FPS_MAX_INDEX]);
           }
      });
   }
 
   public static android.hardware.Camera.Size getClosestSupportedSize(
       List<android.hardware.Camera.Size> supportedSizes, final int requestedWidth,
       final int requestedHeight) {
     return Collections.min(supportedSizes,
         new ClosestComparator<android.hardware.Camera.Size>() {
           @Override int diff(android.hardware.Camera.Size size) {
@@ skipping 10 matching lines @@
         if (info.facing == facing) {
           return getDeviceName(i);
         }
       } catch (Exception e) {
         Logging.e(TAG, "getCameraInfo() failed on index " + i, e);
       }
     }
     return null;
   }
 }