From 95e2519a0fc37d19d05bc0f4cc14f593eaae7dd9 Mon Sep 17 00:00:00 2001 From: Sven Göthel Date: Mon, 22 Jan 2024 22:03:29 +0100 Subject: Bug 1488: FFMPEGMediaPlayer: Fix getTextureFragmentShaderHashID(), i.e. use actual tc_w_1 = (float)getWidth() / (float)texWidth value as hardcoded within the shader. --- .../classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/jogl/classes/jogamp/opengl/util/av/impl') diff --git a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java index 4e1effb02..ee9dfaef6 100644 --- a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java +++ b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java @@ -763,10 +763,7 @@ public class FFMPEGMediaPlayer extends GLMediaPlayerImpl { */ @Override public final String getTextureLookupFragmentShaderImpl() { - final float tc_w_1 = (float)getWidth() / (float)texWidth; - return getTextureLookupFragmentShaderImpl(tc_w_1); - } - private final String getTextureLookupFragmentShaderImpl(final float tc_w_1) { + final float tc_w_1 = (float)getWidth() / (float)texWidth; final String texLookupFuncName = getTextureLookupFunctionName(); if( texLookupFuncName.equals("texture2D") ) { throw new IllegalArgumentException("Build in 'texture2D' lookup-func-name not allowed!"); @@ -924,8 +921,8 @@ public class FFMPEGMediaPlayer extends GLMediaPlayerImpl { @Override public final String getTextureFragmentShaderHashID() { - // return getTextureSampler2DType()+";"+getTextureLookupFunctionName()+";"+getTextureLookupFragmentShaderImpl(1.0f); - return getTextureLookupFragmentShaderImpl(1.0f); // state-less shader code required using 1.0 + // return getTextureSampler2DType()+";"+getTextureLookupFunctionName()+";"+getTextureLookupFragmentShaderImpl(); + return getTextureLookupFragmentShaderImpl(); } @Override -- cgit v1.2.3