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

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

Issue 2783183003: Revert of Add framerate to VideoSinkWants and ability to signal on overuse (Closed)
Patch Set: Created 3 years, 8 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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 284
285 void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock, 285 void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock,
286 float speed, 286 float speed,
287 int framerate, 287 int framerate,
288 int width, 288 int width,
289 int height) { 289 int height) {
290 frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create( 290 frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create(
291 width, height, framerate * speed, clock)); 291 width, height, framerate * speed, clock));
292 video_send_stream_->SetSource( 292 video_send_stream_->SetSource(
293 frame_generator_capturer_.get(), 293 frame_generator_capturer_.get(),
294 VideoSendStream::DegradationPreference::kMaintainFramerate); 294 VideoSendStream::DegradationPreference::kBalanced);
295 } 295 }
296 296
297 void CallTest::CreateFrameGeneratorCapturer(int framerate, 297 void CallTest::CreateFrameGeneratorCapturer(int framerate,
298 int width, 298 int width,
299 int height) { 299 int height) {
300 frame_generator_capturer_.reset( 300 frame_generator_capturer_.reset(
301 test::FrameGeneratorCapturer::Create(width, height, framerate, clock_)); 301 test::FrameGeneratorCapturer::Create(width, height, framerate, clock_));
302 video_send_stream_->SetSource( 302 video_send_stream_->SetSource(
303 frame_generator_capturer_.get(), 303 frame_generator_capturer_.get(),
304 VideoSendStream::DegradationPreference::kMaintainFramerate); 304 VideoSendStream::DegradationPreference::kBalanced);
305 } 305 }
306 306
307 void CallTest::CreateFakeAudioDevices( 307 void CallTest::CreateFakeAudioDevices(
308 std::unique_ptr<FakeAudioDevice::Capturer> capturer, 308 std::unique_ptr<FakeAudioDevice::Capturer> capturer,
309 std::unique_ptr<FakeAudioDevice::Renderer> renderer) { 309 std::unique_ptr<FakeAudioDevice::Renderer> renderer) {
310 fake_send_audio_device_.reset(new FakeAudioDevice( 310 fake_send_audio_device_.reset(new FakeAudioDevice(
311 std::move(capturer), nullptr, 1.f)); 311 std::move(capturer), nullptr, 1.f));
312 fake_recv_audio_device_.reset(new FakeAudioDevice( 312 fake_recv_audio_device_.reset(new FakeAudioDevice(
313 nullptr, std::move(renderer), 1.f)); 313 nullptr, std::move(renderer), 1.f));
314 } 314 }
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 524
525 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { 525 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
526 } 526 }
527 527
528 bool EndToEndTest::ShouldCreateReceivers() const { 528 bool EndToEndTest::ShouldCreateReceivers() const {
529 return true; 529 return true;
530 } 530 }
531 531
532 } // namespace test 532 } // namespace test
533 } // namespace webrtc 533 } // 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