06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
75 lines
2.9 KiB
Diff
75 lines
2.9 KiB
Diff
From: Jan Grulich <jgrulich@redhat.com>
|
|
Date: Fri, 10 Mar 2023 09:21:00 +0000
|
|
Subject: Bug 1819035 - get EGL display based on the used platform in the
|
|
browser r=webrtc-reviewers,ng
|
|
|
|
Because of a possible misconfiguration or a possible driver issue it
|
|
might happen that the browser will use a different driver on X11 and
|
|
end up using yet another one for wayland/gbm, which might lead to not
|
|
working screen sharing in the better case, but also to a crash in the
|
|
other driver (Nvidia). This adds a check for platform the browser runs
|
|
on, if it's XWayland or Wayland and based on that query EGL display for
|
|
that specific platform, rather than going for the Wayland one only.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D171858
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/c8606497de1f461a6352456e0e511c2ae498d526
|
|
---
|
|
.../linux/wayland/egl_dmabuf.cc | 30 +++++++++++++++++--
|
|
1 file changed, 28 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/modules/desktop_capture/linux/wayland/egl_dmabuf.cc b/modules/desktop_capture/linux/wayland/egl_dmabuf.cc
|
|
index fff976468c..15a447d1b0 100644
|
|
--- a/modules/desktop_capture/linux/wayland/egl_dmabuf.cc
|
|
+++ b/modules/desktop_capture/linux/wayland/egl_dmabuf.cc
|
|
@@ -13,6 +13,7 @@
|
|
#include <asm/ioctl.h>
|
|
#include <dlfcn.h>
|
|
#include <fcntl.h>
|
|
+#include <gdk/gdk.h>
|
|
#include <libdrm/drm_fourcc.h>
|
|
#include <linux/types.h>
|
|
#include <spa/param/video/format-utils.h>
|
|
@@ -218,6 +219,26 @@ static void CloseLibrary(void* library) {
|
|
}
|
|
}
|
|
|
|
+static bool IsWaylandDisplay() {
|
|
+ static auto sGdkWaylandDisplayGetType =
|
|
+ (GType (*)(void))dlsym(RTLD_DEFAULT, "gdk_wayland_display_get_type");
|
|
+ if (!sGdkWaylandDisplayGetType) {
|
|
+ return false;
|
|
+ }
|
|
+ return (G_TYPE_CHECK_INSTANCE_TYPE ((gdk_display_get_default()),
|
|
+ sGdkWaylandDisplayGetType()));
|
|
+}
|
|
+
|
|
+static bool IsX11Display() {
|
|
+ static auto sGdkX11DisplayGetType =
|
|
+ (GType (*)(void))dlsym(RTLD_DEFAULT, "gdk_x11_display_get_type");
|
|
+ if (!sGdkX11DisplayGetType) {
|
|
+ return false;
|
|
+ }
|
|
+ return (G_TYPE_CHECK_INSTANCE_TYPE ((gdk_display_get_default()),
|
|
+ sGdkX11DisplayGetType()));
|
|
+}
|
|
+
|
|
static void* g_lib_egl = nullptr;
|
|
|
|
RTC_NO_SANITIZE("cfi-icall")
|
|
@@ -363,8 +384,13 @@ EglDmaBuf::EglDmaBuf() {
|
|
return;
|
|
}
|
|
|
|
- egl_.display = EglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR,
|
|
- (void*)EGL_DEFAULT_DISPLAY, nullptr);
|
|
+ if (IsWaylandDisplay()) {
|
|
+ egl_.display = EglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR,
|
|
+ (void*)EGL_DEFAULT_DISPLAY, nullptr);
|
|
+ } else if (IsX11Display()) {
|
|
+ egl_.display = EglGetPlatformDisplay(EGL_PLATFORM_X11_KHR,
|
|
+ (void*)EGL_DEFAULT_DISPLAY, nullptr);
|
|
+ }
|
|
|
|
if (egl_.display == EGL_NO_DISPLAY) {
|
|
RTC_LOG(LS_ERROR) << "Failed to obtain default EGL display: "
|