From 311a64ccf535d5013c5cd2c46795a37260d06165 Mon Sep 17 00:00:00 2001 From: perkj Date: Tue, 17 Jan 2017 04:37:02 -0800 Subject: [PATCH] Fix flaky WebRtcVideoChannel2BaseTest.GetStats T This cl allows width and height of the produced encoded stream to be smaller than the configured camera resolution. This is since quality and cpu adapters may request a scaled input frame. BUG=webrtc:6990 Review-Url: https://codereview.webrtc.org/2634273002 Cr-Commit-Position: refs/heads/master@{#16118} --- webrtc/media/base/videoengine_unittest.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h index a571bbc4bf..383fafbbc4 100644 --- a/webrtc/media/base/videoengine_unittest.h +++ b/webrtc/media/base/videoengine_unittest.h @@ -453,8 +453,12 @@ class VideoMediaChannelTest : public testing::Test, EXPECT_EQ(0, info.receivers[0].firs_sent); EXPECT_EQ(0, info.receivers[0].plis_sent); EXPECT_EQ(0, info.receivers[0].nacks_sent); - EXPECT_EQ(kVideoWidth, info.receivers[0].frame_width); - EXPECT_EQ(kVideoHeight, info.receivers[0].frame_height); + // Resolution may be lower than the initial capture resolution due to + // quality and cpu adaptation. + EXPECT_LE(info.receivers[0].frame_width, kVideoWidth); + EXPECT_GT(info.receivers[0].frame_width, kVideoWidth / 2); + EXPECT_LE(info.receivers[0].frame_height, kVideoHeight); + EXPECT_GT(info.receivers[0].frame_height, kVideoHeight / 2); EXPECT_GT(info.receivers[0].framerate_rcvd, 0); EXPECT_GT(info.receivers[0].framerate_decoded, 0); EXPECT_GT(info.receivers[0].framerate_output, 0);