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

Re-enable VideoCaptureTest.CreateDelete

Browse Source 
Previously the test insisted on non-zero delay, but 0 is not a crazy delay value
(esp. on a fake camera device!).  Instead we now test for delay>=0 being set at
all.

BUG=2405
R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2267004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4813 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org 2013-09-23 17:58:45 +00:00
parent 038e8e64ef
commit 334865e2a1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/modules/video_capture/test/video_capture_unittest.cc
View File

@ -142,7 +142,7 @@ class TestVideoCaptureCallback : public VideoCaptureDataCallback {
public:
TestVideoCaptureCallback()
: capture_cs_(CriticalSectionWrapper::CreateCriticalSection()),
capture_delay_(0),
capture_delay_(-1),
last_render_time_ms_(0),
incoming_frames_(0),
timing_warnings_(0),
@ -204,7 +204,7 @@ class TestVideoCaptureCallback : public VideoCaptureDataCallback {
capability_= capability;
incoming_frames_ = 0;
last_render_time_ms_ = 0;
capture_delay_ = 0;
capture_delay_ = -1;
}
int incoming_frames() {
CriticalSectionScoped cs(capture_cs_.get());
@ -356,8 +356,7 @@ TEST_F(VideoCaptureTest, CreateDelete) {
// Make sure 5 frames are captured.
EXPECT_TRUE_WAIT(capture_observer.incoming_frames() >= 5, kTimeOut);
// TODO(holmer): Disabled due to being flaky. See issue 2405.
// EXPECT_GT(capture_observer.capture_delay(), 0);
EXPECT_GE(capture_observer.capture_delay(), 0);
int64_t stop_time = TickTime::MillisecondTimestamp();
EXPECT_EQ(0, module->StopCapture());