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

Side by Side Diff: webrtc/test/call_test.cc

Issue 2589713003: Make |rtcp_send_transport| mandatory in FlexfecReceiveStream::Config. (Closed)
Patch Set: Rebase. Created 3 years, 11 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/media/engine/webrtcvideoengine2.cc ('k') | webrtc/video/end_to_end_tests.cc » ('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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 audio_config.rtcp_send_transport = rtcp_send_transport; 268 audio_config.rtcp_send_transport = rtcp_send_transport;
269 audio_config.voe_channel_id = voe_recv_.channel_id; 269 audio_config.voe_channel_id = voe_recv_.channel_id;
270 audio_config.rtp.remote_ssrc = audio_send_config_.rtp.ssrc; 270 audio_config.rtp.remote_ssrc = audio_send_config_.rtp.ssrc;
271 audio_config.decoder_factory = decoder_factory_; 271 audio_config.decoder_factory = decoder_factory_;
272 audio_receive_configs_.push_back(audio_config); 272 audio_receive_configs_.push_back(audio_config);
273 } 273 }
274 274
275 // TODO(brandtr): Update this when we support multistream protection. 275 // TODO(brandtr): Update this when we support multistream protection.
276 RTC_DCHECK(num_flexfec_streams_ <= 1); 276 RTC_DCHECK(num_flexfec_streams_ <= 1);
277 if (num_flexfec_streams_ == 1) { 277 if (num_flexfec_streams_ == 1) {
278 FlexfecReceiveStream::Config config; 278 FlexfecReceiveStream::Config config(rtcp_send_transport);
279 config.payload_type = kFlexfecPayloadType; 279 config.payload_type = kFlexfecPayloadType;
280 config.remote_ssrc = kFlexfecSendSsrc; 280 config.remote_ssrc = kFlexfecSendSsrc;
281 config.protected_media_ssrcs = {kVideoSendSsrcs[0]}; 281 config.protected_media_ssrcs = {kVideoSendSsrcs[0]};
282 for (const RtpExtension& extension : video_send_config_.rtp.extensions) 282 for (const RtpExtension& extension : video_send_config_.rtp.extensions)
283 config.rtp_header_extensions.push_back(extension); 283 config.rtp_header_extensions.push_back(extension);
284 flexfec_receive_configs_.push_back(config); 284 flexfec_receive_configs_.push_back(config);
285 } 285 }
286 } 286 }
287 287
288 void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock, 288 void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock,
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 508
509 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { 509 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
510 } 510 }
511 511
512 bool EndToEndTest::ShouldCreateReceivers() const { 512 bool EndToEndTest::ShouldCreateReceivers() const {
513 return true; 513 return true;
514 } 514 }
515 515
516 } // namespace test 516 } // namespace test
517 } // namespace webrtc 517 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2.cc ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698