Combine webrtc/api/java/android and webrtc/api/java/src.

webrtc/api/java/android/org/webrtc/Camera1Enumerator.java

Index: webrtc/api/java/android/org/webrtc/Camera1Enumerator.java
diff --git a/webrtc/api/java/android/org/webrtc/Camera1Enumerator.java b/webrtc/api/java/android/org/webrtc/Camera1Enumerator.java
deleted file mode 100644
index c10d97445a6c4f877e9cad00505b6cf908dab525..0000000000000000000000000000000000000000
--- a/webrtc/api/java/android/org/webrtc/Camera1Enumerator.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-package org.webrtc;
-
-import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
-
-import android.os.SystemClock;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@SuppressWarnings("deprecation")
-public class Camera1Enumerator implements CameraEnumerator {
-  private final static String TAG = "Camera1Enumerator";
-  // Each entry contains the supported formats for corresponding camera index. The formats for all
-  // cameras are enumerated on the first call to getSupportedFormats(), and cached for future
-  // reference.
-  private static List<List<CaptureFormat>> cachedSupportedFormats;
-
-  private final boolean captureToTexture;
-
-  public Camera1Enumerator() {
-    this(true /* captureToTexture */);
-  }
-
-  public Camera1Enumerator(boolean captureToTexture) {
-    this.captureToTexture = captureToTexture;
-  }
-
-  // Returns device names that can be used to create a new VideoCapturerAndroid.
-  @Override
-  public String[] getDeviceNames() {
-    String[] names = new String[android.hardware.Camera.getNumberOfCameras()];
-    for (int i = 0; i < android.hardware.Camera.getNumberOfCameras(); ++i) {
-      names[i] = getDeviceName(i);
-    }
-    return names;
-  }
-
-  @Override
-  public boolean isFrontFacing(String deviceName) {
-    android.hardware.Camera.CameraInfo info = getCameraInfo(getCameraIndex(deviceName));
-    return info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT;
-  }
-
-  @Override
-  public boolean isBackFacing(String deviceName) {
-    android.hardware.Camera.CameraInfo info = getCameraInfo(getCameraIndex(deviceName));
-    return info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK;
-  }
-
-  @Override
-  public CameraVideoCapturer createCapturer(String deviceName,
-      CameraVideoCapturer.CameraEventsHandler eventsHandler) {
-    return new VideoCapturerAndroid(deviceName, eventsHandler, captureToTexture);
-  }
-
-  private static android.hardware.Camera.CameraInfo getCameraInfo(int index) {
-    android.hardware.Camera.CameraInfo info = new android.hardware.Camera.CameraInfo();
-    try {
-      android.hardware.Camera.getCameraInfo(index, info);
-    } catch (Exception e) {
-      Logging.e(TAG, "getCameraInfo failed on index " + index,e);
-      return null;
-    }
-    return info;
-  }
-
-  static synchronized List<CaptureFormat> getSupportedFormats(int cameraId) {
-    if (cachedSupportedFormats == null) {
-      cachedSupportedFormats = new ArrayList<List<CaptureFormat>>();
-      for (int i = 0; i < CameraEnumerationAndroid.getDeviceCount(); ++i) {
-        cachedSupportedFormats.add(enumerateFormats(i));
-      }
-    }
-    return cachedSupportedFormats.get(cameraId);
-  }
-
-  private static List<CaptureFormat> enumerateFormats(int cameraId) {
-    Logging.d(TAG, "Get supported formats for camera index " + cameraId + ".");
-    final long startTimeMs = SystemClock.elapsedRealtime();
-    final android.hardware.Camera.Parameters parameters;
-    android.hardware.Camera camera = null;
-    try {
-      Logging.d(TAG, "Opening camera with index " + cameraId);
-      camera = android.hardware.Camera.open(cameraId);
-      parameters = camera.getParameters();
-    } catch (RuntimeException e) {
-      Logging.e(TAG, "Open camera failed on camera index " + cameraId, e);
-      return new ArrayList<CaptureFormat>();
-    } finally {
-      if (camera != null) {
-        camera.release();
-      }
-    }
-
-    final List<CaptureFormat> formatList = new ArrayList<CaptureFormat>();
-    try {
-      int minFps = 0;
-      int maxFps = 0;
-      final List<int[]> listFpsRange = parameters.getSupportedPreviewFpsRange();
-      if (listFpsRange != null) {
-        // getSupportedPreviewFpsRange() returns a sorted list. Take the fps range
-        // corresponding to the highest fps.
-        final int[] range = listFpsRange.get(listFpsRange.size() - 1);
-        minFps = range[android.hardware.Camera.Parameters.PREVIEW_FPS_MIN_INDEX];
-        maxFps = range[android.hardware.Camera.Parameters.PREVIEW_FPS_MAX_INDEX];
-      }
-      for (android.hardware.Camera.Size size : parameters.getSupportedPreviewSizes()) {
-        formatList.add(new CaptureFormat(size.width, size.height, minFps, maxFps));
-      }
-    } catch (Exception e) {
-      Logging.e(TAG, "getSupportedFormats() failed on camera index " + cameraId, e);
-    }
-
-    final long endTimeMs = SystemClock.elapsedRealtime();
-    Logging.d(TAG, "Get supported formats for camera index " + cameraId + " done."
-        + " Time spent: " + (endTimeMs - startTimeMs) + " ms.");
-    return formatList;
-  }
-
-  // Convert from android.hardware.Camera.Size to Size.
-  static List<Size> convertSizes(List<android.hardware.Camera.Size> cameraSizes) {
-    final List<Size> sizes = new ArrayList<Size>();
-    for (android.hardware.Camera.Size size : cameraSizes) {
-      sizes.add(new Size(size.width, size.height));
-    }
-    return sizes;
-  }
-
-  // Convert from int[2] to CaptureFormat.FramerateRange.
-  static List<CaptureFormat.FramerateRange> convertFramerates(List<int[]> arrayRanges) {
-    final List<CaptureFormat.FramerateRange> ranges = new ArrayList<CaptureFormat.FramerateRange>();
-    for (int[] range : arrayRanges) {
-      ranges.add(new CaptureFormat.FramerateRange(
-          range[android.hardware.Camera.Parameters.PREVIEW_FPS_MIN_INDEX],
-          range[android.hardware.Camera.Parameters.PREVIEW_FPS_MAX_INDEX]));
-    }
-    return ranges;
-  }
-
-  // Returns the camera index for camera with name |deviceName|, or throws IllegalArgumentException
-  // if no such camera can be found.
-  static int getCameraIndex(String deviceName) {
-    Logging.d(TAG, "getCameraIndex: " + deviceName);
-    for (int i = 0; i < android.hardware.Camera.getNumberOfCameras(); ++i) {
-      if (deviceName.equals(CameraEnumerationAndroid.getDeviceName(i))) {
-        return i;
-      }
-    }
-    throw new IllegalArgumentException("No such camera: " + deviceName);
-  }
-
-  // Returns the name of the camera with camera index. Returns null if the
-  // camera can not be used.
-  static String getDeviceName(int index) {
-    android.hardware.Camera.CameraInfo info = getCameraInfo(index);
-
-    String facing =
-        (info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT) ? "front" : "back";
-    return "Camera " + index + ", Facing " + facing
-        + ", Orientation " + info.orientation;
-  }
-}