From 633564540036e1e4bb00308911edbfb303f51fe6 Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" Date: Tue, 1 Jul 2014 16:46:01 +0000 Subject: [PATCH] (Auto)update libjingle 70329914-> 70330023 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6575 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/base/videoengine_unittest.h | 1 - talk/media/webrtc/webrtcvideoengine_unittest.cc | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/talk/media/base/videoengine_unittest.h b/talk/media/base/videoengine_unittest.h index 382fb775e8..83fdbac778 100644 --- a/talk/media/base/videoengine_unittest.h +++ b/talk/media/base/videoengine_unittest.h @@ -1452,7 +1452,6 @@ class VideoMediaChannelTest : public testing::Test, EXPECT_TRUE(talk_base::Thread::Current()->ProcessMessages(30)); EXPECT_TRUE(capturer->CaptureCustomFrame(kWidth, kHeight, cricket::FOURCC_ARGB)); - EXPECT_TRUE(capturer->CaptureFrame()); EXPECT_GT_FRAME_ON_RENDERER_WAIT( renderer, 2, kScaledWidth, kScaledHeight, kTimeout); EXPECT_TRUE(channel_->SetCapturer(kSsrc, NULL)); diff --git a/talk/media/webrtc/webrtcvideoengine_unittest.cc b/talk/media/webrtc/webrtcvideoengine_unittest.cc index 307e594b92..a74ae750cc 100644 --- a/talk/media/webrtc/webrtcvideoengine_unittest.cc +++ b/talk/media/webrtc/webrtcvideoengine_unittest.cc @@ -2412,6 +2412,9 @@ TEST_F(WebRtcVideoMediaChannelTest, TestSetDscpOptions) { channel_->SetInterface(NULL); } +TEST_F(WebRtcVideoMediaChannelTest, HighAspectHighHeightCapturer) { + Base::HighAspectHighHeightCapturer(); +} TEST_F(WebRtcVideoMediaChannelTest, SetOptionsSucceedsWhenSending) { cricket::VideoOptions options;