zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android VideoCapturerAndroid: Move stopListening() call to stopCaptureOnCameraThread()

Browse Source 
switchCamera() only calls stopCaptureOnCameraThread(), not
stopCapture(), so the stopListening() call must be placed there.

BUG=webrtc:5519,b/27497950
R=perkj@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#11917}
This commit is contained in:
Magnus Jedvert
2016-03-08 20:38:07 +01:00
parent 5ed5ed953d
commit 1ae6a45986
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -544,8 +544,6 @@ public class VideoCapturerAndroid implements
final CountDownLatch barrier = new CountDownLatch(1);
cameraThreadHandler.post(new Runnable() {
@Override public void run() {
// Make sure onTextureFrameAvailable() is not called anymore.
surfaceHelper.stopListening();
stopCaptureOnCameraThread();
barrier.countDown();
}
@ -566,6 +564,8 @@ public class VideoCapturerAndroid implements
return;
}
// Make sure onTextureFrameAvailable() is not called anymore.
surfaceHelper.stopListening();
cameraThreadHandler.removeCallbacks(cameraObserver);
cameraStatistics.getAndResetFrameCount();
Logging.d(TAG, "Stop preview.");