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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 recv_config.rtp.ulpfec.ulpfec_payload_type = | 205 recv_config.rtp.ulpfec.ulpfec_payload_type = |
206 send_config->rtp.ulpfec.ulpfec_payload_type; | 206 send_config->rtp.ulpfec.ulpfec_payload_type; |
207 if (rtx_) { | 207 if (rtx_) { |
208 recv_config.rtp.ulpfec.red_rtx_payload_type = | 208 recv_config.rtp.ulpfec.red_rtx_payload_type = |
209 send_config->rtp.ulpfec.red_rtx_payload_type; | 209 send_config->rtp.ulpfec.red_rtx_payload_type; |
210 } | 210 } |
211 } | 211 } |
212 | 212 |
213 if (rtx_) { | 213 if (rtx_) { |
214 recv_config.rtp.rtx_ssrc = video_rtx_ssrcs_[i]; | 214 recv_config.rtp.rtx_ssrc = video_rtx_ssrcs_[i]; |
215 recv_config.rtp | 215 recv_config.rtp.media_pt_by_rtx_pt[send_config->rtp.rtx.payload_type] = |
216 .rtx_payload_types[send_config->encoder_settings.payload_type] = | 216 send_config->encoder_settings.payload_type; |
217 send_config->rtp.rtx.payload_type; | |
218 } | 217 } |
219 ++i; | 218 ++i; |
220 } | 219 } |
221 | 220 |
222 RTC_DCHECK_LE(num_flexfec_streams_, 1); | 221 RTC_DCHECK_LE(num_flexfec_streams_, 1); |
223 if (num_flexfec_streams_ == 1) { | 222 if (num_flexfec_streams_ == 1) { |
224 send_config->rtp.flexfec.payload_type = test::CallTest::kFlexfecPayloadType; | 223 send_config->rtp.flexfec.payload_type = test::CallTest::kFlexfecPayloadType; |
225 send_config->rtp.flexfec.ssrc = test::CallTest::kFlexfecSendSsrc; | 224 send_config->rtp.flexfec.ssrc = test::CallTest::kFlexfecSendSsrc; |
226 send_config->rtp.flexfec.protected_media_ssrcs = {video_ssrcs_[0]}; | 225 send_config->rtp.flexfec.protected_media_ssrcs = {video_ssrcs_[0]}; |
227 } | 226 } |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
641 RunBaseTest(&test); | 640 RunBaseTest(&test); |
642 } | 641 } |
643 | 642 |
644 TEST_F(RampUpTest, AudioTransportSequenceNumber) { | 643 TEST_F(RampUpTest, AudioTransportSequenceNumber) { |
645 RampUpTester test(0, 1, 0, 300000, 10000, | 644 RampUpTester test(0, 1, 0, 300000, 10000, |
646 RtpExtension::kTransportSequenceNumberUri, false, false, | 645 RtpExtension::kTransportSequenceNumberUri, false, false, |
647 false); | 646 false); |
648 RunBaseTest(&test); | 647 RunBaseTest(&test); |
649 } | 648 } |
650 } // namespace webrtc | 649 } // namespace webrtc |
OLD | NEW |