summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-08-25 05:12:51 +0200
committerSven Gothel <[email protected]>2013-08-25 05:12:51 +0200
commit8130f54fa3d7cdde59f4a88af081c44ddfb2c7f0 (patch)
tree893309373a7d840ade7fa41d9f93b33a79ed0e06 /src/test
parent8cdbfb676ea31c6719e6f6e8ae7a44e060a5987f (diff)
AndroidGLMediaPlayerAPI14: Fix implementation to coop w/ threaded decoder / Add EOS detection, setAudioVolume(..)
GLMediaPlayerImpl.initStreamGL(..): Only require a minimum texture count of 2, which is the bare minimum to allow our algorithm to work, i.e. having a 'lastFrame' and avail/playing ringbuffer have each one frame. Android's MediaPlayer API can only deal w/ one SurfaceTexture, hence we have to fake a second SurfaceTextureFrame w/ same content to allow our implementation to work w/ the threaded decoder (min 2 frames).
Diffstat (limited to 'src/test')
-rw-r--r--src/test/com/jogamp/opengl/test/android/MovieCubeActivity0.java5
-rw-r--r--src/test/com/jogamp/opengl/test/android/MovieSimpleActivity0.java5
-rw-r--r--src/test/com/jogamp/opengl/test/android/MovieSimpleActivity1.java10
-rw-r--r--src/test/com/jogamp/opengl/test/android/MovieSimpleActivityLauncher00a.java2
-rw-r--r--src/test/com/jogamp/opengl/test/android/MovieSimpleActivityLauncher00b.java2
5 files changed, 6 insertions, 18 deletions
diff --git a/src/test/com/jogamp/opengl/test/android/MovieCubeActivity0.java b/src/test/com/jogamp/opengl/test/android/MovieCubeActivity0.java
index 783742fec..3d83bfd2c 100644
--- a/src/test/com/jogamp/opengl/test/android/MovieCubeActivity0.java
+++ b/src/test/com/jogamp/opengl/test/android/MovieCubeActivity0.java
@@ -119,10 +119,7 @@ public class MovieCubeActivity0 extends NewtBaseActivity {
if( null != se ) {
se.printStackTrace();
}
- new Thread() {
- public void run() {
- glWindowMain.destroy();
- } }.start();
+ getActivity().finish();
}
}
});
diff --git a/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity0.java b/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity0.java
index 467ad1e75..db73673a7 100644
--- a/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity0.java
+++ b/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity0.java
@@ -116,10 +116,7 @@ public class MovieSimpleActivity0 extends NewtBaseActivity {
if( null != se ) {
se.printStackTrace();
}
- new Thread() {
- public void run() {
- glWindowMain.destroy();
- } }.start();
+ getActivity().finish();
}
}
});
diff --git a/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity1.java b/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity1.java
index 84e691e76..f94390dcd 100644
--- a/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity1.java
+++ b/src/test/com/jogamp/opengl/test/android/MovieSimpleActivity1.java
@@ -153,10 +153,7 @@ public class MovieSimpleActivity1 extends NewtBaseActivity {
if( null != se ) {
se.printStackTrace();
}
- new Thread() {
- public void run() {
- glWindowMain.destroy();
- } }.start();
+ getActivity().finish();
}
}
});
@@ -203,10 +200,7 @@ public class MovieSimpleActivity1 extends NewtBaseActivity {
if( null != se ) {
se.printStackTrace();
}
- new Thread() {
- public void run() {
- glWindowHUD.destroy();
- } }.start();
+ getActivity().finish();
}
}
});
diff --git a/src/test/com/jogamp/opengl/test/android/MovieSimpleActivityLauncher00a.java b/src/test/com/jogamp/opengl/test/android/MovieSimpleActivityLauncher00a.java
index de4238fad..e70e48ca3 100644
--- a/src/test/com/jogamp/opengl/test/android/MovieSimpleActivityLauncher00a.java
+++ b/src/test/com/jogamp/opengl/test/android/MovieSimpleActivityLauncher00a.java
@@ -45,7 +45,7 @@ public class MovieSimpleActivityLauncher00a extends LauncherUtil.BaseActivityLau
props.setProperty("jnlp.mplayer.hud", "false");
props.setProperty("jnlp.mplayer.hud.shared", "false");
// props.setProperty("jnlp.media0_url2", "http://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_640x360.m4v");
- props.setProperty("jnlp.media0_url2", "");
+ props.setProperty("jnlp.media0_url2", "http://video.webmfiles.org/big-buck-bunny_trailer.webm");
props.setProperty("jnlp.media0_url1", "http://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4");
props.setProperty("jnlp.media0_url0", "file:///mnt/sdcard/Movies/BigBuckBunny_320x180.mp4");
props.setProperty("jnlp.media1_url0", "http://archive.org/download/ElephantsDream/ed_1024_512kb.mp4");
diff --git a/src/test/com/jogamp/opengl/test/android/MovieSimpleActivityLauncher00b.java b/src/test/com/jogamp/opengl/test/android/MovieSimpleActivityLauncher00b.java
index 3decf393f..b0e7fdb33 100644
--- a/src/test/com/jogamp/opengl/test/android/MovieSimpleActivityLauncher00b.java
+++ b/src/test/com/jogamp/opengl/test/android/MovieSimpleActivityLauncher00b.java
@@ -45,7 +45,7 @@ public class MovieSimpleActivityLauncher00b extends LauncherUtil.BaseActivityLau
props.setProperty("jnlp.mplayer.hud", "false");
props.setProperty("jnlp.mplayer.hud.shared", "false");
// props.setProperty("jnlp.media0_url2", "http://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_640x360.m4v");
- props.setProperty("jnlp.media0_url2", "");
+ props.setProperty("jnlp.media0_url2", "http://video.webmfiles.org/big-buck-bunny_trailer.webm");
props.setProperty("jnlp.media0_url1", "http://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4");
props.setProperty("jnlp.media0_url0", "file:///mnt/sdcard/Movies/BigBuckBunny_320x180.mp4");
props.setProperty("jnlp.media1_url0", "http://archive.org/download/ElephantsDream/ed_1024_512kb.mp4");