0f49daccbe
Reason for revert: Resubmit capturer tests Original issue's description: > Revert of [WebRTC] A real ScreenCapturer test (patchset #8 id:240001 of https://codereview.webrtc.org/2268093002/ ) > > Reason for revert: > ScreenCapturerTest.CaptureUpdatedRegion fails on Win DrMemory Full. > > Original issue's description: > > [WebRTC] A real ScreenCapturer test > > > > We do not have a real ScreenCapturer test before. And after CL 2210443002, a new > > ScreenDrawer interface is added to the code base to draw various shapes on the > > screen. This change is to use ScreenDrawer to test ScreenCapturer. Besides test > > cases, some other changes are included, > > > > 1. A WaitForPendingPaintings() function in ScreenDrawer, to wait for a > > ScreenDrawer to finish all the pending draws. This function now only sleeps 50 > > milliseconds on X11 and 100 milliseconds on Windows. > > > > 2. A Color structure to help handle a big-endian or little-endian safe color and > > provide functions to compare with DesktopFrame::data(). Both ScreenDrawer and > > DesktopFrameGenerator (in change 2202443002) can use this class to create colors > > and compare with or paint to a DesktopFrame. > > > > 3. ScreenDrawer now uses Color structure instead of uint32_t. > > > > BUG=314516 > > > > TBR=kjellander@chromium.org > > > > Committed: https://crrev.com/9d1c54ace0dc9f68da0152aa1ded2a8dba0a43ae > > Cr-Commit-Position: refs/heads/master@{#14058} > > TBR=sergeyu@chromium.org,jamiewalch@chromium.org,kjellander@chromium.org,zijiehe@chromium.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=314516 > > Committed: https://crrev.com/4c44202dc348613695a4b529bbd7c9bdab6195ec > Cr-Commit-Position: refs/heads/master@{#14071} TBR=sergeyu@chromium.org,jamiewalch@chromium.org,kjellander@chromium.org,asapersson@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=644130 Review-Url: https://codereview.webrtc.org/2313653003 Cr-Commit-Position: refs/heads/master@{#14113}
61 lines
2.1 KiB
C++
61 lines
2.1 KiB
C++
/*
|
|
* Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/modules/desktop_capture/screen_drawer.h"
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
#include "webrtc/base/random.h"
|
|
#include "webrtc/base/timeutils.h"
|
|
#include "webrtc/system_wrappers/include/logging.h"
|
|
#include "webrtc/system_wrappers/include/sleep.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// These are a set of manual test cases, as we do not have an automatical way to
|
|
// detect whether a ScreenDrawer on a certain platform works well without
|
|
// ScreenCapturer(s). So you may execute these test cases with
|
|
// --gtest_also_run_disabled_tests --gtest_filter=ScreenDrawerTest.*.
|
|
TEST(ScreenDrawerTest, DISABLED_DrawRectangles) {
|
|
std::unique_ptr<ScreenDrawer> drawer = ScreenDrawer::Create();
|
|
if (!drawer) {
|
|
LOG(LS_WARNING) << "No ScreenDrawer implementation for current platform.";
|
|
return;
|
|
}
|
|
|
|
if (drawer->DrawableRegion().is_empty()) {
|
|
LOG(LS_WARNING) << "ScreenDrawer of current platform does not provide a "
|
|
"non-empty DrawableRegion().";
|
|
return;
|
|
}
|
|
|
|
DesktopRect rect = drawer->DrawableRegion();
|
|
Random random(rtc::TimeMicros());
|
|
for (int i = 0; i < 100; i++) {
|
|
// Make sure we at least draw one pixel.
|
|
int left = random.Rand(rect.left(), rect.right() - 2);
|
|
int top = random.Rand(rect.top(), rect.bottom() - 2);
|
|
drawer->DrawRectangle(
|
|
DesktopRect::MakeLTRB(left, top, random.Rand(left + 1, rect.right()),
|
|
random.Rand(top + 1, rect.bottom())),
|
|
RgbaColor(random.Rand<uint8_t>(), random.Rand<uint8_t>(),
|
|
random.Rand<uint8_t>(), random.Rand<uint8_t>()));
|
|
|
|
if (i == 50) {
|
|
SleepMs(10000);
|
|
}
|
|
}
|
|
|
|
SleepMs(10000);
|
|
}
|
|
|
|
} // namespace webrtc
|