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

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

Issue 1839603002: Remove webrtc::ScopedVector (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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/test/call_test.h ('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 #include "webrtc/base/checks.h" 10 #include "webrtc/base/checks.h"
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 if (num_video_streams_ > 0) { 209 if (num_video_streams_ > 0) {
210 RTC_DCHECK(!video_send_config_.rtp.ssrcs.empty()); 210 RTC_DCHECK(!video_send_config_.rtp.ssrcs.empty());
211 VideoReceiveStream::Config video_config(rtcp_send_transport); 211 VideoReceiveStream::Config video_config(rtcp_send_transport);
212 video_config.rtp.remb = true; 212 video_config.rtp.remb = true;
213 video_config.rtp.local_ssrc = kReceiverLocalVideoSsrc; 213 video_config.rtp.local_ssrc = kReceiverLocalVideoSsrc;
214 for (const RtpExtension& extension : video_send_config_.rtp.extensions) 214 for (const RtpExtension& extension : video_send_config_.rtp.extensions)
215 video_config.rtp.extensions.push_back(extension); 215 video_config.rtp.extensions.push_back(extension);
216 for (size_t i = 0; i < video_send_config_.rtp.ssrcs.size(); ++i) { 216 for (size_t i = 0; i < video_send_config_.rtp.ssrcs.size(); ++i) {
217 VideoReceiveStream::Decoder decoder = 217 VideoReceiveStream::Decoder decoder =
218 test::CreateMatchingDecoder(video_send_config_.encoder_settings); 218 test::CreateMatchingDecoder(video_send_config_.encoder_settings);
219 allocated_decoders_.push_back(decoder.decoder); 219 allocated_decoders_.push_back(
220 std::unique_ptr<VideoDecoder>(decoder.decoder));
220 video_config.decoders.clear(); 221 video_config.decoders.clear();
221 video_config.decoders.push_back(decoder); 222 video_config.decoders.push_back(decoder);
222 video_config.rtp.remote_ssrc = video_send_config_.rtp.ssrcs[i]; 223 video_config.rtp.remote_ssrc = video_send_config_.rtp.ssrcs[i];
223 video_receive_configs_.push_back(video_config); 224 video_receive_configs_.push_back(video_config);
224 } 225 }
225 } 226 }
226 227
227 RTC_DCHECK(num_audio_streams_ <= 1); 228 RTC_DCHECK(num_audio_streams_ <= 1);
228 if (num_audio_streams_ == 1) { 229 if (num_audio_streams_ == 1) {
229 RTC_DCHECK(voe_send_.channel_id >= 0); 230 RTC_DCHECK(voe_send_.channel_id >= 0);
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 446
446 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { 447 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
447 } 448 }
448 449
449 bool EndToEndTest::ShouldCreateReceivers() const { 450 bool EndToEndTest::ShouldCreateReceivers() const {
450 return true; 451 return true;
451 } 452 }
452 453
453 } // namespace test 454 } // namespace test
454 } // namespace webrtc 455 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/test/call_test.h ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698