Chromium Code Reviews| Index: media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java |
| diff --git a/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java b/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java |
| index 1682b7fbf1b68d5d4931cc4203fb5cf791515ae2..7c22804fb5ed99c24f8af540e5a368e558d4022e 100644 |
| --- a/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java |
| +++ b/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java |
| @@ -51,9 +51,17 @@ public class VideoCaptureAndroid extends VideoCaptureCamera { |
| return android.hardware.Camera.getNumberOfCameras(); |
| } |
| + static int getCaptureApiType(int id) { |
| + if (VideoCaptureCamera.getCameraInfo(id) == null) |
| + return CaptureApiType.API_TYPE_UNKNOWN; |
| + return CaptureApiType.API1; |
| + } |
| + |
| static String getName(int id) { |
| android.hardware.Camera.CameraInfo cameraInfo = VideoCaptureCamera.getCameraInfo(id); |
| - if (cameraInfo == null) return null; |
| + if (cameraInfo == null) { |
| + return null; |
|
mcasas
2015/03/19 01:55:14
Why the change? See the third box of
https://sour
emircan
2015/03/19 19:52:23
Done.
|
| + } |
| return "camera " + id + ", facing " + (cameraInfo.facing |
| == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT ? "front" : "back"); |
| } |