Nico Grunbaum
15e64d9d0d
Upstream commit: https://webrtc.googlesource.com/src/+/fb583c5809bf398c893eda4d06647a5d4801a43e [M150] [WGC] Fix frame size synchronization Original change's description: > [WGC] Fix frame size synchronization > > Fixes a scenario where the mapped_texture_ and frame_pool_ sizes of the > WGC capturer could get out of sync and potentially bypass their > reconciliation on the following frame. > > Fixed: chromium:517727318 > Change-Id: Ie4e951bbdf41491200b7ba1289f85e4c02bc22d1 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/476860 > Commit-Queue: Mark Foltz <mfoltz@chromium.org> > Auto-Submit: Alexander Cooper <alcooper@chromium.org> > Reviewed-by: Mark Foltz <mfoltz@chromium.org> > Cr-Commit-Position: refs/heads/main@{#47898} (cherry picked from commit b5cf1fa607113788cf894d5b6895c72fba1d9254) Bug: chromium:520652713,chromium:517727318 Change-Id: Ie4e951bbdf41491200b7ba1289f85e4c02bc22d1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/479881 Commit-Queue: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Auto-Submit: Chrome Cherry Picker <chrome-cherry-picker@chops-service-accounts.iam.gserviceaccount.com> Cr-Commit-Position: refs/branch-heads/7871@{#1} Cr-Branched-From: b1dde843dc4388c62a66f8ca903e795463b04075-refs/heads/main@{#47863}
37 lines
1.7 KiB
Diff
37 lines
1.7 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Mon, 4 Dec 2023 12:57:00 -0600
|
|
Subject: Bug 1867099 - (fix-66b7275561) disable wgc capture yellow-line
|
|
removal. r?ng!
|
|
|
|
This code won't build until we support building with
|
|
Win 10 SDK v10.0.20348.0 or newer.
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/0aac94794aad2ddb637f5076bc08706a11866737
|
|
---
|
|
modules/desktop_capture/win/wgc_capture_session.cc | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/modules/desktop_capture/win/wgc_capture_session.cc b/modules/desktop_capture/win/wgc_capture_session.cc
|
|
index 9a887d7c0e..33e536551e 100644
|
|
--- a/modules/desktop_capture/win/wgc_capture_session.cc
|
|
+++ b/modules/desktop_capture/win/wgc_capture_session.cc
|
|
@@ -304,6 +304,11 @@ HRESULT WgcCaptureSession::StartCapture(const DesktopCaptureOptions& options) {
|
|
}
|
|
}
|
|
|
|
+// Until Mozilla builds with Win 10 SDK v10.0.20348.0 or newer, this
|
|
+// code will not build. Once we support the newer SDK, Bug 1868198
|
|
+// exists to decide if we ever want to use this code since it is
|
|
+// removing an indicator that capture is happening.
|
|
+#if !defined(WEBRTC_MOZILLA_BUILD)
|
|
// By default, the WGC capture API adds a yellow border around the captured
|
|
// window or display to indicate that a capture is in progress. The section
|
|
// below is an attempt to remove this yellow border to make the capture
|
|
@@ -315,6 +320,7 @@ HRESULT WgcCaptureSession::StartCapture(const DesktopCaptureOptions& options) {
|
|
&session3))) {
|
|
session3->put_IsBorderRequired(options.wgc_require_border());
|
|
}
|
|
+#endif
|
|
|
|
// Windows 11 24H2 (10.0.26100.0) added
|
|
// `IGraphicsCaptureSession6::put_IncludeSecondaryWindows()`. See
|