admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Fix flaky WebRtcVideoChannel2BaseTest.GetStats T (patchset #1 id:1 of https://codereview.webrtc.org/2634273002/ )

Browse Source 
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: 311a64ccf5

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}
This commit is contained in:
perkj 2017-01-17 05:56:53 -08:00 committed by Commit bot
parent 2013e29df1
commit 0b2d3e217f
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/media/base/videoengine_unittest.h
View File

@ -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);