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

Side by Side Diff: test/call_test.cc

Issue 3010003002: Set protected_by_flexfec flag properly in tests. (Closed)
Patch Set: Rebase. 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 | « media/engine/webrtcvideoengine_unittest.cc ('k') | video/video_quality_test.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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 for (size_t i = 0; i < video_send_config_.rtp.ssrcs.size(); ++i) { 249 for (size_t i = 0; i < video_send_config_.rtp.ssrcs.size(); ++i) {
250 VideoReceiveStream::Decoder decoder = 250 VideoReceiveStream::Decoder decoder =
251 test::CreateMatchingDecoder(video_send_config_.encoder_settings); 251 test::CreateMatchingDecoder(video_send_config_.encoder_settings);
252 allocated_decoders_.push_back( 252 allocated_decoders_.push_back(
253 std::unique_ptr<VideoDecoder>(decoder.decoder)); 253 std::unique_ptr<VideoDecoder>(decoder.decoder));
254 video_config.decoders.clear(); 254 video_config.decoders.clear();
255 video_config.decoders.push_back(decoder); 255 video_config.decoders.push_back(decoder);
256 video_config.rtp.remote_ssrc = video_send_config_.rtp.ssrcs[i]; 256 video_config.rtp.remote_ssrc = video_send_config_.rtp.ssrcs[i];
257 video_receive_configs_.push_back(video_config.Copy()); 257 video_receive_configs_.push_back(video_config.Copy());
258 } 258 }
259 video_receive_configs_[0].rtp.protected_by_flexfec =
260 (num_flexfec_streams_ == 1);
259 } 261 }
260 262
261 RTC_DCHECK_GE(1, num_audio_streams_); 263 RTC_DCHECK_GE(1, num_audio_streams_);
262 if (num_audio_streams_ == 1) { 264 if (num_audio_streams_ == 1) {
263 RTC_DCHECK_LE(0, voe_send_.channel_id); 265 RTC_DCHECK_LE(0, voe_send_.channel_id);
264 AudioReceiveStream::Config audio_config; 266 AudioReceiveStream::Config audio_config;
265 audio_config.rtp.local_ssrc = kReceiverLocalAudioSsrc; 267 audio_config.rtp.local_ssrc = kReceiverLocalAudioSsrc;
266 audio_config.rtcp_send_transport = rtcp_send_transport; 268 audio_config.rtcp_send_transport = rtcp_send_transport;
267 audio_config.voe_channel_id = voe_recv_.channel_id; 269 audio_config.voe_channel_id = voe_recv_.channel_id;
268 audio_config.rtp.remote_ssrc = audio_send_config_.rtp.ssrc; 270 audio_config.rtp.remote_ssrc = audio_send_config_.rtp.ssrc;
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 605
604 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { 606 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
605 } 607 }
606 608
607 bool EndToEndTest::ShouldCreateReceivers() const { 609 bool EndToEndTest::ShouldCreateReceivers() const {
608 return true; 610 return true;
609 } 611 }
610 612
611 } // namespace test 613 } // namespace test
612 } // namespace webrtc 614 } // namespace webrtc
OLDNEW
« no previous file with comments | « media/engine/webrtcvideoengine_unittest.cc ('k') | video/video_quality_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698