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

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

Issue 2621573002: Remove FlexfecConfig and replace with specific struct in VideoSendStream. (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_unittest.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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 if (num_audio_streams > 0) { 224 if (num_audio_streams > 0) {
225 audio_send_config_ = AudioSendStream::Config(send_transport); 225 audio_send_config_ = AudioSendStream::Config(send_transport);
226 audio_send_config_.voe_channel_id = voe_send_.channel_id; 226 audio_send_config_.voe_channel_id = voe_send_.channel_id;
227 audio_send_config_.rtp.ssrc = kAudioSendSsrc; 227 audio_send_config_.rtp.ssrc = kAudioSendSsrc;
228 audio_send_config_.send_codec_spec.codec_inst = 228 audio_send_config_.send_codec_spec.codec_inst =
229 CodecInst{kAudioSendPayloadType, "ISAC", 16000, 480, 1, 32000}; 229 CodecInst{kAudioSendPayloadType, "ISAC", 16000, 480, 1, 32000};
230 } 230 }
231 231
232 // TODO(brandtr): Update this when we support multistream protection. 232 // TODO(brandtr): Update this when we support multistream protection.
233 if (num_flexfec_streams > 0) { 233 if (num_flexfec_streams > 0) {
234 video_send_config_.rtp.flexfec.flexfec_payload_type = kFlexfecPayloadType; 234 video_send_config_.rtp.flexfec.payload_type = kFlexfecPayloadType;
235 video_send_config_.rtp.flexfec.flexfec_ssrc = kFlexfecSendSsrc; 235 video_send_config_.rtp.flexfec.ssrc = kFlexfecSendSsrc;
236 video_send_config_.rtp.flexfec.protected_media_ssrcs = {kVideoSendSsrcs[0]}; 236 video_send_config_.rtp.flexfec.protected_media_ssrcs = {kVideoSendSsrcs[0]};
237 } 237 }
238 } 238 }
239 239
240 void CallTest::CreateMatchingReceiveConfigs(Transport* rtcp_send_transport) { 240 void CallTest::CreateMatchingReceiveConfigs(Transport* rtcp_send_transport) {
241 RTC_DCHECK(video_receive_configs_.empty()); 241 RTC_DCHECK(video_receive_configs_.empty());
242 RTC_DCHECK(allocated_decoders_.empty()); 242 RTC_DCHECK(allocated_decoders_.empty());
243 if (num_video_streams_ > 0) { 243 if (num_video_streams_ > 0) {
244 RTC_DCHECK(!video_send_config_.rtp.ssrcs.empty()); 244 RTC_DCHECK(!video_send_config_.rtp.ssrcs.empty());
245 VideoReceiveStream::Config video_config(rtcp_send_transport); 245 VideoReceiveStream::Config video_config(rtcp_send_transport);
(...skipping 262 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_unittest.cc ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698