diff options
| author | Sven Gothel <[email protected]> | 2013-12-11 21:09:59 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-12-11 21:09:59 +0100 |
| commit | a0b23035bf9de987f5ad1b00fe3630c102f4e513 (patch) | |
| tree | e6c90c51ab466aafd6a97c13693d962b9bcf6325 | |
| parent | d42b236ef139dcc8d8713535893c7870b55d420c (diff) | |
Bug 918: Fix EOS Regression: Only use pts>duration for EOS if duration > 0 (camera or other sources may not have duration)
Regression of commit 8a8ed735f6631b2da7bf605c5c3dda4e0fc13905
3 files changed, 4 insertions, 4 deletions
diff --git a/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java b/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java index e6a0012d3..0de308cd1 100644 --- a/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java +++ b/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java @@ -816,7 +816,7 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer { final long currentTimeMillis = Platform.currentTimeMillis(); if( TimeFrameI.END_OF_STREAM_PTS == video_pts || - duration <= video_pts || maxNullFrameCountUntilEOS <= nullFrameCount ) + ( duration > 0 && duration <= video_pts ) || maxNullFrameCountUntilEOS <= nullFrameCount ) { // EOS if( DEBUG ) { @@ -1245,7 +1245,7 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer { nextFrame = null; } else { // audio only - if( TimeFrameI.END_OF_STREAM_PTS == vPTS || duration < vPTS ) { + if( TimeFrameI.END_OF_STREAM_PTS == vPTS || ( duration > 0 && duration < vPTS ) ) { audioEOS = true; } else { nullFrameCount = 0; diff --git a/src/test/com/jogamp/opengl/test/android/MovieCubeActivityLauncher0.java b/src/test/com/jogamp/opengl/test/android/MovieCubeActivityLauncher0.java index fb7faf90b..1e0d6067f 100644 --- a/src/test/com/jogamp/opengl/test/android/MovieCubeActivityLauncher0.java +++ b/src/test/com/jogamp/opengl/test/android/MovieCubeActivityLauncher0.java @@ -58,7 +58,7 @@ public class MovieCubeActivityLauncher0 extends LauncherUtil.BaseActivityLaunche // props.setProperty("jogl.debug.GLProfile", "true"); // props.setProperty("jogl.debug.GLDrawable", "true"); // props.setProperty("jogl.debug.GLContext", "true"); - // props.setProperty("jogl.debug.GLMediaPlayer", "true"); + props.setProperty("jogl.debug.GLMediaPlayer", "true"); props.setProperty("jogl.debug.GLSLCode", "true"); // props.setProperty("jogl.debug.CapabilitiesChooser", "true"); // props.setProperty("jogl.debug.GLSLState", "true"); diff --git a/src/test/com/jogamp/opengl/test/android/MovieCubeActivityLauncher1a.java b/src/test/com/jogamp/opengl/test/android/MovieCubeActivityLauncher1a.java index 79b8b210d..c4eea084a 100644 --- a/src/test/com/jogamp/opengl/test/android/MovieCubeActivityLauncher1a.java +++ b/src/test/com/jogamp/opengl/test/android/MovieCubeActivityLauncher1a.java @@ -57,7 +57,7 @@ public class MovieCubeActivityLauncher1a extends LauncherUtil.BaseActivityLaunch // props.setProperty("jogl.debug.GLProfile", "true"); // props.setProperty("jogl.debug.GLDrawable", "true"); // props.setProperty("jogl.debug.GLContext", "true"); - // props.setProperty("jogl.debug.GLMediaPlayer", "true"); + props.setProperty("jogl.debug.GLMediaPlayer", "true"); props.setProperty("jogl.debug.GLSLCode", "true"); // props.setProperty("jogl.debug.CapabilitiesChooser", "true"); // props.setProperty("jogl.debug.GLSLState", "true"); |