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

Unified Diff: talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java

Issue 1363303002: VideoCapturerAndroidTest: Dispose PeerConnectionFactory with pending frames (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
diff --git a/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java b/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
index 40e2fdb6008e650e792dc493ec52e3c50b5e83f6..3702feaf3cef8ef6b4faa551f6272d7e0dad2f6e 100644
--- a/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
+++ b/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
@@ -405,9 +405,11 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
capturer.stopCapture();
- // Dispose source and |capturer|.
+ // Dispose everything.
track.dispose();
source.dispose();
+ factory.dispose();
+
// The pending frames should keep the JNI parts and |capturer| alive.
assertFalse(capturer.isReleased());
@@ -426,7 +428,5 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
// Check that frames have successfully returned. This will cause |capturer| to be released.
assertTrue(capturer.isReleased());
-
- factory.dispose();
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698