Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Side by Side Diff: webrtc/call/rampup_tests.cc

Issue 2826263004: Move responsibility for RTP header extensions on video receive. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 if (rtx_) { 186 if (rtx_) {
187 send_config->rtp.ulpfec.red_rtx_payload_type = 187 send_config->rtp.ulpfec.red_rtx_payload_type =
188 test::CallTest::kRtxRedPayloadType; 188 test::CallTest::kRtxRedPayloadType;
189 } 189 }
190 } 190 }
191 191
192 size_t i = 0; 192 size_t i = 0;
193 for (VideoReceiveStream::Config& recv_config : *receive_configs) { 193 for (VideoReceiveStream::Config& recv_config : *receive_configs) {
194 recv_config.rtp.remb = remb; 194 recv_config.rtp.remb = remb;
195 recv_config.rtp.transport_cc = transport_cc; 195 recv_config.rtp.transport_cc = transport_cc;
196 #if 0
197 // TODO(nisse): Configured for Call instead
196 recv_config.rtp.extensions = send_config->rtp.extensions; 198 recv_config.rtp.extensions = send_config->rtp.extensions;
197 199 #endif
198 recv_config.rtp.remote_ssrc = video_ssrcs_[i]; 200 recv_config.rtp.remote_ssrc = video_ssrcs_[i];
199 recv_config.rtp.nack.rtp_history_ms = send_config->rtp.nack.rtp_history_ms; 201 recv_config.rtp.nack.rtp_history_ms = send_config->rtp.nack.rtp_history_ms;
200 202
201 if (red_) { 203 if (red_) {
202 recv_config.rtp.ulpfec.red_payload_type = 204 recv_config.rtp.ulpfec.red_payload_type =
203 send_config->rtp.ulpfec.red_payload_type; 205 send_config->rtp.ulpfec.red_payload_type;
204 recv_config.rtp.ulpfec.ulpfec_payload_type = 206 recv_config.rtp.ulpfec.ulpfec_payload_type =
205 send_config->rtp.ulpfec.ulpfec_payload_type; 207 send_config->rtp.ulpfec.ulpfec_payload_type;
206 if (rtx_) { 208 if (rtx_) {
207 recv_config.rtp.ulpfec.red_rtx_payload_type = 209 recv_config.rtp.ulpfec.red_rtx_payload_type =
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 std::vector<FlexfecReceiveStream::Config>* receive_configs) { 263 std::vector<FlexfecReceiveStream::Config>* receive_configs) {
262 if (num_flexfec_streams_ == 0) 264 if (num_flexfec_streams_ == 0)
263 return; 265 return;
264 RTC_DCHECK_EQ(1, num_flexfec_streams_); 266 RTC_DCHECK_EQ(1, num_flexfec_streams_);
265 (*receive_configs)[0].payload_type = test::CallTest::kFlexfecPayloadType; 267 (*receive_configs)[0].payload_type = test::CallTest::kFlexfecPayloadType;
266 (*receive_configs)[0].remote_ssrc = test::CallTest::kFlexfecSendSsrc; 268 (*receive_configs)[0].remote_ssrc = test::CallTest::kFlexfecSendSsrc;
267 (*receive_configs)[0].protected_media_ssrcs = {video_ssrcs_[0]}; 269 (*receive_configs)[0].protected_media_ssrcs = {video_ssrcs_[0]};
268 (*receive_configs)[0].local_ssrc = video_ssrcs_[0]; 270 (*receive_configs)[0].local_ssrc = video_ssrcs_[0];
269 if (extension_type_ == RtpExtension::kAbsSendTimeUri) { 271 if (extension_type_ == RtpExtension::kAbsSendTimeUri) {
270 (*receive_configs)[0].transport_cc = false; 272 (*receive_configs)[0].transport_cc = false;
273 #if 0
271 (*receive_configs)[0].rtp_header_extensions.push_back( 274 (*receive_configs)[0].rtp_header_extensions.push_back(
272 RtpExtension(extension_type_.c_str(), kAbsSendTimeExtensionId)); 275 RtpExtension(extension_type_.c_str(), kAbsSendTimeExtensionId));
276 #endif
273 } else if (extension_type_ == RtpExtension::kTransportSequenceNumberUri) { 277 } else if (extension_type_ == RtpExtension::kTransportSequenceNumberUri) {
274 (*receive_configs)[0].transport_cc = true; 278 (*receive_configs)[0].transport_cc = true;
279 #if 0
275 (*receive_configs)[0].rtp_header_extensions.push_back(RtpExtension( 280 (*receive_configs)[0].rtp_header_extensions.push_back(RtpExtension(
276 extension_type_.c_str(), kTransportSequenceNumberExtensionId)); 281 extension_type_.c_str(), kTransportSequenceNumberExtensionId));
282 #endif
277 } 283 }
278 } 284 }
279 285
280 void RampUpTester::OnCallsCreated(Call* sender_call, Call* receiver_call) { 286 void RampUpTester::OnCallsCreated(Call* sender_call, Call* receiver_call) {
281 sender_call_ = sender_call; 287 sender_call_ = sender_call;
282 } 288 }
283 289
284 void RampUpTester::BitrateStatsPollingThread(void* obj) { 290 void RampUpTester::BitrateStatsPollingThread(void* obj) {
285 static_cast<RampUpTester*>(obj)->PollStats(); 291 static_cast<RampUpTester*>(obj)->PollStats();
286 } 292 }
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 RunBaseTest(&test); 646 RunBaseTest(&test);
641 } 647 }
642 648
643 TEST_F(RampUpTest, AudioTransportSequenceNumber) { 649 TEST_F(RampUpTest, AudioTransportSequenceNumber) {
644 RampUpTester test(0, 1, 0, 300000, 10000, 650 RampUpTester test(0, 1, 0, 300000, 10000,
645 RtpExtension::kTransportSequenceNumberUri, false, false, 651 RtpExtension::kTransportSequenceNumberUri, false, false,
646 false); 652 false);
647 RunBaseTest(&test); 653 RunBaseTest(&test);
648 } 654 }
649 } // namespace webrtc 655 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698