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

Side by Side Diff: webrtc/video/bitrate_estimator_tests.cc

Issue 1256803004: Control combined_audio_video_bwe with config bool. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: default config combined_audio_video_bwe to false Created 5 years, 5 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/video/audio_receive_stream.cc ('k') | no next file » | 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 <functional> 10 #include <functional>
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 203
204 if (receive_audio) { 204 if (receive_audio) {
205 AudioReceiveStream::Config receive_config; 205 AudioReceiveStream::Config receive_config;
206 receive_config.rtp.remote_ssrc = test_->send_config_.rtp.ssrcs[0]; 206 receive_config.rtp.remote_ssrc = test_->send_config_.rtp.ssrcs[0];
207 // Bogus non-default id to prevent hitting a DCHECK when creating the 207 // Bogus non-default id to prevent hitting a DCHECK when creating the
208 // AudioReceiveStream. Every receive stream has to correspond to an 208 // AudioReceiveStream. Every receive stream has to correspond to an
209 // underlying channel id. 209 // underlying channel id.
210 receive_config.voe_channel_id = 0; 210 receive_config.voe_channel_id = 0;
211 receive_config.rtp.extensions.push_back( 211 receive_config.rtp.extensions.push_back(
212 RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId)); 212 RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId));
213 receive_config.combined_audio_video_bwe = true;
213 audio_receive_stream_ = test_->receiver_call_->CreateAudioReceiveStream( 214 audio_receive_stream_ = test_->receiver_call_->CreateAudioReceiveStream(
214 receive_config); 215 receive_config);
215 } else { 216 } else {
216 VideoReceiveStream::Decoder decoder; 217 VideoReceiveStream::Decoder decoder;
217 decoder.decoder = &fake_decoder_; 218 decoder.decoder = &fake_decoder_;
218 decoder.payload_type = 219 decoder.payload_type =
219 test_->send_config_.encoder_settings.payload_type; 220 test_->send_config_.encoder_settings.payload_type;
220 decoder.payload_name = 221 decoder.payload_name =
221 test_->send_config_.encoder_settings.payload_name; 222 test_->send_config_.encoder_settings.payload_name;
222 test_->receive_config_.decoders.push_back(decoder); 223 test_->receive_config_.decoders.push_back(decoder);
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 RtpExtension(RtpExtension::kTOffset, kTOFExtensionId); 362 RtpExtension(RtpExtension::kTOffset, kTOFExtensionId);
362 receiver_trace_.PushExpectedLogLine( 363 receiver_trace_.PushExpectedLogLine(
363 "WrappingBitrateEstimator: Switching to transmission time offset RBE."); 364 "WrappingBitrateEstimator: Switching to transmission time offset RBE.");
364 receiver_trace_.PushExpectedLogLine(kSingleStreamLog); 365 receiver_trace_.PushExpectedLogLine(kSingleStreamLog);
365 streams_.push_back(new Stream(this, false)); 366 streams_.push_back(new Stream(this, false));
366 streams_[0]->StopSending(); 367 streams_[0]->StopSending();
367 streams_[1]->StopSending(); 368 streams_[1]->StopSending();
368 EXPECT_EQ(kEventSignaled, receiver_trace_.Wait()); 369 EXPECT_EQ(kEventSignaled, receiver_trace_.Wait());
369 } 370 }
370 } // namespace webrtc 371 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/audio_receive_stream.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698