| 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 | 10 |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 video_receive_configs_[0].rtp.nack.rtp_history_ms = 1000; | 234 video_receive_configs_[0].rtp.nack.rtp_history_ms = 1000; |
| 235 video_receive_configs_[0].renderer = &observer; | 235 video_receive_configs_[0].renderer = &observer; |
| 236 video_receive_configs_[0].sync_group = kSyncGroup; | 236 video_receive_configs_[0].sync_group = kSyncGroup; |
| 237 | 237 |
| 238 AudioReceiveStream::Config audio_recv_config; | 238 AudioReceiveStream::Config audio_recv_config; |
| 239 audio_recv_config.rtp.remote_ssrc = kAudioSendSsrc; | 239 audio_recv_config.rtp.remote_ssrc = kAudioSendSsrc; |
| 240 audio_recv_config.rtp.local_ssrc = kAudioRecvSsrc; | 240 audio_recv_config.rtp.local_ssrc = kAudioRecvSsrc; |
| 241 audio_recv_config.voe_channel_id = recv_channel_id; | 241 audio_recv_config.voe_channel_id = recv_channel_id; |
| 242 audio_recv_config.sync_group = kSyncGroup; | 242 audio_recv_config.sync_group = kSyncGroup; |
| 243 audio_recv_config.decoder_factory = decoder_factory_; | 243 audio_recv_config.decoder_factory = decoder_factory_; |
| 244 audio_recv_config.decoder_map = {{103, {"ISAC", 16000, 1}}}; |
| 244 | 245 |
| 245 AudioReceiveStream* audio_receive_stream; | 246 AudioReceiveStream* audio_receive_stream; |
| 246 | 247 |
| 247 if (create_first == CreateOrder::kAudioFirst) { | 248 if (create_first == CreateOrder::kAudioFirst) { |
| 248 audio_receive_stream = | 249 audio_receive_stream = |
| 249 receiver_call_->CreateAudioReceiveStream(audio_recv_config); | 250 receiver_call_->CreateAudioReceiveStream(audio_recv_config); |
| 250 CreateVideoStreams(); | 251 CreateVideoStreams(); |
| 251 } else { | 252 } else { |
| 252 CreateVideoStreams(); | 253 CreateVideoStreams(); |
| 253 audio_receive_stream = | 254 audio_receive_stream = |
| (...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 738 uint32_t last_set_bitrate_kbps_; | 739 uint32_t last_set_bitrate_kbps_; |
| 739 VideoSendStream* send_stream_; | 740 VideoSendStream* send_stream_; |
| 740 test::FrameGeneratorCapturer* frame_generator_; | 741 test::FrameGeneratorCapturer* frame_generator_; |
| 741 VideoEncoderConfig encoder_config_; | 742 VideoEncoderConfig encoder_config_; |
| 742 } test; | 743 } test; |
| 743 | 744 |
| 744 RunBaseTest(&test); | 745 RunBaseTest(&test); |
| 745 } | 746 } |
| 746 | 747 |
| 747 } // namespace webrtc | 748 } // namespace webrtc |
| OLD | NEW |