admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VideoCapturerAndroidTest: Dispose PeerConnectionFactory with pending frames

Browse Source 
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}
This commit is contained in:
Magnus Jedvert 2015-09-24 14:16:31 +02:00
parent ec249d4eae
commit 2efe58b189
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
View File

@ -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();
}
}