Changeset bd57eaaeb3001b9e2af467053bd55f5f15b2a7ea

Timestamp:

02/05/08 08:29:23 (5 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1209709763 -0700

git-parent:

[beee3221da8d2f81ff6142269d875ea59e6fd5f3]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1209709763 -0700

Message:

Support for AQT subtitles.
Parsing is fine but timing is wrong since it must be multiplied by FPS.

Files:

• modules/demux/subtitle.c (modified) (5 diffs)

modules/demux/subtitle.c

@@ -100 +100 @@
-    SUB_TYPE_SUBVIEWER,
-    SUB_TYPE_DVDSUBTITLE,
-
+
+
-};
-
@@ -146 +147 @@
-static int  ParseDVDSubtitle( demux_t *, subtitle_t *, int );
-static int  ParseMPL2       ( demux_t *, subtitle_t *, int );
+static int  ParseAQT        ( demux_t *, subtitle_t *, int );
-
-static struct
@@ -165 +167 @@
-    { "dvdsubtitle",SUB_TYPE_DVDSUBTITLE, "DVDSubtitle", ParseDVDSubtitle },
-    { "mpl2",       SUB_TYPE_MPL2,        "MPL2",        ParseMPL2 },
+    { "aqt",        SUB_TYPE_AQT,         "AQTitle",     ParseAQT },
-    { NULL,         SUB_TYPE_UNKNOWN,     "Unknown",     NULL }
-};
@@ -318 +321 @@
-                p_sys->i_type = SUB_TYPE_MPL2;
-                break;
+            }else if( sscanf (s, "-->> %d", &i_dummy) == 1 )
+            {
+                p_sys->i_type = SUB_TYPE_AQT;
-            }
-
@@ -1227 +1233 @@
-}
-
+static int ParseAQT( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx )
+{
+    demux_sys_t *p_sys = p_demux->p_sys;
+    text_t      *txt = &p_sys->txt;
+    char *psz_text = strdup( "" );
+    int i_old = 0;
+    int i_firstline = 1;
+
+    for( ;; )
+    {
+        int t; /* Time */
+
+        const char *s = TextGetLine( txt );
+
+        if( !s )
+            return VLC_EGENERIC;
+
+        /* Data Lines */
+        if( sscanf (s, "-->> %d", &t) == 1)
+        {
+            p_subtitle->i_start = (int64_t)t; /* * FPS*/
+            p_subtitle->i_stop  = 0;
+
+            /* Starting of a subtitle */
+            if( i_firstline )
+            {
+                i_firstline = 0;
+            }
+            /* We have been too far: end of the subtitle, begin of next */
+            else
+            {
+                txt->i_line--;
+                break;
+            }
+        }
+        /* Text Lines */
+        else
+        {
+            i_old = strlen( psz_text ) + 1;
+            psz_text = realloc( psz_text, i_old + strlen( s ) + 1 );
+            if( !psz_text )
+                 return VLC_ENOMEM;
+            strcat( psz_text, s );
+            strcat( psz_text, "\n" );
+            if( txt->i_line == txt->i_line_count )
+                break;
+        }
+    }
+    p_subtitle->psz_text = psz_text;
+    return VLC_SUCCESS;
+}
+