From 6f8e517ce1fcb07179c814c5eda27d55f90d3211 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 11 Jan 2026 01:46:17 -0600 Subject: [PATCH] Remove unused field --- app/streaming/video/ffmpeg-renderers/drm.cpp | 7 +++---- app/streaming/video/ffmpeg-renderers/drm.h | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/streaming/video/ffmpeg-renderers/drm.cpp b/app/streaming/video/ffmpeg-renderers/drm.cpp index 85ac317c..699b6a52 100644 --- a/app/streaming/video/ffmpeg-renderers/drm.cpp +++ b/app/streaming/video/ffmpeg-renderers/drm.cpp @@ -1369,6 +1369,7 @@ void DrmRenderer::enterOverlayCompositionMode() } struct drm_mode_create_dumb createBuf = {}; + uint32_t fbId; void* mapping = nullptr; createBuf.width = m_OutputRect.w; @@ -1386,7 +1387,7 @@ void DrmRenderer::enterOverlayCompositionMode() goto Fail; } - if (!createFbForDumbBuffer(&createBuf, &m_OverlayCompositionSurfaceFbId)) { + if (!createFbForDumbBuffer(&createBuf, &fbId)) { goto Fail; } @@ -1402,9 +1403,7 @@ void DrmRenderer::enterOverlayCompositionMode() // NB: This will take ownership of both the FB and the dumb buffer, // but it won't free them until we stop streaming since we don't // flip this plane anymore after this. - m_PropSetter.flipPlane(m_OverlayPlanes[0], - m_OverlayCompositionSurfaceFbId, - createBuf.handle); + m_PropSetter.flipPlane(m_OverlayPlanes[0], fbId, createBuf.handle); // Create an SDL surface that wraps our dumb buffer mapping m_OverlayCompositionSurface = SDL_CreateRGBSurfaceWithFormatFrom(mapping, diff --git a/app/streaming/video/ffmpeg-renderers/drm.h b/app/streaming/video/ffmpeg-renderers/drm.h index 492efd5f..065a8b78 100644 --- a/app/streaming/video/ffmpeg-renderers/drm.h +++ b/app/streaming/video/ffmpeg-renderers/drm.h @@ -739,7 +739,6 @@ private: DrmPropertyMap m_OverlayPlanes[Overlay::OverlayMax]; DrmPropertySetter m_PropSetter; SDL_Surface* m_OverlayCompositionSurface; - uint32_t m_OverlayCompositionSurfaceFbId; std::mutex m_OverlayLock; SDL_Rect m_OverlayRects[Overlay::OverlayMax]; drmVersionPtr m_Version;