From 24c177865175794c8ac20f0745ef993c00de461f Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Fri, 6 Jun 2014 22:24:40 +0000 Subject: [PATCH] Revert r6358 "AppRTCDemo(Android): only stop the cameraThread's looper after stopping the camera." Makes stopping flakier for some reason :/ BUG= R=glaznev@webrtc.org Review URL: https://webrtc-codereview.appspot.com/21609004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6361 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../java/src/org/webrtc/videoengine/VideoCaptureAndroid.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java b/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java index 5ae70fc36a..c8abdbe372 100644 --- a/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java +++ b/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java @@ -219,6 +219,7 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback { private void stopCaptureOnCameraThread( Exchanger result) { Log.d(TAG, "stopCapture"); + Looper.myLooper().quit(); if (camera == null) { throw new RuntimeException("Camera is already stopped!"); } @@ -242,7 +243,6 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback { error = e; } Log.e(TAG, "Failed to stop camera", error); - Looper.myLooper().quit(); exchange(result, false); return; }