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

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

Issue 3000273002: Reverse |rtx_payload_types| map, and rename. (Closed)
Patch Set: Rebased. Created 3 years, 3 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
« no previous file with comments | « webrtc/call/call.cc ('k') | webrtc/call/video_receive_stream.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 send_config->rtp.ulpfec.ulpfec_payload_type; 208 send_config->rtp.ulpfec.ulpfec_payload_type;
209 if (rtx_) { 209 if (rtx_) {
210 recv_config.rtp.ulpfec.red_rtx_payload_type = 210 recv_config.rtp.ulpfec.red_rtx_payload_type =
211 send_config->rtp.ulpfec.red_rtx_payload_type; 211 send_config->rtp.ulpfec.red_rtx_payload_type;
212 } 212 }
213 } 213 }
214 214
215 if (rtx_) { 215 if (rtx_) {
216 recv_config.rtp.rtx_ssrc = video_rtx_ssrcs_[i]; 216 recv_config.rtp.rtx_ssrc = video_rtx_ssrcs_[i];
217 recv_config.rtp 217 recv_config.rtp
218 .rtx_payload_types[send_config->encoder_settings.payload_type] = 218 .rtx_associated_payload_types[send_config->rtp.rtx.payload_type] =
219 send_config->rtp.rtx.payload_type; 219 send_config->encoder_settings.payload_type;
220 } 220 }
221 ++i; 221 ++i;
222 } 222 }
223 223
224 RTC_DCHECK_LE(num_flexfec_streams_, 1); 224 RTC_DCHECK_LE(num_flexfec_streams_, 1);
225 if (num_flexfec_streams_ == 1) { 225 if (num_flexfec_streams_ == 1) {
226 send_config->rtp.flexfec.payload_type = test::CallTest::kFlexfecPayloadType; 226 send_config->rtp.flexfec.payload_type = test::CallTest::kFlexfecPayloadType;
227 send_config->rtp.flexfec.ssrc = test::CallTest::kFlexfecSendSsrc; 227 send_config->rtp.flexfec.ssrc = test::CallTest::kFlexfecSendSsrc;
228 send_config->rtp.flexfec.protected_media_ssrcs = {video_ssrcs_[0]}; 228 send_config->rtp.flexfec.protected_media_ssrcs = {video_ssrcs_[0]};
229 } 229 }
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 RunBaseTest(&test); 643 RunBaseTest(&test);
644 } 644 }
645 645
646 TEST_F(RampUpTest, AudioTransportSequenceNumber) { 646 TEST_F(RampUpTest, AudioTransportSequenceNumber) {
647 RampUpTester test(0, 1, 0, 300000, 10000, 647 RampUpTester test(0, 1, 0, 300000, 10000,
648 RtpExtension::kTransportSequenceNumberUri, false, false, 648 RtpExtension::kTransportSequenceNumberUri, false, false,
649 false); 649 false);
650 RunBaseTest(&test); 650 RunBaseTest(&test);
651 } 651 }
652 } // namespace webrtc 652 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/call/call.cc ('k') | webrtc/call/video_receive_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698