Fix error prone code in VideoCapturerAndroid

talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.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 341 matching lines @@
       EGLContext sharedContext) {
     Logging.d(TAG, "VideoCapturerAndroid");
     this.id = cameraId;
     this.eventsHandler = eventsHandler;
     cameraThread = new HandlerThread(TAG);
     cameraThread.start();
     cameraThreadHandler = new Handler(cameraThread.getLooper());
     videoBuffers = new FramePool(cameraThread);
     isCapturingToTexture = (sharedContext != null);
     cameraStatistics =
-        new CameraStatistics(isCapturingToTexture ? 1 : videoBuffers.numCaptureBuffers);
+        new CameraStatistics(isCapturingToTexture ? 1 : FramePool.NUMBER_OF_CAPTURE_BUFFERS);
     surfaceHelper = SurfaceTextureHelper.create(
         isCapturingToTexture ? sharedContext : EGL10.EGL_NO_CONTEXT, cameraThreadHandler);
     if (isCapturingToTexture) {
       surfaceHelper.setListener(this);
     }
   }
 
   private void checkIsOnCameraThread() {
     if (Thread.currentThread() != cameraThread) {
       throw new IllegalStateException("Wrong thread");
@@ skipping 156 matching lines @@
     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,
         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.equals(this.captureFormat)) {
+    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.
@@ skipping 221 matching lines @@
 
   // Class used for allocating and bookkeeping video frames. All buffers are
   // direct allocated so that they can be directly used from native code. This class is
   // not thread-safe, and enforces single thread use.
   private static class FramePool {
     // Thread that all calls should be made on.
     private final Thread thread;
     // Arbitrary queue depth.  Higher number means more memory allocated & held,
     // lower number means more sensitivity to processing time in the client (and
     // potentially stalling the capturer if it runs out of buffers to write to).
-    public static final int numCaptureBuffers = 3;
+    public static final int NUMBER_OF_CAPTURE_BUFFERS = 3;
     // This container tracks the buffers added as camera callback buffers. It is needed for finding
     // the corresponding ByteBuffer given a byte[].
     private final Map<byte[], ByteBuffer> queuedBuffers = new IdentityHashMap<byte[], ByteBuffer>();
     // This container tracks the frames that have been sent but not returned. It is needed for
     // keeping the buffers alive and for finding the corresponding ByteBuffer given a timestamp.
     private final Map<Long, ByteBuffer> pendingBuffers = new HashMap<Long, ByteBuffer>();
     private int frameSize = 0;
     private android.hardware.Camera camera;
 
     public FramePool(Thread thread) {
       this.thread = thread;
     }
 
     private void checkIsOnValidThread() {
       if (Thread.currentThread() != thread) {
         throw new IllegalStateException("Wrong thread");
       }
     }
 
     // Discards previous queued buffers and adds new callback buffers to camera.
     public void queueCameraBuffers(int frameSize, android.hardware.Camera camera) {
       checkIsOnValidThread();
       this.camera = camera;
       this.frameSize = frameSize;
 
       queuedBuffers.clear();
-      for (int i = 0; i < numCaptureBuffers; ++i) {
+      for (int i = 0; i < NUMBER_OF_CAPTURE_BUFFERS; ++i) {
         final ByteBuffer buffer = ByteBuffer.allocateDirect(frameSize);
         camera.addCallbackBuffer(buffer.array());
         queuedBuffers.put(buffer.array(), buffer);
       }
-      Logging.d(TAG, "queueCameraBuffers enqueued " + numCaptureBuffers
+      Logging.d(TAG, "queueCameraBuffers enqueued " + NUMBER_OF_CAPTURE_BUFFERS
           + " buffers of size " + frameSize + ".");
     }
 
     public void stopReturnBuffersToCamera() {
       checkIsOnValidThread();
       this.camera = null;
       queuedBuffers.clear();
       // Frames in |pendingBuffers| need to be kept alive until they are returned.
     }
 
@@ skipping 114 matching lines @@
     private native void nativeOnByteBufferFrameCaptured(long nativeCapturer,
         byte[] data, int length, int width, int height, int rotation, long timeStamp);
     private native void nativeOnTextureFrameCaptured(long nativeCapturer, int width, int height,
         int oesTextureId, float[] transformMatrix, long timestamp);
     private native void nativeOnOutputFormatRequest(long nativeCapturer,
         int width, int height, int framerate);
   }
 
   private static native long nativeCreateVideoCapturer(VideoCapturerAndroid videoCapturer);
 }