Android: cleans up hand-written JNI for video_capture_device_android.cc

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

Index: media/base/android/java/src/org/chromium/media/VideoCapture.java
diff --git a/media/base/android/java/src/org/chromium/media/VideoCapture.java b/media/base/android/java/src/org/chromium/media/VideoCapture.java
index 4f66ef678e46e0725d831ffc86d36c467aae0696..0266558ca775fb32689f2756ab9bf1ece162e5d7 100644
--- a/media/base/android/java/src/org/chromium/media/VideoCapture.java
+++ b/media/base/android/java/src/org/chromium/media/VideoCapture.java
@@ -135,7 +135,8 @@ public class VideoCapture implements PreviewCallback, OnFrameAvailableListener {
                 }
             }
             if (minDiff == Integer.MAX_VALUE) {
-                Log.e(TAG, "allocate: can not find a resolution whose width is multiple of 32");
+                Log.e(TAG, "allocate: can not find a resolution whose width " +
+                           "is multiple of 32");
                 return false;
             }
             mCurrentCapability.mWidth = matchedWidth;
@@ -304,6 +305,44 @@ public class VideoCapture implements PreviewCallback, OnFrameAvailableListener {
     @Override
     public void onFrameAvailable(SurfaceTexture surfaceTexture) { }
 
+    private static class ChromiumCameraInfo {
+        private final int mId;
+        private final Camera.CameraInfo mCameraInfo;
+
+        private ChromiumCameraInfo(int index) {
+            mId = index;
+            mCameraInfo = new Camera.CameraInfo();
+            Camera.getCameraInfo(index, mCameraInfo);
+        }
+
+        @CalledByNative("ChromiumCameraInfo")
+        private static int getNumberOfCameras() {
+            return Camera.getNumberOfCameras();
+        }
+
+        @CalledByNative("ChromiumCameraInfo")
+        private static ChromiumCameraInfo getAt(int index) {
+            return new ChromiumCameraInfo(index);
+        }
+
+        @CalledByNative("ChromiumCameraInfo")
+        private int getId() {
+            return mId;
+        }
+
+        @CalledByNative("ChromiumCameraInfo")
+        private String getDeviceName() {
+            return  "camera " + mId + ", facing " +
+                    (mCameraInfo.facing ==
+                     Camera.CameraInfo.CAMERA_FACING_FRONT ? "front" : "back");
+        }
+
+        @CalledByNative("ChromiumCameraInfo")
+        private int getOrientation() {
+            return mCameraInfo.orientation;
+        }
+    }
+
     private native void nativeOnFrameAvailable(
             int nativeVideoCaptureDeviceAndroid,
             byte[] data,