Revert of Android: Change camera fps range selection

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 163 matching lines @@
   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);
     }
   }
 
-  // Prefer a fps range with an upper bound close to |framerate|. Also prefer a fps range with a low
-  // lower bound, to allow the framerate to fluctuate based on lightning conditions.
   public static CaptureFormat.FramerateRange getClosestSupportedFramerateRange(
       List<CaptureFormat.FramerateRange> supportedFramerates, final int requestedFps) {
     return Collections.min(supportedFramerates,
         new ClosestComparator<CaptureFormat.FramerateRange>() {
-          // Progressive penalty if the upper bound is further away than |MAX_FPS_DIFF_THRESHOLD|
-          // from requested.
-          private static final int MAX_FPS_DIFF_THRESHOLD = 5000;
-          private static final int MAX_FPS_LOW_DIFF_WEIGHT = 1;
-          private static final int MAX_FPS_HIGH_DIFF_WEIGHT = 3;
-
-          // Progressive penalty if the lower bound is bigger than |MIN_FPS_THRESHOLD|.
-          private static final int MIN_FPS_THRESHOLD = 8000;
-          private static final int MIN_FPS_LOW_VALUE_WEIGHT = 1;
-          private static final int MIN_FPS_HIGH_VALUE_WEIGHT = 4;
-
-          // Use one weight for small |value| less than |threshold|, and another weight above.
-          private int progressivePenalty(int value, int threshold, int lowWeight, int highWeight) {
-            return (value < threshold)
-                ? value * lowWeight
-                : threshold * lowWeight + (value - threshold) * highWeight;
-          }
+          private static final int MAX_FPS_WEIGHT = 10;
 
           @Override
           int diff(CaptureFormat.FramerateRange range) {
-            final int minFpsError = progressivePenalty(range.min,
-                MIN_FPS_THRESHOLD, MIN_FPS_LOW_VALUE_WEIGHT, MIN_FPS_HIGH_VALUE_WEIGHT);
-            final int maxFpsError = progressivePenalty(Math.abs(requestedFps * 1000 - range.max),
-                MAX_FPS_DIFF_THRESHOLD, MAX_FPS_LOW_DIFF_WEIGHT, MAX_FPS_HIGH_DIFF_WEIGHT);
-            return minFpsError + maxFpsError;
+            return range.min + MAX_FPS_WEIGHT * abs(requestedFps * 1000 - range.max);
           }
      });
   }
 
   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;
   }
 }