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

MANUAL tests of GDI capturers

Browse Source 
ScreenCapturerWinGdi randomly returns black frames in test environment. The root
cause is still unknown, so change ScreenCapturerWinGdi tests into MANUAL mode to
execute in test environment, but unblock other developers. We can eventually get
a failure ratio and more samples for debugging.

BUG=webrtc:6666, webrtc:6843

Review-Url: https://codereview.webrtc.org/2564173002
Cr-Commit-Position: refs/heads/master@{#15518}
This commit is contained in:
zijiehe
2016-12-09 16:00:00 -08:00
committed by Commit bot
parent c5eefaf29a
commit 8d1649d71b
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
webrtc/modules/desktop_capture/screen_capturer_integration_test.cc
View File

@ -284,22 +284,28 @@ class ScreenCapturerIntegrationTest : public testing::Test {
} }
}; };
TEST_F(ScreenCapturerIntegrationTest, CaptureUpdatedRegion) { #if defined(WEBRTC_WIN)
#if !defined(WEBRTC_WIN) // ScreenCapturerWinGdi randomly returns blank screen, the root cause is still
// ScreenCapturerWinGdi randomly returns blank screen, the root cause is still // unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843.
// unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843. #define MAYBE_CaptureUpdatedRegion MANUAL_CaptureUpdatedRegion
TestCaptureUpdatedRegion(); #else
#define MAYBE_CaptureUpdatedRegion CaptureUpdatedRegion
#endif #endif
TEST_F(ScreenCapturerIntegrationTest, MAYBE_CaptureUpdatedRegion) {
TestCaptureUpdatedRegion();
} }
TEST_F(ScreenCapturerIntegrationTest, TwoCapturers) { #if defined(WEBRTC_WIN)
#if !defined(WEBRTC_WIN) // ScreenCapturerWinGdi randomly returns blank screen, the root cause is still
// ScreenCapturerWinGdi randomly returns blank screen, the root cause is still // unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843.
// unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843. #define MAYBE_TwoCapturers MANUAL_TwoCapturers
#else
#define MAYBE_TwoCapturers TwoCapturers
#endif
TEST_F(ScreenCapturerIntegrationTest, MAYBE_TwoCapturers) {
std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_);
SetUp(); SetUp();
TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
#endif
} }
#if defined(WEBRTC_WIN) #if defined(WEBRTC_WIN)