diff options
| author | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-08-15 23:38:54 +0000 |
|---|---|---|
| committer | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-08-15 23:38:54 +0000 |
| commit | fdedc6fe2f331fce751de4415b7643d6a5b1caf6 (patch) | |
| tree | 94c8767298d5591ea6e7a8acf340d9373b6c10a4 /media/base/videoengine_unittest.h | |
| parent | 32ed9d95190cb89940d764fc790a5039c53ac9ca (diff) | |
| download | talk-fdedc6fe2f331fce751de4415b7643d6a5b1caf6.tar.gz | |
Update talk to 50918584.
Together with Stefan's http://review.webrtc.org/1960004/.
R=mallinath@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2048004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@4556 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/base/videoengine_unittest.h')
| -rw-r--r-- | media/base/videoengine_unittest.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/media/base/videoengine_unittest.h b/media/base/videoengine_unittest.h index e9f7612..00ae4ba 100644 --- a/media/base/videoengine_unittest.h +++ b/media/base/videoengine_unittest.h @@ -1373,8 +1373,10 @@ class VideoMediaChannelTest : public testing::Test, EXPECT_EQ(0, renderer.num_rendered_frames()); EXPECT_TRUE(SendFrame()); - EXPECT_FRAME_ON_RENDERER_WAIT(renderer, 1, codec.width, codec.height, - kTimeout); + EXPECT_TRUE_WAIT(renderer.num_rendered_frames() >= 1 && + codec.width == renderer.width() && + codec.height == renderer.height(), kTimeout); + EXPECT_EQ(0, renderer.errors()); // Registering an external capturer is currently the same as screen casting // (update the test when this changes). @@ -1392,8 +1394,8 @@ class VideoMediaChannelTest : public testing::Test, EXPECT_TRUE(capturer->CaptureCustomFrame(kWidth, kHeight, cricket::FOURCC_ARGB)); EXPECT_TRUE(capturer->CaptureFrame()); - EXPECT_EQ_WAIT(2, renderer.num_rendered_frames(), kTimeout); - EXPECT_TRUE_WAIT(kScaledWidth == renderer.width() && + EXPECT_TRUE_WAIT(renderer.num_rendered_frames() >= 2 && + kScaledWidth == renderer.width() && kScaledHeight == renderer.height(), kTimeout); EXPECT_TRUE(channel_->SetCapturer(kSsrc, NULL)); } |