From 5ff091f16a5d47470e50e72f1a14b81b5ff8cd02 Mon Sep 17 00:00:00 2001 From: "wu@webrtc.org" Date: Tue, 30 Oct 2012 21:52:03 +0000 Subject: [PATCH] Init capturePicture with GetCaptureDeviceSnapshot so that the SetRenderStartImage test won't depend on the previous test which may be disabled by the include_timing_dependent_tests flag. This is a fix for LinuxLargeTests. TEST=try bots BUG=1023 Review URL: https://webrtc-codereview.appspot.com/964007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3024 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_engine/test/auto_test/source/vie_autotest_file.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc index 1cabb96c42..0f07e1fc6c 100644 --- a/webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc +++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc @@ -162,7 +162,6 @@ void ViEAutoTest::ViEFileStandardTest() webrtc::ViEPicture capturePicture; webrtc::ViEPicture renderPicture; - webrtc::ViEPicture renderTimeoutPicture; // TODO: init with and image ViEAutotestFileObserver fileObserver; int fileId; @@ -361,6 +360,8 @@ void ViEAutoTest::ViEFileStandardTest() // set render image, then stop capture and stop render to display it ViETest::Log("Stoping renderer, setting start image, then " "restarting"); + EXPECT_EQ(0, ptrViEFile->GetCaptureDeviceSnapshot( + captureId, capturePicture)); EXPECT_EQ(0, ptrViEFile->SetRenderStartImage( videoChannel, capturePicture)); EXPECT_EQ(0, ptrViECapture->StopCapture(captureId)); @@ -458,7 +459,6 @@ void ViEAutoTest::ViEFileStandardTest() EXPECT_EQ(0, ptrViECapture->DisconnectCaptureDevice(videoChannel)); EXPECT_EQ(0, ptrViEFile->FreePicture(capturePicture)); EXPECT_EQ(0, ptrViEFile->FreePicture(renderPicture)); - EXPECT_EQ(0, ptrViEFile->FreePicture(renderTimeoutPicture)); EXPECT_EQ(0, ptrViEBase->DeleteChannel(videoChannel)); EXPECT_EQ(0, ptrViEFile->Release());