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

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

Issue 2764133002: Revert of Add framerate to VideoSinkWants and ability to signal on overuse (Closed)
Patch Set: 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 | « webrtc/test/BUILD.gn ('k') | webrtc/test/frame_generator_capturer.h » ('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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 278
279 void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock, 279 void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock,
280 float speed, 280 float speed,
281 int framerate, 281 int framerate,
282 int width, 282 int width,
283 int height) { 283 int height) {
284 frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create( 284 frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create(
285 width, height, framerate * speed, clock)); 285 width, height, framerate * speed, clock));
286 video_send_stream_->SetSource( 286 video_send_stream_->SetSource(
287 frame_generator_capturer_.get(), 287 frame_generator_capturer_.get(),
288 VideoSendStream::DegradationPreference::kMaintainFramerate); 288 VideoSendStream::DegradationPreference::kBalanced);
289 } 289 }
290 290
291 void CallTest::CreateFrameGeneratorCapturer(int framerate, 291 void CallTest::CreateFrameGeneratorCapturer(int framerate,
292 int width, 292 int width,
293 int height) { 293 int height) {
294 frame_generator_capturer_.reset( 294 frame_generator_capturer_.reset(
295 test::FrameGeneratorCapturer::Create(width, height, framerate, clock_)); 295 test::FrameGeneratorCapturer::Create(width, height, framerate, clock_));
296 video_send_stream_->SetSource( 296 video_send_stream_->SetSource(
297 frame_generator_capturer_.get(), 297 frame_generator_capturer_.get(),
298 VideoSendStream::DegradationPreference::kMaintainFramerate); 298 VideoSendStream::DegradationPreference::kBalanced);
299 } 299 }
300 300
301 void CallTest::CreateFakeAudioDevices() { 301 void CallTest::CreateFakeAudioDevices() {
302 fake_send_audio_device_.reset(new FakeAudioDevice( 302 fake_send_audio_device_.reset(new FakeAudioDevice(
303 FakeAudioDevice::CreatePulsedNoiseCapturer(256, 48000), nullptr, 1.f)); 303 FakeAudioDevice::CreatePulsedNoiseCapturer(256, 48000), nullptr, 1.f));
304 fake_recv_audio_device_.reset(new FakeAudioDevice( 304 fake_recv_audio_device_.reset(new FakeAudioDevice(
305 nullptr, FakeAudioDevice::CreateDiscardRenderer(48000), 1.f)); 305 nullptr, FakeAudioDevice::CreateDiscardRenderer(48000), 1.f));
306 } 306 }
307 307
308 void CallTest::CreateVideoStreams() { 308 void CallTest::CreateVideoStreams() {
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 498
499 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { 499 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
500 } 500 }
501 501
502 bool EndToEndTest::ShouldCreateReceivers() const { 502 bool EndToEndTest::ShouldCreateReceivers() const {
503 return true; 503 return true;
504 } 504 }
505 505
506 } // namespace test 506 } // namespace test
507 } // namespace webrtc 507 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/test/BUILD.gn ('k') | webrtc/test/frame_generator_capturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698