From 43e3679297d772f0546543707934a85e8010eb3d Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Mon, 15 Nov 2021 21:33:28 -0600 Subject: [PATCH] Revert "Disable the EGL render thread on Wayland" This reverts commit dcc567ebda75a10f065b037b11bc50cd88aa5ded. --- app/streaming/video/ffmpeg-renderers/eglvid.cpp | 7 ------- app/streaming/video/ffmpeg-renderers/eglvid.h | 1 - 2 files changed, 8 deletions(-) diff --git a/app/streaming/video/ffmpeg-renderers/eglvid.cpp b/app/streaming/video/ffmpeg-renderers/eglvid.cpp index 8d56b3df..ccc3277d 100644 --- a/app/streaming/video/ffmpeg-renderers/eglvid.cpp +++ b/app/streaming/video/ffmpeg-renderers/eglvid.cpp @@ -747,13 +747,6 @@ bool EGLRenderer::specialize() { return err == GL_NO_ERROR; } -bool EGLRenderer::isRenderThreadSupported() -{ - // libdecor may try to draw CSD on our window surface which will race with - // our rendering code here, so we must not use the render thread on wayland. - return strcmp(SDL_GetCurrentVideoDriver(), "wayland") != 0; -} - void EGLRenderer::renderFrame(AVFrame* frame) { EGLImage imgs[EGL_MAX_PLANES]; diff --git a/app/streaming/video/ffmpeg-renderers/eglvid.h b/app/streaming/video/ffmpeg-renderers/eglvid.h index 7574d511..336e8fac 100644 --- a/app/streaming/video/ffmpeg-renderers/eglvid.h +++ b/app/streaming/video/ffmpeg-renderers/eglvid.h @@ -16,7 +16,6 @@ public: virtual void notifyOverlayUpdated(Overlay::OverlayType) override; virtual bool isPixelFormatSupported(int videoFormat, enum AVPixelFormat pixelFormat) override; virtual AVPixelFormat getPreferredPixelFormat(int videoFormat) override; - virtual bool isRenderThreadSupported() override; private: