| 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 extension_type_.c_str(), kTransmissionTimeOffsetExtensionId)); | 162 extension_type_.c_str(), kTransmissionTimeOffsetExtensionId)); |
| 163 } | 163 } |
| 164 | 164 |
| 165 send_config->rtp.nack.rtp_history_ms = test::CallTest::kNackRtpHistoryMs; | 165 send_config->rtp.nack.rtp_history_ms = test::CallTest::kNackRtpHistoryMs; |
| 166 send_config->rtp.ssrcs = video_ssrcs_; | 166 send_config->rtp.ssrcs = video_ssrcs_; |
| 167 if (rtx_) { | 167 if (rtx_) { |
| 168 send_config->rtp.rtx.payload_type = test::CallTest::kSendRtxPayloadType; | 168 send_config->rtp.rtx.payload_type = test::CallTest::kSendRtxPayloadType; |
| 169 send_config->rtp.rtx.ssrcs = video_rtx_ssrcs_; | 169 send_config->rtp.rtx.ssrcs = video_rtx_ssrcs_; |
| 170 } | 170 } |
| 171 if (red_) { | 171 if (red_) { |
| 172 send_config->rtp.fec.ulpfec_payload_type = | 172 send_config->rtp.ulpfec.ulpfec_payload_type = |
| 173 test::CallTest::kUlpfecPayloadType; | 173 test::CallTest::kUlpfecPayloadType; |
| 174 send_config->rtp.fec.red_payload_type = test::CallTest::kRedPayloadType; | 174 send_config->rtp.ulpfec.red_payload_type = test::CallTest::kRedPayloadType; |
| 175 } | 175 } |
| 176 | 176 |
| 177 size_t i = 0; | 177 size_t i = 0; |
| 178 for (VideoReceiveStream::Config& recv_config : *receive_configs) { | 178 for (VideoReceiveStream::Config& recv_config : *receive_configs) { |
| 179 recv_config.rtp.remb = remb; | 179 recv_config.rtp.remb = remb; |
| 180 recv_config.rtp.transport_cc = transport_cc; | 180 recv_config.rtp.transport_cc = transport_cc; |
| 181 recv_config.rtp.extensions = send_config->rtp.extensions; | 181 recv_config.rtp.extensions = send_config->rtp.extensions; |
| 182 | 182 |
| 183 recv_config.rtp.remote_ssrc = video_ssrcs_[i]; | 183 recv_config.rtp.remote_ssrc = video_ssrcs_[i]; |
| 184 recv_config.rtp.nack.rtp_history_ms = send_config->rtp.nack.rtp_history_ms; | 184 recv_config.rtp.nack.rtp_history_ms = send_config->rtp.nack.rtp_history_ms; |
| 185 | 185 |
| 186 if (red_) { | 186 if (red_) { |
| 187 recv_config.rtp.fec.red_payload_type = | 187 recv_config.rtp.ulpfec.red_payload_type = |
| 188 send_config->rtp.fec.red_payload_type; | 188 send_config->rtp.ulpfec.red_payload_type; |
| 189 recv_config.rtp.fec.ulpfec_payload_type = | 189 recv_config.rtp.ulpfec.ulpfec_payload_type = |
| 190 send_config->rtp.fec.ulpfec_payload_type; | 190 send_config->rtp.ulpfec.ulpfec_payload_type; |
| 191 } | 191 } |
| 192 | 192 |
| 193 if (rtx_) { | 193 if (rtx_) { |
| 194 recv_config.rtp.rtx[send_config->encoder_settings.payload_type].ssrc = | 194 recv_config.rtp.rtx[send_config->encoder_settings.payload_type].ssrc = |
| 195 video_rtx_ssrcs_[i]; | 195 video_rtx_ssrcs_[i]; |
| 196 recv_config.rtp.rtx[send_config->encoder_settings.payload_type] | 196 recv_config.rtp.rtx[send_config->encoder_settings.payload_type] |
| 197 .payload_type = send_config->rtp.rtx.payload_type; | 197 .payload_type = send_config->rtp.rtx.payload_type; |
| 198 } | 198 } |
| 199 ++i; | 199 ++i; |
| 200 } | 200 } |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 620 true); | 620 true); |
| 621 RunBaseTest(&test); | 621 RunBaseTest(&test); |
| 622 } | 622 } |
| 623 | 623 |
| 624 TEST_F(RampUpTest, TransportSequenceNumberSingleStreamWithHighStartBitrate) { | 624 TEST_F(RampUpTest, TransportSequenceNumberSingleStreamWithHighStartBitrate) { |
| 625 RampUpTester test(1, 0, 0.9 * kSingleStreamTargetBps, | 625 RampUpTester test(1, 0, 0.9 * kSingleStreamTargetBps, |
| 626 RtpExtension::kTransportSequenceNumberUri, false, false); | 626 RtpExtension::kTransportSequenceNumberUri, false, false); |
| 627 RunBaseTest(&test); | 627 RunBaseTest(&test); |
| 628 } | 628 } |
| 629 } // namespace webrtc | 629 } // namespace webrtc |
| OLD | NEW |