Reland: Move VideoCapture* files from media/base/android/... to media/capture/video/android/java/...

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

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
deleted file mode 100644
index 7c70c9d072be100c85f1f9c69d44951707bd1fe5..0000000000000000000000000000000000000000
--- a/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java
+++ /dev/null
@@ -1,172 +0,0 @@
-// 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.Manifest;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Build;
-
-import org.chromium.base.Log;
-import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JNINamespace;
-
-/**
- * This class implements a factory of Android Video Capture objects for Chrome.
- * The static createVideoCapture() returns either a "normal" VideoCaptureAndroid
- * or a "special" VideoCaptureTango. Cameras are identified by |id|, where Tango
- * cameras have |id| above the standard ones. Video Capture objects allocated
- * via createVideoCapture() are explicitly owned by the caller.
- * ChromiumCameraInfo is an internal class with some static methods needed from
- * the rest of the class to manipulate the |id|s of normal and special devices.
- **/
-@JNINamespace("media")
-@SuppressWarnings("deprecation")
-class VideoCaptureFactory {
-
-    // Internal class to encapsulate camera device id manipulations.
-    static class ChromiumCameraInfo {
-        // Special devices have more cameras than usual. Those devices are
-        // identified by model & device. Currently only the Tango is supported.
-        // Note that these devices have no Camera.CameraInfo.
-        private static final String[][] SPECIAL_DEVICE_LIST = {
-            {"Peanut", "peanut"},
-        };
-        private static int sNumberOfSystemCameras = -1;
-        private static final String TAG = "cr.media";
-
-        private static boolean isSpecialDevice() {
-            for (String[] device : SPECIAL_DEVICE_LIST) {
-                if (device[0].contentEquals(android.os.Build.MODEL)
-                        && device[1].contentEquals(android.os.Build.DEVICE)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        private static boolean isSpecialCamera(int id) {
-            return id >= sNumberOfSystemCameras;
-        }
-
-        private static int toSpecialCameraId(int id) {
-            assert isSpecialCamera(id);
-            return id - sNumberOfSystemCameras;
-        }
-
-        private static int getNumberOfCameras(Context appContext) {
-            if (sNumberOfSystemCameras == -1) {
-                // getNumberOfCameras() would not fail due to lack of permission, but the
-                // following operations on camera would. "No permission" isn't a fatal
-                // error in WebView, specially for those applications which have no purpose
-                // to use a camera, but "load page" requires it. So, output a warning log
-                // and carry on pretending the system has no camera(s).  This optimization
-                // applies only to pre-M on Android because that is when runtime permissions
-                // were introduced.
-                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M
-                        && appContext.getPackageManager().checkPermission(
-                                   Manifest.permission.CAMERA, appContext.getPackageName())
-                                != PackageManager.PERMISSION_GRANTED) {
-                    sNumberOfSystemCameras = 0;
-                    Log.w(TAG, "Missing android.permission.CAMERA permission, "
-                            + "no system camera available.");
-                } else {
-                    if (isLReleaseOrLater()) {
-                        sNumberOfSystemCameras =
-                                VideoCaptureCamera2.getNumberOfCameras(appContext);
-                    } else {
-                        sNumberOfSystemCameras = VideoCaptureAndroid.getNumberOfCameras();
-                        if (isSpecialDevice()) {
-                            Log.d(TAG, "Special device: %s", android.os.Build.MODEL);
-                            sNumberOfSystemCameras += VideoCaptureTango.numberOfCameras();
-                        }
-                    }
-                }
-            }
-            return sNumberOfSystemCameras;
-        }
-    }
-
-    private static boolean isLReleaseOrLater() {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
-    }
-
-    // Factory methods.
-    @CalledByNative
-    static VideoCapture createVideoCapture(
-            Context context, int id, long nativeVideoCaptureDeviceAndroid) {
-        if (isLReleaseOrLater() && !VideoCaptureCamera2.isLegacyDevice(context, id)) {
-            return new VideoCaptureCamera2(context,
-                                           id,
-                                           nativeVideoCaptureDeviceAndroid);
-        }
-        if (!ChromiumCameraInfo.isSpecialCamera(id)) {
-            return new VideoCaptureAndroid(context,
-                                           id,
-                                           nativeVideoCaptureDeviceAndroid);
-        }
-        return new VideoCaptureTango(context,
-                                     ChromiumCameraInfo.toSpecialCameraId(id),
-                                     nativeVideoCaptureDeviceAndroid);
-    }
-
-    @CalledByNative
-    static int getNumberOfCameras(Context appContext) {
-        return ChromiumCameraInfo.getNumberOfCameras(appContext);
-    }
-
-    @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);
-        }
-        return (ChromiumCameraInfo.isSpecialCamera(id))
-                ? VideoCaptureTango.getName(ChromiumCameraInfo.toSpecialCameraId(id))
-                : VideoCaptureAndroid.getName(id);
-    }
-
-    @CalledByNative
-    static VideoCaptureFormat[] getDeviceSupportedFormats(Context appContext, int id) {
-        if (isLReleaseOrLater() && !VideoCaptureCamera2.isLegacyDevice(appContext, id)) {
-            return VideoCaptureCamera2.getDeviceSupportedFormats(appContext, id);
-        }
-        return ChromiumCameraInfo.isSpecialCamera(id)
-                ? VideoCaptureTango.getDeviceSupportedFormats(
-                        ChromiumCameraInfo.toSpecialCameraId(id))
-                : VideoCaptureAndroid.getDeviceSupportedFormats(id);
-    }
-
-    @CalledByNative
-    static int getCaptureFormatWidth(VideoCaptureFormat format) {
-        return format.getWidth();
-    }
-
-    @CalledByNative
-    static int getCaptureFormatHeight(VideoCaptureFormat format) {
-        return format.getHeight();
-    }
-
-    @CalledByNative
-    static int getCaptureFormatFramerate(VideoCaptureFormat format) {
-        return format.getFramerate();
-    }
-
-    @CalledByNative
-    static int getCaptureFormatPixelFormat(VideoCaptureFormat format) {
-        return format.getPixelFormat();
-    }
-}