WIP: Android Camera2 capture implementation

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/CameraEnumerator.java b/webrtc/api/java/android/org/webrtc/Camera1Enumerator.java
similarity index 73%
rename from webrtc/api/java/android/org/webrtc/CameraEnumerator.java
rename to webrtc/api/java/android/org/webrtc/Camera1Enumerator.java
index 59a7847f8548ff1e528fbe65a50d6a67fcc0edd6..95a59c490ef504ab9d5161a887ad201ab1bf89e9 100644
--- a/webrtc/api/java/android/org/webrtc/CameraEnumerator.java
+++ b/webrtc/api/java/android/org/webrtc/Camera1Enumerator.java
@@ -19,8 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 @SuppressWarnings("deprecation")
-public class CameraEnumerator implements CameraEnumerationAndroid.Enumerator {
-  private final static String TAG = "CameraEnumerator";
+public class Camera1Enumerator implements CameraEnumerationAndroid.Enumerator {
+  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.
@@ -39,7 +39,7 @@ public class CameraEnumerator implements CameraEnumerationAndroid.Enumerator {
     return cachedSupportedFormats.get(cameraId);
   }
 
-  private List<CaptureFormat> enumerateFormats(int 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;
@@ -81,4 +81,26 @@ public class CameraEnumerator implements CameraEnumerationAndroid.Enumerator {
         + " Time spent: " + (endTimeMs - startTimeMs) + " ms.");
     return formatList;
   }
+
+  // Convert from android.hardware.Camera.Size to CaptureFormat.Size.
+  public static List<CaptureFormat.Size> convertSizes(
+      List<android.hardware.Camera.Size> cameraSizes) {
+    final List<CaptureFormat.Size> sizes = new ArrayList<CaptureFormat.Size>();
+    for (android.hardware.Camera.Size size : cameraSizes) {
+      sizes.add(new CaptureFormat.Size(size.width, size.height));
+    }
+    return sizes;
+  }
+
+  // Convert from int[2] to CaptureFormat.FramerateRange.
+  public 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;
+  }
 }