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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 | 234 |
235 FakeNetworkPipe::Config net_config; | 235 FakeNetworkPipe::Config net_config; |
236 net_config.queue_delay_ms = 500; | 236 net_config.queue_delay_ms = 500; |
237 net_config.loss_percent = 5; | 237 net_config.loss_percent = 5; |
238 SyncRtcpObserver audio_observer(net_config); | 238 SyncRtcpObserver audio_observer(net_config); |
239 VideoRtcpAndSyncObserver observer(Clock::GetRealTimeClock(), | 239 VideoRtcpAndSyncObserver observer(Clock::GetRealTimeClock(), |
240 channel, | 240 channel, |
241 voe_sync, | 241 voe_sync, |
242 &audio_observer); | 242 &audio_observer); |
243 | 243 |
| 244 AudioState::Config audio_state_config; |
| 245 audio_state_config.voice_engine = voice_engine; |
| 246 rtc::scoped_ptr<AudioState> audio_state( |
| 247 AudioState::Create(audio_state_config)); |
244 Call::Config receiver_config; | 248 Call::Config receiver_config; |
245 receiver_config.voice_engine = voice_engine; | 249 receiver_config.audio_state = audio_state.get(); |
246 CreateCalls(Call::Config(), receiver_config); | 250 CreateCalls(Call::Config(), receiver_config); |
247 | 251 |
248 CodecInst isac = {103, "ISAC", 16000, 480, 1, 32000}; | 252 CodecInst isac = {103, "ISAC", 16000, 480, 1, 32000}; |
249 EXPECT_EQ(0, voe_codec->SetSendCodec(channel, isac)); | 253 EXPECT_EQ(0, voe_codec->SetSendCodec(channel, isac)); |
250 | 254 |
251 AudioPacketReceiver voe_packet_receiver(channel, voe_network); | 255 AudioPacketReceiver voe_packet_receiver(channel, voe_network); |
252 audio_observer.SetReceivers(&voe_packet_receiver, &voe_packet_receiver); | 256 audio_observer.SetReceivers(&voe_packet_receiver, &voe_packet_receiver); |
253 | 257 |
254 internal::TransportAdapter transport_adapter(audio_observer.SendTransport()); | 258 internal::TransportAdapter transport_adapter(audio_observer.SendTransport()); |
255 transport_adapter.Enable(); | 259 transport_adapter.Enable(); |
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
705 int encoder_inits_; | 709 int encoder_inits_; |
706 uint32_t last_set_bitrate_; | 710 uint32_t last_set_bitrate_; |
707 VideoSendStream* send_stream_; | 711 VideoSendStream* send_stream_; |
708 VideoEncoderConfig encoder_config_; | 712 VideoEncoderConfig encoder_config_; |
709 } test; | 713 } test; |
710 | 714 |
711 RunBaseTest(&test); | 715 RunBaseTest(&test); |
712 } | 716 } |
713 | 717 |
714 } // namespace webrtc | 718 } // namespace webrtc |
OLD | NEW |