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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
189 if (rtx_) { | 189 if (rtx_) { |
190 send_config->rtp.ulpfec.red_rtx_payload_type = | 190 send_config->rtp.ulpfec.red_rtx_payload_type = |
191 test::CallTest::kRtxRedPayloadType; | 191 test::CallTest::kRtxRedPayloadType; |
192 } | 192 } |
193 } | 193 } |
194 | 194 |
195 size_t i = 0; | 195 size_t i = 0; |
196 for (VideoReceiveStream::Config& recv_config : *receive_configs) { | 196 for (VideoReceiveStream::Config& recv_config : *receive_configs) { |
197 recv_config.rtp.remb = remb; | 197 recv_config.rtp.remb = remb; |
198 recv_config.rtp.transport_cc = transport_cc; | 198 recv_config.rtp.transport_cc = transport_cc; |
| 199 #if 0 |
| 200 // TODO(nisse): Configured for Call instead |
199 recv_config.rtp.extensions = send_config->rtp.extensions; | 201 recv_config.rtp.extensions = send_config->rtp.extensions; |
200 | 202 #endif |
201 recv_config.rtp.remote_ssrc = video_ssrcs_[i]; | 203 recv_config.rtp.remote_ssrc = video_ssrcs_[i]; |
202 recv_config.rtp.nack.rtp_history_ms = send_config->rtp.nack.rtp_history_ms; | 204 recv_config.rtp.nack.rtp_history_ms = send_config->rtp.nack.rtp_history_ms; |
203 | 205 |
204 if (red_) { | 206 if (red_) { |
205 recv_config.rtp.red_payload_type = | 207 recv_config.rtp.red_payload_type = |
206 send_config->rtp.ulpfec.red_payload_type; | 208 send_config->rtp.ulpfec.red_payload_type; |
207 recv_config.rtp.ulpfec_payload_type = | 209 recv_config.rtp.ulpfec_payload_type = |
208 send_config->rtp.ulpfec.ulpfec_payload_type; | 210 send_config->rtp.ulpfec.ulpfec_payload_type; |
209 if (rtx_) { | 211 if (rtx_) { |
210 recv_config.rtp.rtx_associated_payload_types | 212 recv_config.rtp.rtx_associated_payload_types |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
265 std::vector<FlexfecReceiveStream::Config>* receive_configs) { | 267 std::vector<FlexfecReceiveStream::Config>* receive_configs) { |
266 if (num_flexfec_streams_ == 0) | 268 if (num_flexfec_streams_ == 0) |
267 return; | 269 return; |
268 RTC_DCHECK_EQ(1, num_flexfec_streams_); | 270 RTC_DCHECK_EQ(1, num_flexfec_streams_); |
269 (*receive_configs)[0].payload_type = test::CallTest::kFlexfecPayloadType; | 271 (*receive_configs)[0].payload_type = test::CallTest::kFlexfecPayloadType; |
270 (*receive_configs)[0].remote_ssrc = test::CallTest::kFlexfecSendSsrc; | 272 (*receive_configs)[0].remote_ssrc = test::CallTest::kFlexfecSendSsrc; |
271 (*receive_configs)[0].protected_media_ssrcs = {video_ssrcs_[0]}; | 273 (*receive_configs)[0].protected_media_ssrcs = {video_ssrcs_[0]}; |
272 (*receive_configs)[0].local_ssrc = video_ssrcs_[0]; | 274 (*receive_configs)[0].local_ssrc = video_ssrcs_[0]; |
273 if (extension_type_ == RtpExtension::kAbsSendTimeUri) { | 275 if (extension_type_ == RtpExtension::kAbsSendTimeUri) { |
274 (*receive_configs)[0].transport_cc = false; | 276 (*receive_configs)[0].transport_cc = false; |
| 277 #if 0 |
275 (*receive_configs)[0].rtp_header_extensions.push_back( | 278 (*receive_configs)[0].rtp_header_extensions.push_back( |
276 RtpExtension(extension_type_.c_str(), kAbsSendTimeExtensionId)); | 279 RtpExtension(extension_type_.c_str(), kAbsSendTimeExtensionId)); |
| 280 #endif |
277 } else if (extension_type_ == RtpExtension::kTransportSequenceNumberUri) { | 281 } else if (extension_type_ == RtpExtension::kTransportSequenceNumberUri) { |
278 (*receive_configs)[0].transport_cc = true; | 282 (*receive_configs)[0].transport_cc = true; |
| 283 #if 0 |
279 (*receive_configs)[0].rtp_header_extensions.push_back(RtpExtension( | 284 (*receive_configs)[0].rtp_header_extensions.push_back(RtpExtension( |
280 extension_type_.c_str(), kTransportSequenceNumberExtensionId)); | 285 extension_type_.c_str(), kTransportSequenceNumberExtensionId)); |
| 286 #endif |
281 } | 287 } |
282 } | 288 } |
283 | 289 |
284 void RampUpTester::OnCallsCreated(Call* sender_call, Call* receiver_call) { | 290 void RampUpTester::OnCallsCreated(Call* sender_call, Call* receiver_call) { |
285 sender_call_ = sender_call; | 291 sender_call_ = sender_call; |
286 } | 292 } |
287 | 293 |
288 void RampUpTester::BitrateStatsPollingThread(void* obj) { | 294 void RampUpTester::BitrateStatsPollingThread(void* obj) { |
289 static_cast<RampUpTester*>(obj)->PollStats(); | 295 static_cast<RampUpTester*>(obj)->PollStats(); |
290 } | 296 } |
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
644 RunBaseTest(&test); | 650 RunBaseTest(&test); |
645 } | 651 } |
646 | 652 |
647 TEST_F(RampUpTest, AudioTransportSequenceNumber) { | 653 TEST_F(RampUpTest, AudioTransportSequenceNumber) { |
648 RampUpTester test(0, 1, 0, 300000, 10000, | 654 RampUpTester test(0, 1, 0, 300000, 10000, |
649 RtpExtension::kTransportSequenceNumberUri, false, false, | 655 RtpExtension::kTransportSequenceNumberUri, false, false, |
650 false); | 656 false); |
651 RunBaseTest(&test); | 657 RunBaseTest(&test); |
652 } | 658 } |
653 } // namespace webrtc | 659 } // namespace webrtc |
OLD | NEW |