wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 874546 - Detach the preview when the Camera surface is destroyed. r=blassey

Browse Source
This commit is contained in:
Gian-Carlo Pascutto 2013-06-05 08:26:00 +02:00
parent f5826d6b94
commit c646b21629
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
media/webrtc/trunk/webrtc/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureAndroid.java
View File

@ -214,8 +214,7 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback {
return res;
}
public int StopCapture() {
Log.d(TAG, "StopCapture");
public int DetachCamera() {
try {
previewBufferLock.lock();
isCaptureRunning = false;
@ -224,14 +223,18 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback {
camera.setPreviewCallbackWithBuffer(null);
}
catch (Exception ex) {
Log.e(TAG, "Failed to stop camera");
Log.e(TAG, "Failed to stop camera: " + ex.getMessage());
return -1;
}
isCaptureStarted = false;
return 0;
}
public int StopCapture() {
Log.d(TAG, "StopCapture");
isCaptureStarted = false;
return DetachCamera();
}
native void ProvideCameraFrame(byte[] data, int length, long captureObject);
public void onPreviewFrame(byte[] data, Camera camera) {
@ -314,5 +317,6 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback {
public void surfaceDestroyed(SurfaceHolder holder) {
Log.d(TAG, "VideoCaptureAndroid::surfaceDestroyed");
isSurfaceReady = false;
DetachCamera();
}
}