2 files changed, 23 insertions, 8 deletions
diff --git a/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java b/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java
index 457157285..4a7e52c4f 100644
--- a/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java
+++ b/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java
@@ -65,7 +65,6 @@ import com.jogamp.common.util.WorkerThread;
 import com.jogamp.math.FloatUtil;
 import com.jogamp.opengl.GLExtensions;
 import com.jogamp.opengl.util.av.GLMediaPlayer;
-import com.jogamp.opengl.util.av.GLMediaPlayer.Chapter;
 import com.jogamp.opengl.util.glsl.ShaderCode;
 import com.jogamp.opengl.util.texture.Texture;
 import com.jogamp.opengl.util.texture.TextureData;
@@ -274,7 +273,7 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer {
     protected int getAudioChannelLimit() { return userMaxChannels; }
 
     @Override
-    public String getRequiredExtensionsShaderStub() {
+    public final String getRequiredExtensionsShaderStub() {
         if(GLES2.GL_TEXTURE_EXTERNAL_OES == textureTarget) {
             return ShaderCode.createExtensionDirective(GLExtensions.OES_EGL_image_external, ShaderCode.ENABLE);
         }
@@ -282,7 +281,7 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer {
     }
 
     @Override
-    public String getTextureSampler2DType() {
+    public final String getTextureSampler2DType() {
         switch(textureTarget) {
             case GL.GL_TEXTURE_2D:
             case GL2GL3.GL_TEXTURE_RECTANGLE:
@@ -305,6 +304,7 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer {
     @Override
     public String setTextureLookupFunctionName(final String texLookupFuncName) throws IllegalStateException {
         textureLookupFunctionName = "texture2D";
+        resetTextureFragmentShaderHashCode();
         return textureLookupFunctionName;
     }
 
@@ -332,18 +332,23 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer {
     }
 
     @Override
+    public String getTextureFragmentShaderHashID() {
+        // return getTextureSampler2DType()+";"+getTextureLookupFunctionName()+";"+getTextureLookupFragmentShaderImpl();
+        return getTextureSampler2DType()+";"+getTextureLookupFunctionName();
+    }
+
+    @Override
     public final int getTextureFragmentShaderHashCode() {
         if( State.Uninitialized == state ) {
-            textureFragmentShaderHashCode = 0;
+            resetTextureFragmentShaderHashCode();
             return 0;
         } else if( 0 == textureFragmentShaderHashCode ) {
-            int hash = 31 + getTextureLookupFunctionName().hashCode();
-            hash = ((hash << 5) - hash) + getTextureLookupFragmentShaderImpl().hashCode();
-            hash = ((hash << 5) - hash) + getTextureSampler2DType().hashCode();
+            final int hash = getTextureFragmentShaderHashID().hashCode();
             textureFragmentShaderHashCode = hash;
         }
         return textureFragmentShaderHashCode;
     }
+    protected final void resetTextureFragmentShaderHashCode() { textureFragmentShaderHashCode = 0; }
 
     @Override
     public final int getDecodedFrameCount() { return decodedFrameCount; }
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 78c20d90a..4e1effb02 100644
--- a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java
+++ b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java
@@ -751,6 +751,7 @@ public class FFMPEGMediaPlayer extends GLMediaPlayerImpl {
         } else {
             textureLookupFunctionName = "ffmpegTexture2D";
         }
+        resetTextureFragmentShaderHashCode();
         return textureLookupFunctionName;
     }
 
@@ -762,7 +763,10 @@ public class FFMPEGMediaPlayer extends GLMediaPlayerImpl {
      */
     @Override
     public final String getTextureLookupFragmentShaderImpl() {
-      final float tc_w_1 = (float)getWidth() / (float)texWidth;
+        final float tc_w_1 = (float)getWidth() / (float)texWidth;
+        return getTextureLookupFragmentShaderImpl(tc_w_1);
+    }
+    private final String getTextureLookupFragmentShaderImpl(final float tc_w_1) {
       final String texLookupFuncName = getTextureLookupFunctionName();
       if( texLookupFuncName.equals("texture2D") ) {
           throw new IllegalArgumentException("Build in 'texture2D' lookup-func-name not allowed!");
@@ -919,6 +923,12 @@ 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
+    }
+
+    @Override
     public final boolean resumeImpl() {
         if(0==moviePtr) {
             return false;