| 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..a235e9f9ea556270e219549f857dc131c4f144ed 100644
|
| --- a/media/base/android/java/src/org/chromium/media/VideoCapture.java
|
| +++ b/media/base/android/java/src/org/chromium/media/VideoCapture.java
|
| @@ -304,6 +304,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,
|
|
|