Use StretchRect() on Intel GPUs or if VideoProcessBlt() fails

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

@@ -260,6 +260,7 @@ bool DXVA2Renderer::initializeRenderer()
     m_DisplayWidth = renderTargetDesc.Width;
     m_DisplayHeight = renderTargetDesc.Height;
 
+    if (!isDXVideoProcessorAPIBlacklisted()) {
         hr = DXVA2CreateVideoService(m_Device, IID_IDirectXVideoProcessorService,
                                      reinterpret_cast<void**>(&m_ProcService));
 
@@ -318,6 +319,7 @@ bool DXVA2Renderer::initializeRenderer()
                          hr);
             return false;
         }
+    }
 
     return true;
 }
@@ -348,6 +350,50 @@ bool DXVA2Renderer::initializeOverlay()
     return true;
 }
 
+bool DXVA2Renderer::isDXVideoProcessorAPIBlacklisted()
+{
+    IDirect3D9* d3d9;
+    HRESULT hr;
+    bool result = false;
+
+    hr = m_Device->GetDirect3D(&d3d9);
+    if (SUCCEEDED(hr)) {
+        D3DCAPS9 caps;
+
+        hr = m_Device->GetDeviceCaps(&caps);
+        if (SUCCEEDED(hr)) {
+            D3DADAPTER_IDENTIFIER9 id;
+
+            hr = d3d9->GetAdapterIdentifier(caps.AdapterOrdinal, 0, &id);
+            if (SUCCEEDED(hr) && id.VendorId == 0x8086) {
+                SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                            "Avoiding IDirectXVideoProcessor API on Intel GPU");
+
+                // On Intel GPUs, we can get unwanted video "enhancements" due to post-processing
+                // effects that the GPU driver forces on us. In many cases, this makes the video
+                // actually look worse. We can avoid these by using StretchRect() instead on these
+                // platforms.
+                result = true;
+            }
+            else {
+                result = false;
+            }
+        }
+        else {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "GetDeviceCaps() failed: %x", hr);
+        }
+
+        d3d9->Release();
+    }
+    else {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "GetDirect3D() failed: %x", hr);
+    }
+
+    return result;
+}
+
 bool DXVA2Renderer::isDecoderBlacklisted()
 {
     IDirect3D9* d3d9;
@@ -844,16 +890,27 @@ void DXVA2Renderer::renderFrameAtVsync(AVFrame *frame)
         return;
     }
 
+    if (m_Processor) {
         hr = m_Processor->VideoProcessBlt(m_RenderTarget, &bltParams, &sample, 1, nullptr);
         if (FAILED(hr)) {
             SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "VideoProcessBlt() failed: %x",
+                         "VideoProcessBlt() failed, falling back to StretchRect(): %x",
                          hr);
+            m_Processor->Release();
+            m_Processor = nullptr;
+        }
+    }
+
+    if (!m_Processor) {
+        // This function doesn't trigger any of Intel's garbage video "enhancements"
+        hr = m_Device->StretchRect(surface, &sample.SrcRect, m_RenderTarget, &sample.DstRect, D3DTEXF_NONE);
+        if (FAILED(hr)) {
             SDL_Event event;
             event.type = SDL_RENDER_TARGETS_RESET;
             SDL_PushEvent(&event);
             return;
         }
+    }
 
     if (m_OverlayFont != nullptr) {
         if (Session::get()->getOverlayManager().isOverlayEnabled(OverlayManager::OverlayDebug)) {

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

@@ -34,6 +34,7 @@ private:
     bool initializeDevice(SDL_Window* window, bool enableVsync);
     bool initializeOverlay();
     bool isDecoderBlacklisted();
+    bool isDXVideoProcessorAPIBlacklisted();
 
     static
     AVBufferRef* ffPoolAlloc(void* opaque, int size);