ccf57a71eb
DXGI capturer highly depends on video adapter and its driver, as well as Windows
itself. I recently found it cannot work on my virtualbox instance any more,
which indicates it may not work well on some specific systems. What worse is,
the APIs do not return a failure in such case.
So this change adds a BlankDetectorDesktopCapturerWrapper, which samples several
pixels in the frame returned by a DesktopCapturer implementation. If all the
pixels selected are blank, this wrapper returns a failure. A typical usage is to
combine BlankDetectorDesktopCapturerWrapper with FallbackDesktopCapturerWrapper,
and use GDI capturer in case of failure.
Usually less than 10000 pixels are checked, so the
BlankDetectorDesktopCapturerWrapper should not significant impact the capturer
performance.
This change is expected to resolve bug 682112 in another dimension.
BUG=682112
Review-Url: https://codereview.webrtc.org/2709523003
Cr-Original-Commit-Position: refs/heads/master@{#16984}
Committed: c4e9d210b3
Review-Url: https://codereview.webrtc.org/2709523003
Cr-Commit-Position: refs/heads/master@{#17024}
61 lines
2.3 KiB
C++
61 lines
2.3 KiB
C++
/*
|
|
* Copyright (c) 2013 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 <memory>
|
|
#include <utility>
|
|
|
|
#include "webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h"
|
|
#include "webrtc/modules/desktop_capture/desktop_capturer.h"
|
|
#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
|
|
#include "webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.h"
|
|
#include "webrtc/modules/desktop_capture/rgba_color.h"
|
|
#include "webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h"
|
|
#include "webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h"
|
|
#include "webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
|
|
std::unique_ptr<DesktopCapturer> CreateScreenCapturerWinDirectx(
|
|
const DesktopCaptureOptions& options) {
|
|
std::unique_ptr<DesktopCapturer> capturer(
|
|
new ScreenCapturerWinDirectx(options));
|
|
capturer.reset(new BlankDetectorDesktopCapturerWrapper(
|
|
std::move(capturer), RgbaColor(0, 0, 0, 0)));
|
|
return capturer;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
// static
|
|
std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
|
|
const DesktopCaptureOptions& options) {
|
|
std::unique_ptr<DesktopCapturer> capturer(new ScreenCapturerWinGdi(options));
|
|
if (options.allow_directx_capturer() &&
|
|
ScreenCapturerWinDirectx::IsSupported()) {
|
|
capturer.reset(new FallbackDesktopCapturerWrapper(
|
|
CreateScreenCapturerWinDirectx(options), std::move(capturer)));
|
|
}
|
|
|
|
if (options.allow_use_magnification_api()) {
|
|
// ScreenCapturerWinMagnifier cannot work on Windows XP or earlier, as well
|
|
// as 64-bit only Windows, and it may randomly crash on multi-screen
|
|
// systems. So we may need to fallback to use original capturer.
|
|
capturer.reset(new FallbackDesktopCapturerWrapper(
|
|
std::unique_ptr<DesktopCapturer>(new ScreenCapturerWinMagnifier()),
|
|
std::move(capturer)));
|
|
}
|
|
|
|
return capturer;
|
|
}
|
|
|
|
} // namespace webrtc
|