| Index: media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java
|
| diff --git a/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java b/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java
|
| index ae6018df908b16031a52bfed8a9ebc28cf4f2740..64c249ce1d4b78ece6fce903cde888061c9986e7 100644
|
| --- a/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java
|
| +++ b/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java
|
| @@ -117,6 +117,17 @@ class VideoCaptureFactory {
|
| }
|
|
|
| @CalledByNative
|
| + static int getCaptureApiType(int id, Context appContext) {
|
| + if (isLReleaseOrLater())
|
| + return VideoCaptureCamera2.getCaptureApiType(id, appContext);
|
| + else if (ChromiumCameraInfo.isSpecialCamera(id))
|
| + return VideoCaptureTango.getCaptureApiType(
|
| + ChromiumCameraInfo.toSpecialCameraId(id));
|
| + else
|
| + return VideoCaptureAndroid.getCaptureApiType(id);
|
| + }
|
| +
|
| + @CalledByNative
|
| static String getDeviceName(int id, Context appContext) {
|
| if (isLReleaseOrLater() && !VideoCaptureCamera2.isLegacyDevice(appContext, id)) {
|
| return VideoCaptureCamera2.getName(id, appContext);
|
|
|