From 0b2d3e217f8d63f69d2014c8f708a76bfaac2d59 Mon Sep 17 00:00:00 2001 From: perkj Date: Tue, 17 Jan 2017 05:56:53 -0800 Subject: [PATCH] Revert of Fix flaky WebRtcVideoChannel2BaseTest.GetStats T (patchset #1 id:1 of https://codereview.webrtc.org/2634273002/ ) Reason for revert: nisse landed a change that always disable adaptation in these tests. Original issue's description: > 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} > Committed: https://chromium.googlesource.com/external/webrtc/+/311a64ccf535d5013c5cd2c46795a37260d06165 TBR=sprang@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6990 Review-Url: https://codereview.webrtc.org/2639573002 Cr-Commit-Position: refs/heads/master@{#16120} --- webrtc/media/base/videoengine_unittest.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h index b434aaa8b6..7758c1e4ad 100644 --- a/webrtc/media/base/videoengine_unittest.h +++ b/webrtc/media/base/videoengine_unittest.h @@ -459,12 +459,8 @@ 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); - // 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_EQ(kVideoWidth, info.receivers[0].frame_width); + EXPECT_EQ(kVideoHeight, info.receivers[0].frame_height); EXPECT_GT(info.receivers[0].framerate_rcvd, 0); EXPECT_GT(info.receivers[0].framerate_decoded, 0); EXPECT_GT(info.receivers[0].framerate_output, 0);