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

Camera1Session: Fix camera sometimes getting stopped twice.

Browse Source 
Moves setting state as stopped to stopInternal. Checks that state is not
stopped in stopInternal.

BUG=webrtc:7015

Review-Url: https://codereview.webrtc.org/2640093003
Cr-Commit-Position: refs/heads/master@{#16182}
This commit is contained in:
sakal 2017-01-20 03:09:03 -08:00 committed by Commit bot
parent 9e30274c03
commit 35564065ca
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/sdk/android/api/org/webrtc/Camera1Session.java
View File

@ -177,7 +177,6 @@ public class Camera1Session implements CameraSession {
checkIsOnCameraThread();
if (state != SessionState.STOPPED) {
final long stopStartTime = System.nanoTime();
state = SessionState.STOPPED;
stopInternal();
final int stopTimeMs = (int) TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - stopStartTime);
camera1StopTimeMsHistogram.addSample(stopTimeMs);
@ -200,7 +199,6 @@ public class Camera1Session implements CameraSession {
errorMessage = "Camera error: " + error;
}
Logging.e(TAG, errorMessage);
state = SessionState.STOPPED;
stopInternal();
if (error == android.hardware.Camera.CAMERA_ERROR_EVICTED) {
events.onCameraDisconnected(Camera1Session.this);
@ -218,7 +216,6 @@ public class Camera1Session implements CameraSession {
try {
camera.startPreview();
} catch (RuntimeException e) {
state = SessionState.STOPPED;
stopInternal();
events.onCameraError(this, e.getMessage());
}
@ -227,16 +224,19 @@ public class Camera1Session implements CameraSession {
private void stopInternal() {
Logging.d(TAG, "Stop internal");
checkIsOnCameraThread();
if (state == SessionState.STOPPED) {
Logging.d(TAG, "Camera is already stopped");
return;
}
state = SessionState.STOPPED;
surfaceTextureHelper.stopListening();
// Note: stopPreview or other driver code might deadlock. Deadlock in
// android.hardware.Camera._stopPreview(Native Method) has been observed on
// Nexus 5 (hammerhead), OS version LMY48I.
camera.stopPreview();
camera.release();
events.onCameraClosed(this);
Logging.d(TAG, "Stop done");
}