aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/com
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-09-25 05:57:43 +0200
committerSven Gothel <[email protected]>2013-09-25 05:57:43 +0200
commit6fbf6de172f50dce7f65790460458238bf780902 (patch)
tree351da88fd393f113aa5b5ce5e570bc3b5f593bf3 /src/test/com
parent7231fa94ce228b1ea31acba5582e95b0c9f40778 (diff)
Fix MovieCube/Simple Demo in 'Applet' mode: Use default ctor to completly initialize GLMediaPlayer demo w/ def. stream etc; Fix list of command keys in applet html page.
Diffstat (limited to 'src/test/com')
-rw-r--r--src/test/com/jogamp/opengl/test/android/MovieSimpleActivity0.java2
-rw-r--r--src/test/com/jogamp/opengl/test/android/MovieSimpleActivity1.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java42
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java61
4 files changed, 93 insertions, 16 deletions
diff --git a/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity0.java b/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity0.java
index db73673a7..b5a9ce580 100644
--- a/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity0.java
+++ b/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity0.java
@@ -95,7 +95,7 @@ public class MovieSimpleActivity0 extends NewtBaseActivity {
anim.add(glWindowMain);
glWindowMain.setVisible(true);
- final MovieSimple demoMain = new MovieSimple();
+ final MovieSimple demoMain = new MovieSimple(null);
demoMain.setScaleOrig(true);
final GLMediaPlayer mPlayer = demoMain.getGLMediaPlayer();
mPlayer.addEventListener( new GLMediaPlayer.GLMediaEventListener() {
diff --git a/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity1.java b/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity1.java
index f94390dcd..e54300de5 100644
--- a/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity1.java
+++ b/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity1.java
@@ -128,7 +128,7 @@ public class MovieSimpleActivity1 extends NewtBaseActivity {
anim.add(glWindowMain);
glWindowMain.setVisible(true);
- final MovieSimple demoMain = new MovieSimple();
+ final MovieSimple demoMain = new MovieSimple(null);
final GLMediaPlayer mPlayerMain = demoMain.getGLMediaPlayer();
if(mPlayerHUD) {
demoMain.setEffects(MovieSimple.EFFECT_GRADIENT_BOTTOM2TOP);
@@ -183,7 +183,7 @@ public class MovieSimpleActivity1 extends NewtBaseActivity {
demoHUD = new MovieSimple(mPlayerShared);
mPlayerSub = mPlayerShared;
} else {
- demoHUD = new MovieSimple();
+ demoHUD = new MovieSimple(null);
mPlayerSub = demoHUD.getGLMediaPlayer();
}
mPlayerSub.addEventListener( new GLMediaPlayer.GLMediaEventListener() {
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java
index d10bba8c7..fe11f6aca 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java
@@ -81,10 +81,50 @@ public class MovieCube implements GLEventListener {
defURI = _defURI;
}
+ /**
+ * Default constructor which also issues {@link #initStream(URI, int, int, int)} w/ default values
+ * and polls until the {@link GLMediaPlayer} is {@link GLMediaPlayer.State#Initialized}.
+ * If {@link GLMediaEventListener#EVENT_CHANGE_EOS} is reached, the stream is started over again.
+ * <p>
+ * This default constructor is merely useful for some <i>drop-in</i> test, e.g. using an applet.
+ * </p>
+ */
public MovieCube() throws IOException, URISyntaxException {
- this(-2.3f, 0f, 0f);
+ this(-2.3f, 0f, 0f);
+
+ mPlayer.addEventListener(new GLMediaEventListener() {
+ @Override
+ public void newFrameAvailable(GLMediaPlayer ts, TextureFrame newFrame, long when) { }
+
+ @Override
+ public void attributesChanged(final GLMediaPlayer mp, int event_mask, long when) {
+ System.err.println("MovieCube AttributesChanges: events_mask 0x"+Integer.toHexString(event_mask)+", when "+when);
+ System.err.println("MovieCube State: "+mp);
+ if( 0 != ( GLMediaEventListener.EVENT_CHANGE_SIZE & event_mask ) ) {
+ resetGLState();
+ }
+ if( 0 != ( GLMediaEventListener.EVENT_CHANGE_EOS & event_mask ) ) {
+ // loop for-ever ..
+ mPlayer.seek(0);
+ mPlayer.play();
+ }
+ }
+ });
+ initStream(defURI, GLMediaPlayer.STREAM_ID_AUTO, GLMediaPlayer.STREAM_ID_AUTO, 3 /* textureCount */);
+ StreamException se = null;
+ while( null == se && GLMediaPlayer.State.Initialized != mPlayer.getState() ) {
+ try {
+ Thread.sleep(16);
+ } catch (InterruptedException e) { }
+ se = mPlayer.getStreamException();
+ }
+ if( null != se ) {
+ se.printStackTrace();
+ throw new RuntimeException(se);
+ }
}
+ /** Custom constructor, user needs to issue {@link #initStream(URI, int, int, int)} afterwards. */
public MovieCube(float zoom0, float rotx, float roty) throws IOException {
this.zoom0 = zoom0;
this.rotx = rotx;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java
index 907813191..d29381f35 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java
@@ -95,7 +95,6 @@ public class MovieSimple implements GLEventListener {
private int swapInterval = 1;
private GLMediaPlayer mPlayer;
- private boolean mPlayerExternal;
private boolean mPlayerShared;
private boolean mPlayerScaleOrig;
private float[] verts = null;
@@ -232,20 +231,58 @@ public class MovieSimple implements GLEventListener {
}
};
+ /**
+ * Default constructor which also issues {@link #initStream(URI, int, int, int)} w/ default values
+ * and polls until the {@link GLMediaPlayer} is {@link GLMediaPlayer.State#Initialized}.
+ * If {@link GLMediaEventListener#EVENT_CHANGE_EOS} is reached, the stream is started over again.
+ * <p>
+ * This default constructor is merely useful for some <i>drop-in</i> test, e.g. using an applet.
+ * </p>
+ */
public MovieSimple() {
- mPlayerScaleOrig = false;
- mPlayerShared = false;
- mPlayerExternal = false;
- mPlayer = GLMediaPlayerFactory.createDefault();
- System.out.println("pC.1a "+mPlayer);
+ this(null);
+
+ mPlayer.addEventListener(new GLMediaEventListener() {
+ @Override
+ public void newFrameAvailable(GLMediaPlayer ts, TextureFrame newFrame, long when) { }
+
+ @Override
+ public void attributesChanged(final GLMediaPlayer mp, int event_mask, long when) {
+ System.err.println("MovieCube AttributesChanges: events_mask 0x"+Integer.toHexString(event_mask)+", when "+when);
+ System.err.println("MovieCube State: "+mp);
+ if( 0 != ( GLMediaEventListener.EVENT_CHANGE_SIZE & event_mask ) ) {
+ resetGLState();
+ }
+ if( 0 != ( GLMediaEventListener.EVENT_CHANGE_EOS & event_mask ) ) {
+ // loop for-ever ..
+ mPlayer.seek(0);
+ mPlayer.play();
+ }
+ }
+ });
+ initStream(defURI, GLMediaPlayer.STREAM_ID_AUTO, GLMediaPlayer.STREAM_ID_AUTO, 3 /* textureCount */);
+ StreamException se = null;
+ while( null == se && GLMediaPlayer.State.Initialized != mPlayer.getState() ) {
+ try {
+ Thread.sleep(16);
+ } catch (InterruptedException e) { }
+ se = mPlayer.getStreamException();
+ }
+ if( null != se ) {
+ se.printStackTrace();
+ throw new RuntimeException(se);
+ }
}
+ /** Custom constructor, user needs to issue {@link #initStream(URI, int, int, int)} afterwards. */
public MovieSimple(GLMediaPlayer sharedMediaPlayer) throws IllegalStateException {
- mPlayerScaleOrig = false;
- mPlayerShared = true;
- mPlayerExternal = true;
mPlayer = sharedMediaPlayer;
- System.out.println("pC.2 shared "+mPlayerShared+", "+mPlayer);
+ mPlayerScaleOrig = false;
+ mPlayerShared = null != mPlayer;
+ if( !mPlayerShared ) {
+ mPlayer = GLMediaPlayerFactory.createDefault();
+ }
+ System.out.println("pC.1a shared "+mPlayerShared+", "+mPlayer);
}
public void initStream(URI streamLoc, int vid, int aid, int textureCount) {
@@ -560,7 +597,7 @@ public class MovieSimple implements GLEventListener {
System.out.println("pD.1 "+mPlayer+", disposePlayer "+disposePlayer);
GL2ES2 gl = drawable.getGL().getGL2ES2();
if( disposePlayer ) {
- if(!mPlayerExternal) {
+ if(!mPlayerShared) {
mPlayer.destroy(gl);
}
System.out.println("pD.X "+mPlayer);
@@ -717,7 +754,7 @@ public class MovieSimple implements GLEventListener {
System.err.println("forceGLDef "+forceGLDef);
System.err.println("swapInterval "+swapInterval);
- final MovieSimple ms = new MovieSimple();
+ final MovieSimple ms = new MovieSimple(null);
ms.setSwapInterval(swapInterval);
ms.setScaleOrig(!zoom);
ms.setOrthoProjection(ortho);