From c9b03f80f8156a7f14f2d50ea1a4d6544e8dabe4 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 1 Jul 2026 21:51:26 -0500 Subject: [PATCH] Partially revert "Use GL_NEAREST when possible without degrading quality" The changes to GL_NEAREST for overlay textures and disabling alpha blending in SDL renderer are left intact. This reverts commit 0f49dca4c07f1efdb81d6d86c9d429d3d5f57c24. --- .../video/ffmpeg-renderers/eglvid.cpp | 32 +++++++------------ .../video/ffmpeg-renderers/sdlvid.cpp | 5 --- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/app/streaming/video/ffmpeg-renderers/eglvid.cpp b/app/streaming/video/ffmpeg-renderers/eglvid.cpp index 0c7bd7dd..d137dbf8 100644 --- a/app/streaming/video/ffmpeg-renderers/eglvid.cpp +++ b/app/streaming/video/ffmpeg-renderers/eglvid.cpp @@ -627,6 +627,8 @@ bool EGLRenderer::setupVideoRenderingState() { glGenTextures(EGL_MAX_PLANES, m_Textures); for (size_t i = 0; i < EGL_MAX_PLANES; ++i) { glBindTexture(GL_TEXTURE_EXTERNAL_OES, m_Textures[i]); + glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); } @@ -784,16 +786,6 @@ void EGLRenderer::renderFrame(AVFrame* frame) } } - int drawableWidth, drawableHeight; - SDL_GL_GetDrawableSize(m_Window, &drawableWidth, &drawableHeight); - SDL_Rect src, dst; - src.x = src.y = dst.x = dst.y = 0; - src.w = frame->width; - src.h = frame->height; - dst.w = drawableWidth; - dst.h = drawableHeight; - StreamUtils::scaleSourceToDestinationSurface(&src, &dst); - ssize_t plane_count = m_Backend->exportEGLImages(frame, m_EGLDisplay, imgs); if (plane_count < 0) return; @@ -801,16 +793,6 @@ void EGLRenderer::renderFrame(AVFrame* frame) glActiveTexture(GL_TEXTURE0 + i); glBindTexture(GL_TEXTURE_EXTERNAL_OES, m_Textures[i]); m_glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, imgs[i]); - - // Use GL_NEAREST to reduce sampling if the video region is a multiple of the frame size - if (dst.w % frame->width == 0 && dst.h % frame->height == 0) { - glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - } - else { - glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - } } // We already called glClear() after last frame's SDL_GL_SwapWindow() @@ -819,7 +801,17 @@ void EGLRenderer::renderFrame(AVFrame* frame) glClear(GL_COLOR_BUFFER_BIT); } + int drawableWidth, drawableHeight; + SDL_GL_GetDrawableSize(m_Window, &drawableWidth, &drawableHeight); + // Set the viewport to the size of the aspect-ratio-scaled video + SDL_Rect src, dst; + src.x = src.y = dst.x = dst.y = 0; + src.w = frame->width; + src.h = frame->height; + dst.w = drawableWidth; + dst.h = drawableHeight; + StreamUtils::scaleSourceToDestinationSurface(&src, &dst); glViewport(dst.x, dst.y, dst.w, dst.h); glUseProgram(m_ShaderProgram); diff --git a/app/streaming/video/ffmpeg-renderers/sdlvid.cpp b/app/streaming/video/ffmpeg-renderers/sdlvid.cpp index 5b3ec3bd..813b0806 100644 --- a/app/streaming/video/ffmpeg-renderers/sdlvid.cpp +++ b/app/streaming/video/ffmpeg-renderers/sdlvid.cpp @@ -576,11 +576,6 @@ ReadbackRetry: // Ensure the viewport is set to the desired video region SDL_RenderSetViewport(m_Renderer, &dst); - // Use nearest pixel sampling if the video region size is a multiple of the frame size - SDL_SetTextureScaleMode(m_Texture, - dst.w % frame->width == 0 && dst.h % frame->height == 0 ? - SDL_ScaleModeNearest : SDL_ScaleModeLinear); - // Draw the video content itself SDL_RenderCopy(m_Renderer, m_Texture, nullptr, nullptr);