Android Video Capture: Refactor VideoCapture class hierarchy

media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.media;
 
 import android.content.Context;
 import android.graphics.ImageFormat;
 import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * This class extends the VideoCapture base class for manipulating normal video
- * capture devices in Android, including receiving copies of preview frames via
- * Java-allocated buffers. It also includes class BuggyDeviceHack to deal with
- * troublesome devices.
+ * This class extends the VideoCaptureCamera base class for manipulating normal
+ * video capture devices in Android, including receiving copies of preview
+ * frames via Java-allocated buffers. It also includes class BuggyDeviceHack to
+ * deal with troublesome devices.
  **/
 @SuppressWarnings("deprecation")
-public class VideoCaptureAndroid extends VideoCapture {
+public class VideoCaptureAndroid extends VideoCaptureCamera {
 
     // Some devices don't support YV12 format correctly, even with JELLY_BEAN or
     // newer OS. To work around the issues on those devices, we have to request
     // NV21. Some other devices have troubles with certain capture resolutions
     // under a given one: for those, the resolution is swapped with a known
     // good. Both are supposed to be temporary hacks.
     private static class BuggyDeviceHack {
         private static class IdAndSizes {
             IdAndSizes(String model, String device, int minWidth, int minHeight) {
                 mModel = model;
@@ skipping 12 matching lines @@
         };
 
         private static final String[] COLORSPACE_BUGGY_DEVICE_LIST = {
             "SAMSUNG-SGH-I747",
             "ODROID-U2",
         };
 
         static void applyMinDimensions(CaptureFormat format) {
             // NOTE: this can discard requested aspect ratio considerations.
             for (IdAndSizes buggyDevice : CAPTURESIZE_BUGGY_DEVICE_LIST) {
-                if (buggyDevice.mModel.contentEquals(android.os.Build.MODEL) &&
-                        buggyDevice.mDevice.contentEquals(android.os.Build.DEVICE)) {
+                if (buggyDevice.mModel.contentEquals(android.os.Build.MODEL)
+                        && buggyDevice.mDevice.contentEquals(android.os.Build.DEVICE)) {
                     format.mWidth = (buggyDevice.mMinWidth > format.mWidth)
                             ? buggyDevice.mMinWidth : format.mWidth;
                     format.mHeight = (buggyDevice.mMinHeight > format.mHeight)
                             ? buggyDevice.mMinHeight : format.mHeight;
                 }
             }
         }
 
         static int getImageFormat() {
             if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) {
@@ skipping 11 matching lines @@
 
     private int mExpectedFrameSize;
     private static final int NUM_CAPTURE_BUFFERS = 3;
     private static final String TAG = "VideoCaptureAndroid";
 
     static int getNumberOfCameras() {
         return android.hardware.Camera.getNumberOfCameras();
     }
 
     static String getName(int id) {
-        android.hardware.Camera.CameraInfo cameraInfo = VideoCapture.getCameraInfo(id);
+        android.hardware.Camera.CameraInfo cameraInfo = VideoCaptureCamera.getCameraInfo(id);
         if (cameraInfo == null) return null;
-        return "camera " + id + ", facing " + (cameraInfo.facing ==
-                android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT ? "front" : "back");
+        return "camera " + id + ", facing " + (cameraInfo.facing
+                == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT ? "front" : "back");
     }
 
     static CaptureFormat[] getDeviceSupportedFormats(int id) {
         android.hardware.Camera camera;
         try {
             camera = android.hardware.Camera.open(id);
         } catch (RuntimeException ex) {
             Log.e(TAG, "Camera.open: " + ex);
             return null;
         }
@@ skipping 64 matching lines @@
             android.hardware.Camera.Parameters cameraParameters) {
         mCaptureFormat = new CaptureFormat(
                 width, height, frameRate, BuggyDeviceHack.getImageFormat());
         // Hack to avoid certain capture resolutions under a minimum one,
         // see http://crbug.com/305294.
         BuggyDeviceHack.applyMinDimensions(mCaptureFormat);
     }
 
     @Override
     protected void allocateBuffers() {
-        mExpectedFrameSize = mCaptureFormat.mWidth * mCaptureFormat.mHeight *
-                ImageFormat.getBitsPerPixel(mCaptureFormat.mPixelFormat) / 8;
+        mExpectedFrameSize = mCaptureFormat.mWidth * mCaptureFormat.mHeight
+                * ImageFormat.getBitsPerPixel(mCaptureFormat.mPixelFormat) / 8;
         for (int i = 0; i < NUM_CAPTURE_BUFFERS; i++) {
             byte[] buffer = new byte[mExpectedFrameSize];
             mCamera.addCallbackBuffer(buffer);
         }
     }
 
     @Override
     protected void setPreviewCallback(android.hardware.Camera.PreviewCallback cb) {
         mCamera.setPreviewCallbackWithBuffer(cb);
     }
@@ skipping 21 matching lines @@
             mPreviewBufferLock.unlock();
             if (camera != null) {
                 camera.addCallbackBuffer(data);
             }
         }
     }
 
     // TODO(wjia): investigate whether reading from texture could give better
     // performance and frame rate, using onFrameAvailable().
 }