zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update talk to 50918584.

Browse Source 
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@4556 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org
2013-08-15 23:38:54 +00:00
parent dde7d4c6ed
commit 822fbd8b68
108 changed files with 2926 additions and 4301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
talk/media/base/videoengine_unittest.h
View File

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