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

Convert PeerConnectionTest to use the new capture APIs.

Browse Source 
Review-Url: https://codereview.webrtc.org/2236323002
Cr-Commit-Position: refs/heads/master@{#13735}
This commit is contained in:
sakal 2016-08-12 00:06:12 -07:00 committed by Commit bot
parent 62351c9923
commit 9591e3e82d
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
webrtc/api/androidtests/src/org/webrtc/PeerConnectionTest.java
View File

@ -567,8 +567,11 @@ public class PeerConnectionTest extends ActivityTestCase {
// We want to use the same camera for offerer & answerer, so create it here
// instead of in addTracksToPC.
VideoSource videoSource = factory.createVideoSource(
VideoCapturerAndroid.create("", null), new MediaConstraints());
final CameraEnumerator enumerator = new Camera1Enumerator(false /* captureToTexture */);
final VideoCapturer videoCapturer =
enumerator.createCapturer(enumerator.getDeviceNames()[0], null);
final VideoSource videoSource = factory.createVideoSource(videoCapturer);
videoCapturer.startCapture(640, 480, 30);
offeringExpectations.expectRenegotiationNeeded();
WeakReference<MediaStream> oLMS = addTracksToPC(
@ -749,6 +752,8 @@ public class PeerConnectionTest extends ActivityTestCase {
shutdownPC(answeringPC, answeringExpectations);
answeringPC = null;
getMetrics();
videoCapturer.stopCapture();
videoCapturer.dispose();
videoSource.dispose();
factory.dispose();
System.gc();
@ -785,8 +790,11 @@ public class PeerConnectionTest extends ActivityTestCase {
// We want to use the same camera for offerer & answerer, so create it here
// instead of in addTracksToPC.
VideoSource videoSource = factory.createVideoSource(
VideoCapturerAndroid.create("", null), new MediaConstraints());
final CameraEnumerator enumerator = new Camera1Enumerator(false /* captureToTexture */);
final VideoCapturer videoCapturer =
enumerator.createCapturer(enumerator.getDeviceNames()[0], null);
final VideoSource videoSource = factory.createVideoSource(videoCapturer);
videoCapturer.startCapture(640, 480, 30);
// Add offerer media stream.
offeringExpectations.expectRenegotiationNeeded();
@ -1016,6 +1024,8 @@ public class PeerConnectionTest extends ActivityTestCase {
answeringPC = null;
offererVideoTrack.dispose();
offererAudioTrack.dispose();
videoCapturer.stopCapture();
videoCapturer.dispose();
videoSource.dispose();
factory.dispose();
System.gc();