From 4291e15b60dacb15162c6bf884b19be4d0d5e37c Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 5 Apr 2022 00:57:14 -0500 Subject: [PATCH] Use NDC helpers in D3D11VA renderer --- app/streaming/video/ffmpeg-renderers/d3d11va.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/app/streaming/video/ffmpeg-renderers/d3d11va.cpp b/app/streaming/video/ffmpeg-renderers/d3d11va.cpp index 9712ec30..a79af193 100644 --- a/app/streaming/video/ffmpeg-renderers/d3d11va.cpp +++ b/app/streaming/video/ffmpeg-renderers/d3d11va.cpp @@ -945,12 +945,7 @@ void D3D11VARenderer::notifyOverlayUpdated(Overlay::OverlayType type) renderRect.h = newSurface->h; // Convert screen space to normalized device coordinates - renderRect.x /= m_DisplayWidth / 2; - renderRect.w /= m_DisplayWidth / 2; - renderRect.y /= m_DisplayHeight / 2; - renderRect.h /= m_DisplayHeight / 2; - renderRect.x -= 1.0f; - renderRect.y -= 1.0f; + StreamUtils::screenSpaceToNormalizedDeviceCoords(&renderRect, m_DisplayWidth, m_DisplayHeight); // The surface is no longer required SDL_FreeSurface(newSurface); @@ -1290,10 +1285,7 @@ bool D3D11VARenderer::setupRenderingResources() // Convert screen space to normalized device coordinates SDL_FRect renderRect; - renderRect.x = ((float)dst.x / (m_DisplayWidth / 2)) - 1.0f; - renderRect.y = ((float)dst.y / (m_DisplayHeight / 2)) - 1.0f; - renderRect.w = (float)dst.w / (m_DisplayWidth / 2); - renderRect.h = (float)dst.h / (m_DisplayHeight / 2); + StreamUtils::screenSpaceToNormalizedDeviceCoords(&dst, &renderRect, m_DisplayWidth, m_DisplayHeight); // Don't sample from the alignment padding area since that's not part of the video SDL_assert(m_TextureAlignment != 0);