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

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

Issue 2304363002: Let ViEEncoder express resolution requests as Sinkwants (Closed)
Patch Set: Revert changes to OveruseFrameDetector. Fix merge mistake Created 4 years, 1 month 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
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 #include "webrtc/base/checks.h" 10 #include "webrtc/base/checks.h"
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 } 240 }
241 } 241 }
242 242
243 void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock, 243 void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock,
244 float speed, 244 float speed,
245 int framerate, 245 int framerate,
246 int width, 246 int width,
247 int height) { 247 int height) {
248 frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create( 248 frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create(
249 width, height, framerate * speed, clock)); 249 width, height, framerate * speed, clock));
250 video_send_stream_->SetSource(frame_generator_capturer_.get()); 250 video_send_stream_->SetSource(
251 frame_generator_capturer_.get(),
252 VideoSendStream::DegradationPreference::kBalanced);
251 } 253 }
252 254
253 void CallTest::CreateFrameGeneratorCapturer(int framerate, 255 void CallTest::CreateFrameGeneratorCapturer(int framerate,
254 int width, 256 int width,
255 int height) { 257 int height) {
256 frame_generator_capturer_.reset( 258 frame_generator_capturer_.reset(
257 test::FrameGeneratorCapturer::Create(width, height, framerate, clock_)); 259 test::FrameGeneratorCapturer::Create(width, height, framerate, clock_));
258 video_send_stream_->SetSource(frame_generator_capturer_.get()); 260 video_send_stream_->SetSource(
261 frame_generator_capturer_.get(),
262 VideoSendStream::DegradationPreference::kBalanced);
259 } 263 }
260 264
261 void CallTest::CreateFakeAudioDevices() { 265 void CallTest::CreateFakeAudioDevices() {
262 fake_send_audio_device_.reset(new FakeAudioDevice( 266 fake_send_audio_device_.reset(new FakeAudioDevice(
263 clock_, test::ResourcePath("voice_engine/audio_long16", "pcm"), 267 clock_, test::ResourcePath("voice_engine/audio_long16", "pcm"),
264 DriftingClock::kNoDrift)); 268 DriftingClock::kNoDrift));
265 fake_recv_audio_device_.reset(new FakeAudioDevice( 269 fake_recv_audio_device_.reset(new FakeAudioDevice(
266 clock_, test::ResourcePath("voice_engine/audio_long16", "pcm"), 270 clock_, test::ResourcePath("voice_engine/audio_long16", "pcm"),
267 DriftingClock::kNoDrift)); 271 DriftingClock::kNoDrift));
268 } 272 }
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 448
445 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { 449 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
446 } 450 }
447 451
448 bool EndToEndTest::ShouldCreateReceivers() const { 452 bool EndToEndTest::ShouldCreateReceivers() const {
449 return true; 453 return true;
450 } 454 }
451 455
452 } // namespace test 456 } // namespace test
453 } // namespace webrtc 457 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698