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

Android VideoCapture: Add null checks in stopCaptureOnCameraThread

Browse Source 
If stopCapture is called shortly after startCapture, and the first startCaptureOnCameraThread failed, but still hasn't retried 3 times, stopCaptureOnCameraThread will be called in a state where the camera is not initialized. This CL adds null checks in stopCaptureOnCameraThread to avoid crashes.

BUG=b/27939867

Review URL: https://codereview.webrtc.org/1854103002

Cr-Commit-Position: refs/heads/master@{#12234}
This commit is contained in:
magjed 2016-04-05 01:37:04 -07:00 committed by Commit bot
parent 844dd2ad4b
commit 23b08eb531
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
View File

@ -467,10 +467,8 @@ public class VideoCapturerAndroid implements
error = e;
}
Logging.e(TAG, "startCapture failed", error);
if (camera != null) {
// Make sure the camera is released.
stopCaptureOnCameraThread();
}
// Make sure the camera is released.
stopCaptureOnCameraThread();
synchronized (handlerLock) {
// Remove all pending Runnables posted from |this|.
cameraThreadHandler.removeCallbacksAndMessages(this /* token */);
@ -607,20 +605,28 @@ public class VideoCapturerAndroid implements
private void stopCaptureOnCameraThread() {
checkIsOnCameraThread();
Logging.d(TAG, "stopCaptureOnCameraThread");
// Note that the camera might still not be started here if startCaptureOnCameraThread failed
// and we posted a retry.
// Make sure onTextureFrameAvailable() is not called anymore.
surfaceHelper.stopListening();
if (surfaceHelper != null) {
surfaceHelper.stopListening();
}
cameraThreadHandler.removeCallbacks(cameraObserver);
cameraStatistics.getAndResetFrameCount();
Logging.d(TAG, "Stop preview.");
camera.stopPreview();
camera.setPreviewCallbackWithBuffer(null);
if (camera != null) {
camera.stopPreview();
camera.setPreviewCallbackWithBuffer(null);
}
queuedBuffers.clear();
captureFormat = null;
Logging.d(TAG, "Release camera.");
camera.release();
camera = null;
if (camera != null) {
camera.release();
camera = null;
}
if (eventsHandler != null) {
eventsHandler.onCameraClosed();
}