| 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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 audio_send_config.send_codec_spec = | 231 audio_send_config.send_codec_spec = |
| 232 rtc::Optional<AudioSendStream::Config::SendCodecSpec>( | 232 rtc::Optional<AudioSendStream::Config::SendCodecSpec>( |
| 233 {kAudioSendPayloadType, {"ISAC", 16000, 1}}); | 233 {kAudioSendPayloadType, {"ISAC", 16000, 1}}); |
| 234 audio_send_config.encoder_factory = CreateBuiltinAudioEncoderFactory(); | 234 audio_send_config.encoder_factory = CreateBuiltinAudioEncoderFactory(); |
| 235 audio_send_stream = sender_call_->CreateAudioSendStream(audio_send_config); | 235 audio_send_stream = sender_call_->CreateAudioSendStream(audio_send_config); |
| 236 | 236 |
| 237 video_send_config_.rtp.nack.rtp_history_ms = kNackRtpHistoryMs; | 237 video_send_config_.rtp.nack.rtp_history_ms = kNackRtpHistoryMs; |
| 238 if (fec == FecMode::kOn) { | 238 if (fec == FecMode::kOn) { |
| 239 video_send_config_.rtp.ulpfec.red_payload_type = kRedPayloadType; | 239 video_send_config_.rtp.ulpfec.red_payload_type = kRedPayloadType; |
| 240 video_send_config_.rtp.ulpfec.ulpfec_payload_type = kUlpfecPayloadType; | 240 video_send_config_.rtp.ulpfec.ulpfec_payload_type = kUlpfecPayloadType; |
| 241 video_receive_configs_[0].rtp.ulpfec.red_payload_type = kRedPayloadType; | 241 video_receive_configs_[0].rtp.red_payload_type = kRedPayloadType; |
| 242 video_receive_configs_[0].rtp.ulpfec.ulpfec_payload_type = | 242 video_receive_configs_[0].rtp.ulpfec_payload_type = kUlpfecPayloadType; |
| 243 kUlpfecPayloadType; | |
| 244 } | 243 } |
| 245 video_receive_configs_[0].rtp.nack.rtp_history_ms = 1000; | 244 video_receive_configs_[0].rtp.nack.rtp_history_ms = 1000; |
| 246 video_receive_configs_[0].renderer = &observer; | 245 video_receive_configs_[0].renderer = &observer; |
| 247 video_receive_configs_[0].sync_group = kSyncGroup; | 246 video_receive_configs_[0].sync_group = kSyncGroup; |
| 248 | 247 |
| 249 AudioReceiveStream::Config audio_recv_config; | 248 AudioReceiveStream::Config audio_recv_config; |
| 250 audio_recv_config.rtp.remote_ssrc = kAudioSendSsrc; | 249 audio_recv_config.rtp.remote_ssrc = kAudioSendSsrc; |
| 251 audio_recv_config.rtp.local_ssrc = kAudioRecvSsrc; | 250 audio_recv_config.rtp.local_ssrc = kAudioRecvSsrc; |
| 252 audio_recv_config.voe_channel_id = recv_channel_id; | 251 audio_recv_config.voe_channel_id = recv_channel_id; |
| 253 audio_recv_config.sync_group = kSyncGroup; | 252 audio_recv_config.sync_group = kSyncGroup; |
| (...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 779 uint32_t last_set_bitrate_kbps_; | 778 uint32_t last_set_bitrate_kbps_; |
| 780 VideoSendStream* send_stream_; | 779 VideoSendStream* send_stream_; |
| 781 test::FrameGeneratorCapturer* frame_generator_; | 780 test::FrameGeneratorCapturer* frame_generator_; |
| 782 VideoEncoderConfig encoder_config_; | 781 VideoEncoderConfig encoder_config_; |
| 783 } test; | 782 } test; |
| 784 | 783 |
| 785 RunBaseTest(&test); | 784 RunBaseTest(&test); |
| 786 } | 785 } |
| 787 | 786 |
| 788 } // namespace webrtc | 787 } // namespace webrtc |
| OLD | NEW |