admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change onCameraOpening to take camera name as a parameter instead of camera id.

Browse Source 
Camera id doesn't really exist for Camera2. Changing onCameraOpening to
take a string instead removes ugly code.

BUG=webrtc:6325
R=magjed@webrtc.org

Review-Url: https://codereview.webrtc.org/2331013002
Cr-Commit-Position: refs/heads/master@{#14212}
This commit is contained in:
sakal 2016-09-14 05:36:20 -07:00 committed by Commit bot
parent 9e2be5f292
commit bc18fc07be
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/api/android/java/src/org/webrtc/Camera2Session.java
View File

@ -316,13 +316,7 @@ public class Camera2Session implements CameraSession {
checkIsOnCameraThread();
Logging.d(TAG, "Opening camera " + cameraId);
int cameraIndex = -1;
try {
cameraIndex = Integer.parseInt(cameraId);
} catch (NumberFormatException e) {
Logging.d(TAG, "External camera with non-int identifier: " + cameraId);
}
eventsHandler.onCameraOpening(cameraIndex);
eventsHandler.onCameraOpening(cameraId);
try {
cameraManager.openCamera(cameraId, new CameraStateCallback(), cameraThreadHandler);

2
webrtc/api/android/java/src/org/webrtc/CameraCapturer.java
View File

@ -121,7 +121,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
@Override
public void onCameraFreezed(String errorDescription) {}
@Override
public void onCameraOpening(int cameraId) {}
public void onCameraOpening(String cameraName) {}
@Override
public void onFirstFrameAvailable() {}
@Override

2
webrtc/api/android/java/src/org/webrtc/CameraVideoCapturer.java
View File

@ -29,7 +29,7 @@ public interface CameraVideoCapturer extends VideoCapturer {
void onCameraFreezed(String errorDescription);
// Callback invoked when camera is opening.
void onCameraOpening(int cameraId);
void onCameraOpening(String cameraName);
// Callback invoked when first camera frame is available after camera is started.
void onFirstFrameAvailable();

2
webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java
View File

@ -323,7 +323,7 @@ public class VideoCapturerAndroid implements
synchronized (cameraIdLock) {
Logging.d(TAG, "Opening camera " + id);
if (eventsHandler != null) {
eventsHandler.onCameraOpening(id);
eventsHandler.onCameraOpening(Camera1Enumerator.getDeviceName(id));
}
camera = android.hardware.Camera.open(id);
info = new android.hardware.Camera.CameraInfo();

2
webrtc/api/androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
View File

@ -209,7 +209,7 @@ class CameraVideoCapturerTestFixtures {
}
@Override
public void onCameraOpening(int cameraId) {
public void onCameraOpening(String cameraName) {
onCameraOpeningCalled = true;
synchronized (cameraClosedLock) {
cameraClosed = false;