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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 return client; | 260 return client; |
261 } | 261 } |
262 | 262 |
263 private PeerConnectionParameters createParametersForAudioCall() { | 263 private PeerConnectionParameters createParametersForAudioCall() { |
264 PeerConnectionParameters peerConnectionParameters = | 264 PeerConnectionParameters peerConnectionParameters = |
265 new PeerConnectionParameters( | 265 new PeerConnectionParameters( |
266 false, /* videoCallEnabled */ | 266 false, /* videoCallEnabled */ |
267 true, /* loopback */ | 267 true, /* loopback */ |
268 false, /* tracing */ | 268 false, /* tracing */ |
269 // Video codec parameters. | 269 // Video codec parameters. |
| 270 true, /* camera2Enabled */ |
| 271 true, /* camera1Enabled */ |
270 0, /* videoWidth */ | 272 0, /* videoWidth */ |
271 0, /* videoHeight */ | 273 0, /* videoHeight */ |
272 0, /* videoFps */ | 274 0, /* videoFps */ |
273 0, /* videoStartBitrate */ | 275 0, /* videoStartBitrate */ |
274 "", /* videoCodec */ | 276 "", /* videoCodec */ |
275 true, /* videoCodecHwAcceleration */ | 277 true, /* videoCodecHwAcceleration */ |
276 false, /* captureToToTexture */ | 278 false, /* captureToToTexture */ |
277 // Audio codec parameters. | 279 // Audio codec parameters. |
278 0, /* audioStartBitrate */ | 280 0, /* audioStartBitrate */ |
279 "OPUS", /* audioCodec */ | 281 "OPUS", /* audioCodec */ |
280 false, /* noAudioProcessing */ | 282 false, /* noAudioProcessing */ |
281 false, /* aecDump */ | 283 false, /* aecDump */ |
282 false /* useOpenSLES */, | 284 false /* useOpenSLES */, |
283 false /* disableBuiltInAEC */); | 285 false /* disableBuiltInAEC */); |
284 return peerConnectionParameters; | 286 return peerConnectionParameters; |
285 } | 287 } |
286 | 288 |
287 private PeerConnectionParameters createParametersForVideoCall( | 289 private PeerConnectionParameters createParametersForVideoCall( |
288 String videoCodec, boolean captureToTexture) { | 290 String videoCodec, boolean captureToTexture) { |
289 PeerConnectionParameters peerConnectionParameters = | 291 PeerConnectionParameters peerConnectionParameters = |
290 new PeerConnectionParameters( | 292 new PeerConnectionParameters( |
291 true, /* videoCallEnabled */ | 293 true, /* videoCallEnabled */ |
292 true, /* loopback */ | 294 true, /* loopback */ |
293 false, /* tracing */ | 295 false, /* tracing */ |
294 // Video codec parameters. | 296 // Video codec parameters. |
| 297 true, /* camera2Enabled */ |
| 298 true, /* camera1Enabled */ |
295 0, /* videoWidth */ | 299 0, /* videoWidth */ |
296 0, /* videoHeight */ | 300 0, /* videoHeight */ |
297 0, /* videoFps */ | 301 0, /* videoFps */ |
298 0, /* videoStartBitrate */ | 302 0, /* videoStartBitrate */ |
299 videoCodec, /* videoCodec */ | 303 videoCodec, /* videoCodec */ |
300 true, /* videoCodecHwAcceleration */ | 304 true, /* videoCodecHwAcceleration */ |
301 captureToTexture, /* captureToToTexture */ | 305 captureToTexture, /* captureToToTexture */ |
302 // Audio codec parameters. | 306 // Audio codec parameters. |
303 0, /* audioStartBitrate */ | 307 0, /* audioStartBitrate */ |
304 "OPUS", /* audioCodec */ | 308 "OPUS", /* audioCodec */ |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
654 assertTrue("Remote video frames were not rendered after capture format cha
nge.", | 658 assertTrue("Remote video frames were not rendered after capture format cha
nge.", |
655 remoteRenderer.waitForFramesRendered(WAIT_TIMEOUT)); | 659 remoteRenderer.waitForFramesRendered(WAIT_TIMEOUT)); |
656 } | 660 } |
657 | 661 |
658 pcClient.close(); | 662 pcClient.close(); |
659 assertTrue(waitForPeerConnectionClosed(WAIT_TIMEOUT)); | 663 assertTrue(waitForPeerConnectionClosed(WAIT_TIMEOUT)); |
660 Log.d(TAG, "testCaptureFormatChange done."); | 664 Log.d(TAG, "testCaptureFormatChange done."); |
661 } | 665 } |
662 | 666 |
663 } | 667 } |
OLD | NEW |