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

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

Issue 2669413003: Enable send-side BWE by default for video in call tests. (Closed)
Patch Set: . Created 3 years, 10 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
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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 RTC_DCHECK_LE(num_audio_streams, 1); 193 RTC_DCHECK_LE(num_audio_streams, 1);
194 RTC_DCHECK_LE(num_flexfec_streams, 1); 194 RTC_DCHECK_LE(num_flexfec_streams, 1);
195 RTC_DCHECK(num_audio_streams == 0 || voe_send_.channel_id >= 0); 195 RTC_DCHECK(num_audio_streams == 0 || voe_send_.channel_id >= 0);
196 if (num_video_streams > 0) { 196 if (num_video_streams > 0) {
197 video_send_config_ = VideoSendStream::Config(send_transport); 197 video_send_config_ = VideoSendStream::Config(send_transport);
198 video_send_config_.encoder_settings.encoder = &fake_encoder_; 198 video_send_config_.encoder_settings.encoder = &fake_encoder_;
199 video_send_config_.encoder_settings.payload_name = "FAKE"; 199 video_send_config_.encoder_settings.payload_name = "FAKE";
200 video_send_config_.encoder_settings.payload_type = 200 video_send_config_.encoder_settings.payload_type =
201 kFakeVideoSendPayloadType; 201 kFakeVideoSendPayloadType;
202 video_send_config_.rtp.extensions.push_back( 202 video_send_config_.rtp.extensions.push_back(
203 RtpExtension(RtpExtension::kAbsSendTimeUri, kAbsSendTimeExtensionId)); 203 RtpExtension(RtpExtension::kTransportSequenceNumberUri,
204 kTransportSequenceNumberExtensionId));
204 FillEncoderConfiguration(num_video_streams, &video_encoder_config_); 205 FillEncoderConfiguration(num_video_streams, &video_encoder_config_);
205 206
206 for (size_t i = 0; i < num_video_streams; ++i) 207 for (size_t i = 0; i < num_video_streams; ++i)
207 video_send_config_.rtp.ssrcs.push_back(kVideoSendSsrcs[i]); 208 video_send_config_.rtp.ssrcs.push_back(kVideoSendSsrcs[i]);
208 video_send_config_.rtp.extensions.push_back(RtpExtension( 209 video_send_config_.rtp.extensions.push_back(RtpExtension(
209 RtpExtension::kVideoRotationUri, kVideoRotationRtpExtensionId)); 210 RtpExtension::kVideoRotationUri, kVideoRotationRtpExtensionId));
210 } 211 }
211 212
212 if (num_audio_streams > 0) { 213 if (num_audio_streams > 0) {
213 audio_send_config_ = AudioSendStream::Config(send_transport); 214 audio_send_config_ = AudioSendStream::Config(send_transport);
(...skipping 10 matching lines...) Expand all
224 video_send_config_.rtp.flexfec.protected_media_ssrcs = {kVideoSendSsrcs[0]}; 225 video_send_config_.rtp.flexfec.protected_media_ssrcs = {kVideoSendSsrcs[0]};
225 } 226 }
226 } 227 }
227 228
228 void CallTest::CreateMatchingReceiveConfigs(Transport* rtcp_send_transport) { 229 void CallTest::CreateMatchingReceiveConfigs(Transport* rtcp_send_transport) {
229 RTC_DCHECK(video_receive_configs_.empty()); 230 RTC_DCHECK(video_receive_configs_.empty());
230 RTC_DCHECK(allocated_decoders_.empty()); 231 RTC_DCHECK(allocated_decoders_.empty());
231 if (num_video_streams_ > 0) { 232 if (num_video_streams_ > 0) {
232 RTC_DCHECK(!video_send_config_.rtp.ssrcs.empty()); 233 RTC_DCHECK(!video_send_config_.rtp.ssrcs.empty());
233 VideoReceiveStream::Config video_config(rtcp_send_transport); 234 VideoReceiveStream::Config video_config(rtcp_send_transport);
234 video_config.rtp.remb = true; 235 video_config.rtp.remb = false;
236 video_config.rtp.transport_cc = true;
235 video_config.rtp.local_ssrc = kReceiverLocalVideoSsrc; 237 video_config.rtp.local_ssrc = kReceiverLocalVideoSsrc;
236 for (const RtpExtension& extension : video_send_config_.rtp.extensions) 238 for (const RtpExtension& extension : video_send_config_.rtp.extensions)
237 video_config.rtp.extensions.push_back(extension); 239 video_config.rtp.extensions.push_back(extension);
238 video_config.renderer = &fake_renderer_; 240 video_config.renderer = &fake_renderer_;
239 for (size_t i = 0; i < video_send_config_.rtp.ssrcs.size(); ++i) { 241 for (size_t i = 0; i < video_send_config_.rtp.ssrcs.size(); ++i) {
240 VideoReceiveStream::Decoder decoder = 242 VideoReceiveStream::Decoder decoder =
241 test::CreateMatchingDecoder(video_send_config_.encoder_settings); 243 test::CreateMatchingDecoder(video_send_config_.encoder_settings);
242 allocated_decoders_.push_back( 244 allocated_decoders_.push_back(
243 std::unique_ptr<VideoDecoder>(decoder.decoder)); 245 std::unique_ptr<VideoDecoder>(decoder.decoder));
244 video_config.decoders.clear(); 246 video_config.decoders.clear();
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 495
494 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { 496 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
495 } 497 }
496 498
497 bool EndToEndTest::ShouldCreateReceivers() const { 499 bool EndToEndTest::ShouldCreateReceivers() const {
498 return true; 500 return true;
499 } 501 }
500 502
501 } // namespace test 503 } // namespace test
502 } // namespace webrtc 504 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698