From e4be57db5d48805c8890205fcc478a9176be5869 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Mon, 26 Jan 2026 18:17:14 -0600 Subject: [PATCH] Remove superfluous Session checks in prepareToRender() prepareToRender() is only called with a live Session. --- app/streaming/video/ffmpeg-renderers/drm.cpp | 13 ++----------- app/streaming/video/ffmpeg-renderers/mmal.cpp | 13 ++----------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/app/streaming/video/ffmpeg-renderers/drm.cpp b/app/streaming/video/ffmpeg-renderers/drm.cpp index 5ff2cbf7..c546d9f1 100644 --- a/app/streaming/video/ffmpeg-renderers/drm.cpp +++ b/app/streaming/video/ffmpeg-renderers/drm.cpp @@ -297,17 +297,8 @@ void DrmRenderer::prepareToRender() // can get spurious SDL_WINDOWEVENT events that will cause us to (again) recreate our // renderer. This can lead to an infinite to renderer recreation, so discard all // SDL_WINDOWEVENT events after SDL_CreateRenderer(). - Session* session = Session::get(); - if (session != nullptr) { - // If we get here during a session, we need to synchronize with the event loop - // to ensure we don't drop any important events. - session->flushWindowEvents(); - } - else { - // If we get here prior to the start of a session, just pump and flush ourselves. - SDL_PumpEvents(); - SDL_FlushEvent(SDL_WINDOWEVENT); - } + SDL_assert(Session::get()); + Session::get()->flushWindowEvents(); SDL_SetRenderDrawColor(renderer, 0, 0, 0, SDL_ALPHA_OPAQUE); SDL_RenderClear(renderer); diff --git a/app/streaming/video/ffmpeg-renderers/mmal.cpp b/app/streaming/video/ffmpeg-renderers/mmal.cpp index 8701b906..ea649661 100644 --- a/app/streaming/video/ffmpeg-renderers/mmal.cpp +++ b/app/streaming/video/ffmpeg-renderers/mmal.cpp @@ -77,17 +77,8 @@ void MmalRenderer::prepareToRender() // can get spurious SDL_WINDOWEVENT events that will cause us to (again) recreate our // renderer. This can lead to an infinite to renderer recreation, so discard all // SDL_WINDOWEVENT events after SDL_CreateRenderer(). - Session* session = Session::get(); - if (session != nullptr) { - // If we get here during a session, we need to synchronize with the event loop - // to ensure we don't drop any important events. - session->flushWindowEvents(); - } - else { - // If we get here prior to the start of a session, just pump and flush ourselves. - SDL_PumpEvents(); - SDL_FlushEvent(SDL_WINDOWEVENT); - } + SDL_assert(Session::get()); + Session::get()->flushWindowEvents(); SDL_SetRenderDrawColor(m_BackgroundRenderer, 0, 0, 0, SDL_ALPHA_OPAQUE); SDL_RenderClear(m_BackgroundRenderer);