Avoid retrying renderer init if we know the error was not transient

app/streaming/video/ffmpeg-renderers/cuda.cpp

@@ -22,6 +22,7 @@ bool CUDARenderer::initialize(PDECODER_PARAMETERS)
 
     err = av_hwdevice_ctx_create(&m_HwContext, AV_HWDEVICE_TYPE_CUDA, nullptr, nullptr, 0);
     if (err != 0) {
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "av_hwdevice_ctx_create(CUDA) failed: %d",
                      err);

app/streaming/video/ffmpeg-renderers/eglvid.cpp

@@ -55,9 +55,6 @@ typedef struct _OVERLAY_VERTEX
         SDL_LOG_CATEGORY_APPLICATION, \
         "EGLRenderer: " __VA_ARGS__)
 
-SDL_Window* EGLRenderer::s_LastFailedWindow = nullptr;
-int EGLRenderer::s_LastFailedVideoFormat = 0;
-
 EGLRenderer::EGLRenderer(IFFmpegRenderer *backendRenderer)
     :
         IFFmpegRenderer(RendererType::EGL),
@@ -407,6 +404,7 @@ bool EGLRenderer::initialize(PDECODER_PARAMETERS params)
     // https://hg.libsdl.org/SDL/rev/84618d571795
     if (!SDL_VERSION_ATLEAST(2, 0, 10)) {
         EGL_LOG(Error, "Not supported until SDL 2.0.10");
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 
@@ -418,15 +416,6 @@ bool EGLRenderer::initialize(PDECODER_PARAMETERS params)
         return false;
     }
 
-    // HACK: Work around bug where renderer will repeatedly fail with:
-    // SDL_CreateRenderer() failed: Could not create GLES window surface
-    // Don't retry if we've already failed to create a renderer for this
-    // window *unless* the format has changed from 10-bit to 8-bit.
-    if (m_Window == s_LastFailedWindow) {
-        EGL_LOG(Error, "SDL_CreateRenderer() already failed on this window!");
-        return false;
-    }
-
     // This hint will ensure we use EGL to retrieve our GL context,
     // even on X11 where that is not the default. EGL is required
     // to avoid a crash in Mesa.
@@ -451,6 +440,7 @@ bool EGLRenderer::initialize(PDECODER_PARAMETERS params)
     }
     if (renderIndex == maxRenderers) {
         EGL_LOG(Error, "Could not find a suitable SDL_Renderer");
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 
@@ -480,8 +470,7 @@ bool EGLRenderer::initialize(PDECODER_PARAMETERS params)
 
     // Now we finally bail if we failed during SDL_CreateRenderer() above.
     if (!m_DummyRenderer) {
-        s_LastFailedWindow = m_Window;
-        s_LastFailedVideoFormat = params->videoFormat;
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 
@@ -489,15 +478,18 @@ bool EGLRenderer::initialize(PDECODER_PARAMETERS params)
     SDL_VERSION(&info.version);
     if (!SDL_GetWindowWMInfo(params->window, &info)) {
         EGL_LOG(Error, "SDL_GetWindowWMInfo() failed: %s", SDL_GetError());
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 
     if (!(m_Context = SDL_GL_CreateContext(params->window))) {
         EGL_LOG(Error, "Cannot create OpenGL context: %s", SDL_GetError());
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
     if (SDL_GL_MakeCurrent(params->window, m_Context)) {
         EGL_LOG(Error, "Cannot use created EGL context: %s", SDL_GetError());
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 

app/streaming/video/ffmpeg-renderers/eglvid.h

@@ -74,9 +74,4 @@ private:
     int m_OldContextMinorVersion;
 
     SDL_Renderer *m_DummyRenderer;
-
-    // HACK: Work around bug where renderer will repeatedly fail with:
-    // SDL_CreateRenderer() failed: Could not create GLES window surface
-    static SDL_Window* s_LastFailedWindow;
-    static int s_LastFailedVideoFormat;
 };

app/streaming/video/ffmpeg-renderers/mmal.cpp

@@ -152,6 +152,7 @@ bool MmalRenderer::initialize(PDECODER_PARAMETERS params)
     MMAL_STATUS_T status;
 
     if (!isMmalOverlaySupported()) {
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 
@@ -164,6 +165,7 @@ bool MmalRenderer::initialize(PDECODER_PARAMETERS params)
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "mmal_component_create() failed: %x (%s)",
                      status, mmal_status_to_string(status));
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 

app/streaming/video/ffmpeg-renderers/plvk.cpp

@@ -167,6 +167,7 @@ bool PlVkRenderer::chooseVulkanDevice(PDECODER_PARAMETERS params, bool hdrOutput
     if (physicalDeviceCount == 0) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "No Vulkan devices found!");
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 
@@ -367,6 +368,7 @@ bool PlVkRenderer::initialize(PDECODER_PARAMETERS params)
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "SDL_Vulkan_GetInstanceExtensions() #1 failed: %s",
                      SDL_GetError());
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 
@@ -375,6 +377,7 @@ bool PlVkRenderer::initialize(PDECODER_PARAMETERS params)
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "SDL_Vulkan_GetInstanceExtensions() #2 failed: %s",
                      SDL_GetError());
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 
@@ -390,6 +393,7 @@ bool PlVkRenderer::initialize(PDECODER_PARAMETERS params)
     if (m_PlVkInstance == nullptr) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "pl_vk_inst_create() failed");
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 
@@ -407,6 +411,7 @@ bool PlVkRenderer::initialize(PDECODER_PARAMETERS params)
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "SDL_Vulkan_CreateSurface() failed: %s",
                      SDL_GetError());
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 

app/streaming/video/ffmpeg-renderers/renderer.h

@@ -162,7 +162,8 @@ public:
         // Only return this reason code if the software or driver does not support
         // the specified decoding/rendering API. If the FFmpeg decoder code sees
         // this value, it will assume trying the same renderer again for any other
-        // codec will be useless and skip it.
+        // codec will be useless and skip it. This should never be set if the error
+        // could potentially be transient.
         NoSoftwareSupport,
     };
 
@@ -292,6 +293,38 @@ public:
         return m_Type;
     }
 
+    const char *getRendererName() {
+        switch (m_Type) {
+        default:
+        case RendererType::Unknown:
+            return "Unknown";
+        case RendererType::Vulkan:
+            return "Vulkan (libplacebo)";
+        case RendererType::CUDA:
+            return "CUDA";
+        case RendererType::D3D11VA:
+            return "D3D11VA";
+        case RendererType::DRM:
+            return "DRM";
+        case RendererType::DXVA2:
+            return "DXVA2 (D3D9)";
+        case RendererType::EGL:
+            return "EGL/GLES";
+        case RendererType::MMAL:
+            return "MMAL";
+        case RendererType::SDL:
+            return "SDL";
+        case RendererType::VAAPI:
+            return "VAAPI";
+        case RendererType::VDPAU:
+            return "VDPAU";
+        case RendererType::VTSampleLayer:
+            return "VideoToolbox (AVSampleBufferDisplayLayer)";
+        case RendererType::VTMetal:
+            return "VideoToolbox (Metal)";
+        }
+    }
+
     // IOverlayRenderer
     virtual void notifyOverlayUpdated(Overlay::OverlayType) override {
         // Nothing

app/streaming/video/ffmpeg-renderers/sdlvid.cpp

@@ -186,7 +186,6 @@ bool SdlRenderer::initialize(PDECODER_PARAMETERS params)
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "SDL_CreateRenderer() failed: %s",
                      SDL_GetError());
-        return false;
     }
 
     // SDL_CreateRenderer() can end up having to recreate our window (SDL_RecreateWindow())
@@ -206,6 +205,11 @@ bool SdlRenderer::initialize(PDECODER_PARAMETERS params)
         SDL_FlushEvent(SDL_WINDOWEVENT);
     }
 
+    if (!m_Renderer) {
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
+        return false;
+    }
+
 #ifdef Q_OS_WIN32
     // For some reason, using Direct3D9Ex breaks this with multi-monitor setups.
     // When focus is lost, the window is minimized then immediately restored without

app/streaming/video/ffmpeg-renderers/vaapi.cpp

@@ -369,6 +369,7 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "Failed to initialize VAAPI: %d",
                      status);
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 
@@ -387,6 +388,7 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
         // Fail and let our VDPAU renderer pick this up
         SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
                     "Avoiding VDPAU wrapper for VAAPI decoding");
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 
@@ -435,6 +437,7 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "Failed to initialize VAAPI context: %d",
                      err);
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 

app/streaming/video/ffmpeg-renderers/vdpau.cpp

@@ -104,18 +104,21 @@ bool VDPAURenderer::initialize(PDECODER_PARAMETERS params)
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "SDL_GetWindowWMInfo() failed: %s",
                      SDL_GetError());
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 
     if (info.subsystem == SDL_SYSWM_WAYLAND) {
         SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
                     "VDPAU is not supported on Wayland");
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
     else if (info.subsystem != SDL_SYSWM_X11) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "VDPAU is not supported on the current subsystem: %d",
                      info.subsystem);
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
     else if (qgetenv("VDPAU_XWAYLAND") != "1" && WMUtils::isRunningWayland()) {
@@ -125,6 +128,7 @@ bool VDPAURenderer::initialize(PDECODER_PARAMETERS params)
         // https://gitlab.freedesktop.org/vdpau/libvdpau/-/issues/2
         SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
                     "VDPAU is disabled on XWayland. Set VDPAU_XWAYLAND=1 to try your luck.");
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 
@@ -188,6 +192,7 @@ bool VDPAURenderer::initialize(PDECODER_PARAMETERS params)
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "Failed to create VDPAU context: %d",
                      err);
+        m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
         return false;
     }
 

app/streaming/video/ffmpeg-renderers/vt_avsamplelayer.mm

@@ -388,6 +388,7 @@ public:
             SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
                         "av_hwdevice_ctx_create() failed for VT decoder: %d",
                         err);
+            m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
             return false;
         }
 

app/streaming/video/ffmpeg-renderers/vt_metal.mm

@@ -699,6 +699,7 @@ public:
 
         id<MTLDevice> device = getMetalDevice();
         if (!device) {
+            m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
             return false;
         }
 
@@ -719,6 +720,7 @@ public:
             SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
                         "av_hwdevice_ctx_create() failed for VT decoder: %d",
                         err);
+            m_InitFailureReason = InitFailureReason::NoSoftwareSupport;
             return false;
         }