zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add override annotation to appropriate methods in Camera1Enumerator.

Browse Source 
Also move getDeviceNames to a more appropriate location in the file.

NOTRY=True

Review-Url: https://codereview.webrtc.org/2105813002
Cr-Commit-Position: refs/heads/master@{#13312}
This commit is contained in:
sakal
2016-06-28 08:36:35 -07:00
committed by Commit bot
parent 0dacbf5f62
commit 70fae2ccc6
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
webrtc/api/java/android/org/webrtc/Camera1Enumerator.java
View File

@ -35,16 +35,29 @@ public class Camera1Enumerator implements CameraEnumerator {
this.captureToTexture = 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) { public boolean isFrontFacing(String deviceName) {
android.hardware.Camera.CameraInfo info = getCameraInfo(getCameraIndex(deviceName)); android.hardware.Camera.CameraInfo info = getCameraInfo(getCameraIndex(deviceName));
return info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT; return info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT;
} }
@Override
public boolean isBackFacing(String deviceName) { public boolean isBackFacing(String deviceName) {
android.hardware.Camera.CameraInfo info = getCameraInfo(getCameraIndex(deviceName)); android.hardware.Camera.CameraInfo info = getCameraInfo(getCameraIndex(deviceName));
return info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK; return info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK;
} }
@Override
public CameraVideoCapturer createCapturer(String deviceName, public CameraVideoCapturer createCapturer(String deviceName,
CameraVideoCapturer.CameraEventsHandler eventsHandler) { CameraVideoCapturer.CameraEventsHandler eventsHandler) {
return new VideoCapturerAndroid(deviceName, eventsHandler, captureToTexture); return new VideoCapturerAndroid(deviceName, eventsHandler, captureToTexture);
@ -134,15 +147,6 @@ public class Camera1Enumerator implements CameraEnumerator {
return ranges; 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 // Returns the camera index for camera with name |deviceName|, or throws IllegalArgumentException
// if no such camera can be found. // if no such camera can be found.
static int getCameraIndex(String deviceName) { static int getCameraIndex(String deviceName) {