GLMediaPlayer/FFMPEGMediaPlayer: Add working subtitle (text + ass/saa) support via FFMpeg

TODO:
- We may want to refine subtitle PTS handling
- We may want to support bitmapped subtitles

1 files changed, 13 insertions, 9 deletions

diff --git a/src/jogl/classes/jogamp/opengl/android/av/AndroidGLMediaPlayerAPI14.java b/src/jogl/classes/jogamp/opengl/android/av/AndroidGLMediaPlayerAPI14.java
index 3585f7ab2..c4d1ee78f 100644
--- a/src/jogl/classes/jogamp/opengl/android/av/AndroidGLMediaPlayerAPI14.java
+++ b/src/jogl/classes/jogamp/opengl/android/av/AndroidGLMediaPlayerAPI14.java
@@ -281,7 +281,7 @@ public class AndroidGLMediaPlayerAPI14 extends GLMediaPlayerImpl {
     }
 
     @Override
-    protected final void initStreamImpl(final int vid, final int aid, int sid) throws IOException {
+    protected final void initStreamImpl(final int vid, final int aid, final int sid) throws IOException {
         if( null == getUri() ) {
             return;
         }
@@ -336,10 +336,12 @@ public class AndroidGLMediaPlayerAPI14 extends GLMediaPlayerImpl {
                 r_alangs = new String[] { "n/a" };
             }
             final String icodec = "android";
-            updateAttributes(null, new int[] { 0 }, new String[] { "und" },
-                             0 /* fake */, r_aids, r_alangs,
-                             r_aid, new int[0], new String[0],
-                             GLMediaPlayer.STREAM_ID_NONE, mp.getVideoWidth(), mp.getVideoHeight(), 0, 0, 0, 0f, 0, 0, mp.getDuration(), icodec, icodec);
+            updateAttributes(null,
+                             new int[] { 0 }, new String[] { "und" }, 0 /* fake */,
+                             r_aids, r_alangs, r_aid,
+                             new int[0], new String[0], GLMediaPlayer.STREAM_ID_NONE,
+                             mp.getVideoWidth(), mp.getVideoHeight(), 0, 0, 0, 0f, 0, 0, mp.getDuration(),
+                             icodec, icodec, null);
             /**
                 mp.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
                     @Override
@@ -372,10 +374,12 @@ public class AndroidGLMediaPlayerAPI14 extends GLMediaPlayerImpl {
                     }
                 }
             }
-            updateAttributes(null, new int[]{0}, new String[] { "und" },
-                             0 /* fake */, new int[0], new String[0],
-                             GLMediaPlayer.STREAM_ID_NONE, new int[0], new String[0],
-                             GLMediaPlayer.STREAM_ID_NONE, size.width, size.height, 0, 0, 0, fpsRange[1]/1000f, 0, 0, 0, icodec, icodec);
+            updateAttributes(null,
+                             new int[]{0}, new String[] { "und" }, 0 /* fake */,
+                             new int[0], new String[0], GLMediaPlayer.STREAM_ID_NONE,
+                             new int[0], new String[0], GLMediaPlayer.STREAM_ID_NONE,
+                             size.width, size.height, 0, 0, 0, fpsRange[1]/1000f, 0, 0, 0,
+                             icodec, icodec, null);
         }
     }
     private static String camSz2Str(final Camera.Size csize) {