OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 client.createPeerConnection(decodeToTexture ? eglBase.getContext() : null, | 242 client.createPeerConnection(decodeToTexture ? eglBase.getContext() : null, |
243 localRenderer, remoteRenderer, signalingParameters); | 243 localRenderer, remoteRenderer, signalingParameters); |
244 client.createOffer(); | 244 client.createOffer(); |
245 return client; | 245 return client; |
246 } | 246 } |
247 | 247 |
248 private PeerConnectionParameters createParameters(boolean enableVideo, | 248 private PeerConnectionParameters createParameters(boolean enableVideo, |
249 String videoCodec) { | 249 String videoCodec) { |
250 PeerConnectionParameters peerConnectionParameters = | 250 PeerConnectionParameters peerConnectionParameters = |
251 new PeerConnectionParameters( | 251 new PeerConnectionParameters( |
252 enableVideo, true, // videoCallEnabled, loopback. | 252 enableVideo, true, false, // videoCallEnabled, loopback, tracing. |
253 0, 0, 0, 0, videoCodec, true, false, // video codec parameters. | 253 0, 0, 0, 0, videoCodec, true, false, // video codec parameters. |
254 0, "OPUS", false, false); // audio codec parameters. | 254 0, "OPUS", false, false); // audio codec parameters. |
255 return peerConnectionParameters; | 255 return peerConnectionParameters; |
256 } | 256 } |
257 | 257 |
258 @Override | 258 @Override |
259 public void setUp() { | 259 public void setUp() { |
260 signalingExecutor = new LooperExecutor(); | 260 signalingExecutor = new LooperExecutor(); |
261 signalingExecutor.requestStart(); | 261 signalingExecutor.requestStart(); |
262 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { | 262 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
465 localRenderer.waitForFramesRendered(WAIT_TIMEOUT)); | 465 localRenderer.waitForFramesRendered(WAIT_TIMEOUT)); |
466 assertTrue("Remote video frames were not rendered after video restart.", | 466 assertTrue("Remote video frames were not rendered after video restart.", |
467 remoteRenderer.waitForFramesRendered(WAIT_TIMEOUT)); | 467 remoteRenderer.waitForFramesRendered(WAIT_TIMEOUT)); |
468 } | 468 } |
469 pcClient.close(); | 469 pcClient.close(); |
470 assertTrue(waitForPeerConnectionClosed(WAIT_TIMEOUT)); | 470 assertTrue(waitForPeerConnectionClosed(WAIT_TIMEOUT)); |
471 Log.d(TAG, "testVideoSourceRestart done."); | 471 Log.d(TAG, "testVideoSourceRestart done."); |
472 } | 472 } |
473 | 473 |
474 } | 474 } |
OLD | NEW |