From 2efe58b1892e6f169cdd3ed8426959868ef5497d Mon Sep 17 00:00:00 2001 From: Magnus Jedvert Date: Thu, 24 Sep 2015 14:16:31 +0200 Subject: [PATCH] VideoCapturerAndroidTest: Dispose PeerConnectionFactory with pending frames Partial revert of change in testReturnBufferLateEndToEnd from https://codereview.webrtc.org/1350863002/. It is ok to dispose PeerConnectionFactory with pending frames after all. BUG=webrtc:4909 R=perkj@webrtc.org Review URL: https://codereview.webrtc.org/1363303002 . Cr-Commit-Position: refs/heads/master@{#10049} --- .../src/org/webrtc/VideoCapturerAndroidTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java b/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java index 40e2fdb600..3702feaf3c 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(); } }