aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-08-25 09:06:58 +0200
committerSven Gothel <[email protected]>2013-08-25 09:06:58 +0200
commit469314fff8dc53658db932bab6108107780619ee (patch)
treee6d1285dddba3b294adaf3ae1bc66a5958ef0bf3 /src/jogl
parent640dbb2e1780a6074b932a455252bb410e4393de (diff)
NullGLMediaPlayer: Fix reported VID (fake 0), no AID, textureCount == 2
Diffstat (limited to 'src/jogl')
-rw-r--r--src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java b/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java
index 9066f3dd1..6fa7c7a54 100644
--- a/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java
+++ b/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java
@@ -133,11 +133,10 @@ public class NullGLMediaPlayer extends GLMediaPlayerImpl {
@Override
protected final void initStreamImpl(int vid, int aid) throws IOException {
texData = createTestTextureData();
- final int r_aid = GLMediaPlayer.STREAM_ID_NONE == aid ? GLMediaPlayer.STREAM_ID_NONE : GLMediaPlayer.STREAM_ID_AUTO;
final float _fps = 24f;
final int _duration = 10*60*1000; // msec
final int _totalFrames = (int) ( (_duration/1000)*_fps );
- updateAttributes(GLMediaPlayer.STREAM_ID_AUTO, r_aid,
+ updateAttributes(0 /* fake */, GLMediaPlayer.STREAM_ID_NONE,
texData.getWidth(), texData.getHeight(), 0,
0, 0, _fps,
_totalFrames, 0, _duration, "png-static", null);
@@ -147,6 +146,17 @@ public class NullGLMediaPlayer extends GLMediaPlayerImpl {
// NOP
}
+ /**
+ * {@inheritDoc}
+ * <p>
+ * Returns 2
+ * </p>
+ */
+ @Override
+ protected int validateTextureCount(int desiredTextureCount) {
+ return 2;
+ }
+
@Override
protected final TextureSequence.TextureFrame createTexImage(GL gl, int texName) {
final Texture texture = super.createTexImageImpl(gl, texName, width, height, false);