generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source 
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
This commit is contained in:
wu@webrtc.org 2012-10-30 21:52:03 +00:00
parent 91a0340a61
commit 5ff091f16a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc
View File

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