From ebee401230bfb57a011e2e66a0f59d468c6941f0 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Wed, 3 Sep 2014 15:52:02 +0000 Subject: [PATCH] Remove flake in SendsLowerResolutionOnSmallerFrames. Speculative fix for break on Linux64 Release. It looks like the second frame is being dropped which is likely because the two frames are sent too close to eachother. Adding a delay of 33ms in between them to make sure the second one isn't dropped. R=minyue@webrtc.org TBR=pthatcher@webrtc.org BUG=1788 Review URL: https://webrtc-codereview.appspot.com/22289004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7043 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/base/videoengine_unittest.h | 1 + 1 file changed, 1 insertion(+) diff --git a/talk/media/base/videoengine_unittest.h b/talk/media/base/videoengine_unittest.h index aa5eff0e50..8eab347d59 100644 --- a/talk/media/base/videoengine_unittest.h +++ b/talk/media/base/videoengine_unittest.h @@ -1607,6 +1607,7 @@ class VideoMediaChannelTest : public testing::Test, EXPECT_FRAME_WAIT(1, codec.width, codec.height, kTimeout); // Check that we send smaller frames at the new resolution. + EXPECT_TRUE(rtc::Thread::Current()->ProcessMessages(33)); EXPECT_TRUE(video_capturer_->CaptureCustomFrame( codec.width / 2, codec.height / 2, cricket::FOURCC_I420)); EXPECT_FRAME_WAIT(2, codec.width / 2, codec.height / 2, kTimeout);