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

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

Issue 2716643002: Add framerate to VideoSinkWants and ability to signal on overuse (Closed)
Patch Set: Addressed comments, fixed missing include Created 3 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 | « no previous file | webrtc/call/call_perf_tests.cc » ('j') | webrtc/call/call_perf_tests.cc » ('J')
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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 test_->video_send_config_.encoder_settings.encoder = &fake_encoder_; 165 test_->video_send_config_.encoder_settings.encoder = &fake_encoder_;
166 send_stream_ = test_->sender_call_->CreateVideoSendStream( 166 send_stream_ = test_->sender_call_->CreateVideoSendStream(
167 test_->video_send_config_.Copy(), 167 test_->video_send_config_.Copy(),
168 test_->video_encoder_config_.Copy()); 168 test_->video_encoder_config_.Copy());
169 RTC_DCHECK_EQ(1, test_->video_encoder_config_.number_of_streams); 169 RTC_DCHECK_EQ(1, test_->video_encoder_config_.number_of_streams);
170 frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create( 170 frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create(
171 kDefaultWidth, kDefaultHeight, kDefaultFramerate, 171 kDefaultWidth, kDefaultHeight, kDefaultFramerate,
172 Clock::GetRealTimeClock())); 172 Clock::GetRealTimeClock()));
173 send_stream_->SetSource( 173 send_stream_->SetSource(
174 frame_generator_capturer_.get(), 174 frame_generator_capturer_.get(),
175 VideoSendStream::DegradationPreference::kBalanced); 175 VideoSendStream::DegradationPreference::kMaintainFramerate);
stefan-webrtc 2017/03/21 15:37:36 Isn't balanced a better default, or why do we chan
sprang_webrtc 2017/03/21 15:59:18 Balanced was never balanced. It was maintain-frame
176 send_stream_->Start(); 176 send_stream_->Start();
177 frame_generator_capturer_->Start(); 177 frame_generator_capturer_->Start();
178 178
179 VideoReceiveStream::Decoder decoder; 179 VideoReceiveStream::Decoder decoder;
180 decoder.decoder = &fake_decoder_; 180 decoder.decoder = &fake_decoder_;
181 decoder.payload_type = 181 decoder.payload_type =
182 test_->video_send_config_.encoder_settings.payload_type; 182 test_->video_send_config_.encoder_settings.payload_type;
183 decoder.payload_name = 183 decoder.payload_name =
184 test_->video_send_config_.encoder_settings.payload_name; 184 test_->video_send_config_.encoder_settings.payload_name;
185 test_->receive_config_.decoders.clear(); 185 test_->receive_config_.decoders.clear();
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 RtpExtension(RtpExtension::kTimestampOffsetUri, kTOFExtensionId); 297 RtpExtension(RtpExtension::kTimestampOffsetUri, kTOFExtensionId);
298 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); 298 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog);
299 receiver_log_.PushExpectedLogLine( 299 receiver_log_.PushExpectedLogLine(
300 "WrappingBitrateEstimator: Switching to transmission time offset RBE."); 300 "WrappingBitrateEstimator: Switching to transmission time offset RBE.");
301 streams_.push_back(new Stream(this)); 301 streams_.push_back(new Stream(this));
302 streams_[0]->StopSending(); 302 streams_[0]->StopSending();
303 streams_[1]->StopSending(); 303 streams_[1]->StopSending();
304 EXPECT_TRUE(receiver_log_.Wait()); 304 EXPECT_TRUE(receiver_log_.Wait());
305 } 305 }
306 } // namespace webrtc 306 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/call/call_perf_tests.cc » ('j') | webrtc/call/call_perf_tests.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698