From 2013e29df1a496974ccab8f2043aec9d278dfd8a Mon Sep 17 00:00:00 2001 From: nisse Date: Tue, 17 Jan 2017 05:45:40 -0800 Subject: [PATCH] Disable automatic scaling in tests. BUG=webrtc:6990 Review-Url: https://codereview.webrtc.org/2636903004 Cr-Commit-Position: refs/heads/master@{#16119} --- webrtc/media/base/videoengine_unittest.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h index 383fafbbc4..b434aaa8b6 100644 --- a/webrtc/media/base/videoengine_unittest.h +++ b/webrtc/media/base/videoengine_unittest.h @@ -82,7 +82,13 @@ class VideoMediaChannelTest : public testing::Test, virtual void SetUp() { engine_.Init(); - channel_.reset(engine_.CreateChannel(call_.get(), cricket::MediaConfig(), + cricket::MediaConfig media_config; + // Disabling cpu overuse detection actually disables quality scaling too; it + // implies DegradationPreference kMaintainResolution. Automatic scaling + // needs to be disabled, otherwise, tests which check the size of received + // frames become flaky. + media_config.video.enable_cpu_overuse_detection = false; + channel_.reset(engine_.CreateChannel(call_.get(), media_config, cricket::VideoOptions())); channel_->OnReadyToSend(true); EXPECT_TRUE(channel_.get() != NULL);