Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(962)

Unified Diff: webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java

Issue 2168623002: Refactor stopCapture to be asynchronous in VideoCapturerAndroid. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@androidvideotracksource
Patch Set: Synchronized. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/api/android/java/src/org/webrtc/VideoCapturer.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java
diff --git a/webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java b/webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java
index c3c912acd5bbdc922a0308850d31582f72ae2737..644c70b2f725c8fbdddfb7ff234750b39dea20ba 100644
--- a/webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java
+++ b/webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java
@@ -777,6 +777,8 @@ public class Camera2Capturer implements
@Override
public void dispose() {
+ stopCapture();
+
synchronized (cameraStateLock) {
waitForCameraToStopIfStopping();
@@ -798,7 +800,7 @@ public class Camera2Capturer implements
waitForCameraToStartIfStarting();
if (cameraState != CameraState.RUNNING) {
- Logging.w(TAG, "stopCapture called for already stopped camera.");
+ Logging.d(TAG, "stopCapture called for already stopped camera.");
return;
}
« no previous file with comments | « no previous file | webrtc/api/android/java/src/org/webrtc/VideoCapturer.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698