Improve overlay format handling

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

@@ -816,6 +816,7 @@ void D3D11VARenderer::notifyOverlayUpdated(Overlay::OverlayType type)
 
     // Create a texture with our pixel data
     SDL_assert(!SDL_MUSTLOCK(newSurface));
+    SDL_assert(newSurface->format->format == SDL_PIXELFORMAT_ARGB8888);
 
     D3D11_TEXTURE2D_DESC texDesc = {};
     texDesc.Width = newSurface->w;

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

@@ -834,19 +834,9 @@ void DXVA2Renderer::notifyOverlayUpdated(Overlay::OverlayType type)
         return;
     }
 
-    if (newSurface->pitch == lockedRect.Pitch) {
+    // Copy (and convert, if necessary) the surface pixels to the texture
-        // If the pitch matches, we can take the fast path and use a single copy to transfer the pixels
+    SDL_ConvertPixels(newSurface->w, newSurface->h, newSurface->format->format, newSurface->pixels,
-        RtlCopyMemory(lockedRect.pBits, newSurface->pixels, newSurface->pitch * newSurface->h);
+                      newSurface->pitch, SDL_PIXELFORMAT_ARGB8888, lockedRect.pBits, lockedRect.Pitch);
-    }
-    else {
-        // If the pitch doesn't match, we'll need to copy each row separately
-        int pitch = SDL_min(newSurface->pitch, lockedRect.Pitch);
-        for (int i = 0; i < newSurface->h; i++) {
-            RtlCopyMemory(((PUCHAR)lockedRect.pBits) + (lockedRect.Pitch * i),
-                          ((PUCHAR)newSurface->pixels) + (newSurface->pitch * i),
-                          pitch);
-        }
-    }
 
     newTexture->UnlockRect(0);
 

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

@@ -193,6 +193,7 @@ void EGLRenderer::renderOverlay(Overlay::OverlayType type)
     SDL_Surface* newSurface = Session::get()->getOverlayManager().getUpdatedOverlaySurface(type);
     if (newSurface != nullptr) {
         SDL_assert(!SDL_MUSTLOCK(newSurface));
+        SDL_assert(newSurface->format->format == SDL_PIXELFORMAT_ARGB8888);
 
         glBindTexture(GL_TEXTURE_2D, m_OverlayTextures[type]);
 

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

@@ -365,6 +365,7 @@ void VDPAURenderer::notifyOverlayUpdated(Overlay::OverlayType type)
 
     if (newSurface != nullptr) {
         SDL_assert(!SDL_MUSTLOCK(newSurface));
+        SDL_assert(newSurface->format->format == SDL_PIXELFORMAT_ARGB8888);
 
         VdpBitmapSurface newBitmapSurface = 0;
         status = m_VdpBitmapSurfaceCreate(m_Device,