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

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

Issue 2789823002: Reland of Add framerate to VideoSinkWants and ability to signal on overuse (Closed)
Patch Set: Rebase fix 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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 319
320 void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock, 320 void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock,
321 float speed, 321 float speed,
322 int framerate, 322 int framerate,
323 int width, 323 int width,
324 int height) { 324 int height) {
325 frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create( 325 frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create(
326 width, height, framerate * speed, clock)); 326 width, height, framerate * speed, clock));
327 video_send_stream_->SetSource( 327 video_send_stream_->SetSource(
328 frame_generator_capturer_.get(), 328 frame_generator_capturer_.get(),
329 VideoSendStream::DegradationPreference::kBalanced); 329 VideoSendStream::DegradationPreference::kMaintainFramerate);
330 } 330 }
331 331
332 void CallTest::CreateFrameGeneratorCapturer(int framerate, 332 void CallTest::CreateFrameGeneratorCapturer(int framerate,
333 int width, 333 int width,
334 int height) { 334 int height) {
335 frame_generator_capturer_.reset( 335 frame_generator_capturer_.reset(
336 test::FrameGeneratorCapturer::Create(width, height, framerate, clock_)); 336 test::FrameGeneratorCapturer::Create(width, height, framerate, clock_));
337 video_send_stream_->SetSource( 337 video_send_stream_->SetSource(
338 frame_generator_capturer_.get(), 338 frame_generator_capturer_.get(),
339 VideoSendStream::DegradationPreference::kBalanced); 339 VideoSendStream::DegradationPreference::kMaintainFramerate);
340 } 340 }
341 341
342 void CallTest::CreateFakeAudioDevices( 342 void CallTest::CreateFakeAudioDevices(
343 std::unique_ptr<FakeAudioDevice::Capturer> capturer, 343 std::unique_ptr<FakeAudioDevice::Capturer> capturer,
344 std::unique_ptr<FakeAudioDevice::Renderer> renderer) { 344 std::unique_ptr<FakeAudioDevice::Renderer> renderer) {
345 fake_send_audio_device_.reset(new FakeAudioDevice( 345 fake_send_audio_device_.reset(new FakeAudioDevice(
346 std::move(capturer), nullptr, 1.f)); 346 std::move(capturer), nullptr, 1.f));
347 fake_recv_audio_device_.reset(new FakeAudioDevice( 347 fake_recv_audio_device_.reset(new FakeAudioDevice(
348 nullptr, std::move(renderer), 1.f)); 348 nullptr, std::move(renderer), 1.f));
349 } 349 }
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 561
562 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { 562 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
563 } 563 }
564 564
565 bool EndToEndTest::ShouldCreateReceivers() const { 565 bool EndToEndTest::ShouldCreateReceivers() const {
566 return true; 566 return true;
567 } 567 }
568 568
569 } // namespace test 569 } // namespace test
570 } // namespace webrtc 570 } // 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