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 |
index a021da2dd67c7f972ab1b8ed44742518bc704197..8523bba33224e0099ae037e52d2011b72304eaa1 100644 |
--- a/webrtc/api/java/android/org/webrtc/Camera1Enumerator.java |
+++ b/webrtc/api/java/android/org/webrtc/Camera1Enumerator.java |
@@ -35,16 +35,29 @@ public class Camera1Enumerator implements CameraEnumerator { |
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); |
@@ -134,15 +147,6 @@ public class Camera1Enumerator implements CameraEnumerator { |
return ranges; |
} |
- // Returns device names that can be used to create a new VideoCapturerAndroid. |
- 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; |
- } |
- |
// Returns the camera index for camera with name |deviceName|, or throws IllegalArgumentException |
// if no such camera can be found. |
static int getCameraIndex(String deviceName) { |