366ac4d84e
Currently, apps using WebRTC for window capture only get the benefits of using CroppingWindowCapturer on Windows (described below) after changing calls to DesktopCapturer::CreateWindowCapturer to instead call CroppingWindowCapturer::CreateCapturer. This change adds a new flag to DesktopCaptureOptions to allow opting in to the faster capture-screen- and-crop path via the older & more discoverable API. Benefits of using CroppingWindowCapturer's capture-screen-and-crop path when possible: 1) It's significantly faster, up to ~36ms/frame (~160x) faster than the capture-window-contents path in my testing (more details are in the bug). This difference increased with the recent fix for https://crbug.com/webrtc/10734 . 2) It allows capture of menus & tooltips (plus dialogs if https://crbug.com/webrtc/10767 is fixed), partially mitigating https://crbug.com/980864 . Downsides of using it: 1) It may inadvertently capture occluding windows that aren't detected properly, e.g. some system UI: https://crbug.com/webrtc/10835 . 2) It may capture some neighboring regions when moving/resizing the captured window. The new flag is not enabled by default, so the default behavior is unchanged. This could perhaps be revisited after addressing https://crbug.com/webrtc/10835 . Bug: webrtc:10825 Change-Id: Ib77e5facc7240c5df311fe1fe204d0d8ea22a96a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/146823 Commit-Queue: Jamie Walch <jamiewalch@chromium.org> Reviewed-by: Jamie Walch <jamiewalch@chromium.org> Cr-Commit-Position: refs/heads/master@{#28695}
90 lines
2.5 KiB
C++
90 lines
2.5 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 "modules/desktop_capture/desktop_capturer.h"
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <cstring>
|
|
#include <utility>
|
|
|
|
#include "modules/desktop_capture/cropping_window_capturer.h"
|
|
#include "modules/desktop_capture/desktop_capture_options.h"
|
|
#include "modules/desktop_capture/desktop_capturer_differ_wrapper.h"
|
|
|
|
namespace webrtc {
|
|
|
|
DesktopCapturer::~DesktopCapturer() = default;
|
|
|
|
void DesktopCapturer::SetSharedMemoryFactory(
|
|
std::unique_ptr<SharedMemoryFactory> shared_memory_factory) {}
|
|
|
|
void DesktopCapturer::SetExcludedWindow(WindowId window) {}
|
|
|
|
bool DesktopCapturer::GetSourceList(SourceList* sources) {
|
|
return true;
|
|
}
|
|
|
|
bool DesktopCapturer::SelectSource(SourceId id) {
|
|
return false;
|
|
}
|
|
|
|
bool DesktopCapturer::FocusOnSelectedSource() {
|
|
return false;
|
|
}
|
|
|
|
bool DesktopCapturer::IsOccluded(const DesktopVector& pos) {
|
|
return false;
|
|
}
|
|
|
|
// static
|
|
std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateWindowCapturer(
|
|
const DesktopCaptureOptions& options) {
|
|
#if defined(WEBRTC_WIN)
|
|
if (options.allow_cropping_window_capturer()) {
|
|
return CroppingWindowCapturer::CreateCapturer(options);
|
|
}
|
|
#endif // defined(WEBRTC_WIN)
|
|
|
|
std::unique_ptr<DesktopCapturer> capturer = CreateRawWindowCapturer(options);
|
|
if (capturer && options.detect_updated_region()) {
|
|
capturer.reset(new DesktopCapturerDifferWrapper(std::move(capturer)));
|
|
}
|
|
|
|
return capturer;
|
|
}
|
|
|
|
// static
|
|
std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateScreenCapturer(
|
|
const DesktopCaptureOptions& options) {
|
|
std::unique_ptr<DesktopCapturer> capturer = CreateRawScreenCapturer(options);
|
|
if (capturer && options.detect_updated_region()) {
|
|
capturer.reset(new DesktopCapturerDifferWrapper(std::move(capturer)));
|
|
}
|
|
|
|
return capturer;
|
|
}
|
|
|
|
#if defined(WEBRTC_USE_PIPEWIRE) || defined(USE_X11)
|
|
bool DesktopCapturer::IsRunningUnderWayland() {
|
|
const char* xdg_session_type = getenv("XDG_SESSION_TYPE");
|
|
if (!xdg_session_type || strncmp(xdg_session_type, "wayland", 7) != 0)
|
|
return false;
|
|
|
|
if (!(getenv("WAYLAND_DISPLAY")))
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
#endif // defined(WEBRTC_USE_PIPEWIRE) || defined(USE_X11)
|
|
|
|
} // namespace webrtc
|