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

Reset pendingCameraSwitch as false after failed to post switchCameraOnThread to camera thread.

Browse Source 
BUG=webrtc:6981

Review-Url: https://codereview.webrtc.org/2625133007
Cr-Commit-Position: refs/heads/master@{#16105}
This commit is contained in:
hankzhang8945
2017-01-17 01:29:19 -08:00
committed by Commit bot
parent f4caaab518
commit 9506e12eba
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/sdk/android/api/org/webrtc/VideoCapturerAndroid.java
View File

@ -184,10 +184,15 @@ public class VideoCapturerAndroid
} }
} }
}); });
if (!didPost && switchEventsHandler != null) { if (!didPost) {
synchronized (pendingCameraSwitchLock) {
pendingCameraSwitch = false;
}
if (switchEventsHandler != null) {
switchEventsHandler.onCameraSwitchError("Camera is stopped."); switchEventsHandler.onCameraSwitchError("Camera is stopped.");
} }
} }
}
// Reconfigure the camera to capture in a new format. This should only be called while the camera // Reconfigure the camera to capture in a new format. This should only be called while the camera
// is running. // is running.