e8ef87bdad
This change adds logic to WindowCapturerWin to capture overlapping owned/pop-up windows (e.g. menus, dialogs, tooltips). This makes window capture behavior more consistent regardless of whether CroppingWindowCapturerWin is used & its conditions for using crop-from- screen capture are met (in ShouldUseScreenCapturer). (I.e. regardless of OS version, window shape / translucency, occlusion by another potentially top-most window, or whether the capturing app has opted in to using the cropping capturer). Owned/pop-up windows associated with the selected window are enumerated then captured individually, with their contents composited into the final frame. This change also: - Crops out the top window border (which exposed a bit of the background when using the cropping capturer, and resulted in an inconsistent appearance compared to the side & bottom borders being cropped out). Bug: chromium:980864 Change-Id: I81c504848a0c0e6bf122aeff437b400e44944718 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/148302 Commit-Queue: Jamie Walch <jamiewalch@chromium.org> Reviewed-by: Jamie Walch <jamiewalch@chromium.org> Cr-Commit-Position: refs/heads/master@{#28922}
46 lines
1.4 KiB
C++
46 lines
1.4 KiB
C++
/*
|
|
* Copyright (c) 2019 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.
|
|
*/
|
|
|
|
#ifndef MODULES_DESKTOP_CAPTURE_WIN_SELECTED_WINDOW_CONTEXT_H_
|
|
#define MODULES_DESKTOP_CAPTURE_WIN_SELECTED_WINDOW_CONTEXT_H_
|
|
|
|
#include <windows.h>
|
|
|
|
#include "modules/desktop_capture/desktop_geometry.h"
|
|
#include "modules/desktop_capture/win/window_capture_utils.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class SelectedWindowContext {
|
|
public:
|
|
SelectedWindowContext(HWND selected_window,
|
|
DesktopRect selected_window_rect,
|
|
WindowCaptureHelperWin* window_capture_helper);
|
|
|
|
bool IsSelectedWindowValid() const;
|
|
|
|
bool IsWindowSelected(HWND hwnd) const;
|
|
bool IsWindowOwned(HWND hwnd) const;
|
|
bool IsWindowOverlapping(HWND hwnd) const;
|
|
|
|
WindowCaptureHelperWin* window_capture_helper() const;
|
|
|
|
private:
|
|
const HWND selected_window_;
|
|
const DesktopRect selected_window_rect_;
|
|
WindowCaptureHelperWin* const window_capture_helper_;
|
|
DWORD selected_window_thread_id_;
|
|
DWORD selected_window_process_id_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_DESKTOP_CAPTURE_WIN_SELECTED_WINDOW_CONTEXT_H_
|