OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 #include <algorithm> | 10 #include <algorithm> |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
277 test::PacketTransport::kSender, | 277 test::PacketTransport::kSender, |
278 FakeNetworkPipe::Config()); | 278 FakeNetworkPipe::Config()); |
279 sync_send_transport.SetReceiver(receiver_call_->Receiver()); | 279 sync_send_transport.SetReceiver(receiver_call_->Receiver()); |
280 test::PacketTransport sync_receive_transport(receiver_call_.get(), &observer, | 280 test::PacketTransport sync_receive_transport(receiver_call_.get(), &observer, |
281 test::PacketTransport::kReceiver, | 281 test::PacketTransport::kReceiver, |
282 FakeNetworkPipe::Config()); | 282 FakeNetworkPipe::Config()); |
283 sync_receive_transport.SetReceiver(sender_call_->Receiver()); | 283 sync_receive_transport.SetReceiver(sender_call_->Receiver()); |
284 | 284 |
285 test::FakeDecoder fake_decoder; | 285 test::FakeDecoder fake_decoder; |
286 | 286 |
287 CreateSendConfig(1, &sync_send_transport); | 287 CreateSendConfig(1, 0, &sync_send_transport); |
288 CreateMatchingReceiveConfigs(&sync_receive_transport); | 288 CreateMatchingReceiveConfigs(&sync_receive_transport); |
289 | 289 |
290 AudioSendStream::Config audio_send_config(&audio_send_transport); | 290 AudioSendStream::Config audio_send_config(&audio_send_transport); |
291 audio_send_config.voe_channel_id = send_channel_id; | 291 audio_send_config.voe_channel_id = send_channel_id; |
292 audio_send_config.rtp.ssrc = kAudioSendSsrc; | 292 audio_send_config.rtp.ssrc = kAudioSendSsrc; |
293 AudioSendStream* audio_send_stream = | 293 AudioSendStream* audio_send_stream = |
294 sender_call_->CreateAudioSendStream(audio_send_config); | 294 sender_call_->CreateAudioSendStream(audio_send_config); |
295 | 295 |
296 CodecInst isac = {103, "ISAC", 16000, 480, 1, 32000}; | 296 CodecInst isac = {103, "ISAC", 16000, 480, 1, 32000}; |
297 EXPECT_EQ(0, voe_codec->SetSendCodec(send_channel_id, isac)); | 297 EXPECT_EQ(0, voe_codec->SetSendCodec(send_channel_id, isac)); |
(...skipping 13 matching lines...) Expand all Loading... |
311 audio_recv_config.rtp.remote_ssrc = kAudioSendSsrc; | 311 audio_recv_config.rtp.remote_ssrc = kAudioSendSsrc; |
312 audio_recv_config.rtp.local_ssrc = kAudioRecvSsrc; | 312 audio_recv_config.rtp.local_ssrc = kAudioRecvSsrc; |
313 audio_recv_config.voe_channel_id = recv_channel_id; | 313 audio_recv_config.voe_channel_id = recv_channel_id; |
314 audio_recv_config.sync_group = kSyncGroup; | 314 audio_recv_config.sync_group = kSyncGroup; |
315 | 315 |
316 AudioReceiveStream* audio_receive_stream; | 316 AudioReceiveStream* audio_receive_stream; |
317 | 317 |
318 if (create_audio_first) { | 318 if (create_audio_first) { |
319 audio_receive_stream = | 319 audio_receive_stream = |
320 receiver_call_->CreateAudioReceiveStream(audio_recv_config); | 320 receiver_call_->CreateAudioReceiveStream(audio_recv_config); |
321 CreateStreams(); | 321 CreateVideoStreams(); |
322 } else { | 322 } else { |
323 CreateStreams(); | 323 CreateVideoStreams(); |
324 audio_receive_stream = | 324 audio_receive_stream = |
325 receiver_call_->CreateAudioReceiveStream(audio_recv_config); | 325 receiver_call_->CreateAudioReceiveStream(audio_recv_config); |
326 } | 326 } |
327 | 327 |
328 CreateFrameGeneratorCapturer(); | 328 CreateFrameGeneratorCapturer(); |
329 | 329 |
330 Start(); | 330 Start(); |
331 | 331 |
332 fake_audio_device.Start(); | 332 fake_audio_device.Start(); |
333 EXPECT_EQ(0, voe_base->StartPlayout(recv_channel_id)); | 333 EXPECT_EQ(0, voe_base->StartPlayout(recv_channel_id)); |
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
735 int encoder_inits_; | 735 int encoder_inits_; |
736 uint32_t last_set_bitrate_; | 736 uint32_t last_set_bitrate_; |
737 VideoSendStream* send_stream_; | 737 VideoSendStream* send_stream_; |
738 VideoEncoderConfig encoder_config_; | 738 VideoEncoderConfig encoder_config_; |
739 } test; | 739 } test; |
740 | 740 |
741 RunBaseTest(&test, FakeNetworkPipe::Config()); | 741 RunBaseTest(&test, FakeNetworkPipe::Config()); |
742 } | 742 } |
743 | 743 |
744 } // namespace webrtc | 744 } // namespace webrtc |
OLD | NEW |