diff options
| author | Sven Gothel <[email protected]> | 2013-11-01 12:38:54 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-11-01 12:38:54 +0100 |
| commit | f4574bf6846f2084f6a403552f7be6e845107c73 (patch) | |
| tree | 1699c8bee62797231657265a741acad58d1a43e9 /make | |
| parent | 33db4580da46ba21771499fdf50489e60294e439 (diff) | |
Bug 885 - GLMediaPlayer: Allow single threaded mode - Especially where multiple media textures (Android) or shared GL context are not usable.
- GLMediaPlayer:
- TEXTURE_COUNT_MIN is the new minimum: '1' - i.e. no multithreading, single threaded player
- TEXTURE_COUNT_DEFAULT is '4' - multithreaded
- GLMediaPlayerImpl:
- Add Single threaded mode, but perform initStreamImpl(..) off-thread.
-
Diffstat (limited to 'make')
| -rw-r--r-- | make/scripts/adb-launch-activity.sh | 3 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/make/scripts/adb-launch-activity.sh b/make/scripts/adb-launch-activity.sh index 84399520e..401bd51a6 100644 --- a/make/scripts/adb-launch-activity.sh +++ b/make/scripts/adb-launch-activity.sh @@ -2,7 +2,8 @@ #ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.NEWTGenericActivity" #ANAME="com.jogamp.android.launcher/com.jogamp.android.launcher.NEWTLauncherActivity2" -ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.NEWTGearsES2ActivityLauncher" +#ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.NEWTGearsES2ActivityLauncher" +ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.MovieCubeActivityLauncher0" adb $* shell "setprop log.redirect-stdio true ; setprop log.redirect-stderr true ; \ am start -a android.intent.action.MAIN -n $ANAME" diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index aa1450dc9..a93c2ed79 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -136,7 +136,7 @@ function jrun() { #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL -Djogl.debug.GLContext.TraceSwitch -Djogl.debug=all" #D_ARGS="-Djogamp.debug.IOUtil -Djogl.debug.GLSLCode -Djogl.debug.GLMediaPlayer" #D_ARGS="-Djogl.debug.GLMediaPlayer -Djogl.debug.AudioSink" - #D_ARGS="-Djogl.debug.GLMediaPlayer -Djogl.debug.GLMediaPlayer.Native" + D_ARGS="-Djogl.debug.GLMediaPlayer -Djogl.debug.GLMediaPlayer.Native" #D_ARGS="-Djogl.debug.GLMediaPlayer" #D_ARGS="-Djogl.debug.GLMediaPlayer.StreamWorker.delay=25 -Djogl.debug.GLMediaPlayer" #D_ARGS="-Djogl.debug.GLMediaPlayer.Native" @@ -328,7 +328,7 @@ function testawtswt() { # av demos # #testnoawt jogamp.opengl.openal.av.ALDummyUsage $* -#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $* +testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $* # @@ -375,7 +375,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestBug669RecursiveGLContext01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestBug669RecursiveGLContext02NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestBug692GL3VAONEWT $* -testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestCPUSourcingAPINEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestCPUSourcingAPINEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLExtensionQueryOffscreen $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListNEWT $* |