Fix error prone code in VideoCapturerAndroid

talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java

 /*
  * libjingle
  * Copyright 2015 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 95 matching lines @@
     // Rounds up |x| to the closest value that is a multiple of |alignment|.
     private static int roundUp(int x, int alignment) {
       return (int)ceil(x / (double)alignment) * alignment;
     }
 
     @Override
     public String toString() {
       return width + "x" + height + "@[" + minFramerate + ":" + maxFramerate + "]";
     }
 
-    @Override
-    public boolean equals(Object that) {
-      if (!(that instanceof CaptureFormat)) {
+    public boolean isSameFormat(final CaptureFormat that) {
+      if (that == null) {
         return false;
       }
-      final CaptureFormat c = (CaptureFormat) that;
-      return width == c.width && height == c.height && maxFramerate == c.maxFramerate
-          && minFramerate == c.minFramerate;
+      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 62 matching lines @@
   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 MAX_FPS_WEIGHT = 10;

[magjed_webrtc, 2015/12/03 11:07:35]

Has this anything to do with bug=5282? You should name it |maxFpsWeight| instead
of |MAX_FPS_WEIGHT|:
"Even when final and immutable, local variables are not considered to be
constants, and should not be styled as constants."

[perkj_webrtc, 2015/12/04 07:40:53]

Done.

             return range[android.hardware.Camera.Parameters.PREVIEW_FPS_MIN_INDEX]
-                + 10 * abs(framerate
+                + MAX_FPS_WEIGHT * 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>() {
@@ skipping 11 matching lines @@
         if (info.facing == facing) {
           return getDeviceName(i);
         }
       } catch (Exception e) {
         Logging.e(TAG, "getCameraInfo() failed on index " + i, e);
       }
     }
     return null;
   }
 }