admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland "Fix 'Image will be cropped if WindowCapturerWinGdi used'"

Browse Source 
This is a reland of commit 844225a76a98aa3be5aca09c19ab72a5e7b6c38a

Original change's description:
> Fix 'Image will be cropped if WindowCapturerWinGdi used'
>
> Bug: webrtc:15719
> Change-Id: I7daf8ee5b90fbe9f1246f1d99211ffa0d8a19f73
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/330780
> Reviewed-by: Alexander Cooper <alcooper@chromium.org>
> Commit-Queue: Alexander Cooper <alcooper@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#41503}

Bug: webrtc:15719
Change-Id: Idbb2f4dcc8811d3b2b763a49adc7a57535b3d1b2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/334380
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42666}
This commit is contained in:
memetao 2023-12-10 13:42:20 +08:00 committed by WebRTC LUCI CQ
parent f90a3ad3b3
commit 7fe62f25d1
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/desktop_capture/win/window_capture_utils.cc
View File

@ -183,6 +183,13 @@ bool GetCroppedWindowRect(HWND window,
is_maximized) { is_maximized) {
// Only apply this cropping to windows with a resize border (otherwise, // Only apply this cropping to windows with a resize border (otherwise,
// it'd clip the edges of captured pop-up windows without this border). // it'd clip the edges of captured pop-up windows without this border).
RECT rect;
DwmGetWindowAttribute(window, DWMWA_EXTENDED_FRAME_BOUNDS, &rect,
sizeof(RECT));
// it's means that the window edge is not transparent
if (original_rect && rect.left == original_rect->left()) {
return true;
}
LONG style = GetWindowLong(window, GWL_STYLE); LONG style = GetWindowLong(window, GWL_STYLE);
if (style & WS_THICKFRAME || style & DS_MODALFRAME) { if (style & WS_THICKFRAME || style & DS_MODALFRAME) {
int width = GetSystemMetrics(SM_CXSIZEFRAME); int width = GetSystemMetrics(SM_CXSIZEFRAME);