Changeset b3524a50ba5a2a49ae4dca4faccd24d2266c34e3

Timestamp:

05/13/08 21:42:51 (2 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

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

git-parent:

[7b12ac8c3cfbb95f2091775a414c5898edad335f]

git-author:

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

Message:

Support for parsing PowerDivx? (.psb) subtitles

Files:

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

modules/demux/subtitle.c

@@ -108 +108 @@
-    SUB_TYPE_PJS,
-    SUB_TYPE_MPSUB,
-
+
+
-};
-
@@ -159 +160 @@
-static int  ParseMPSub      ( demux_t *, subtitle_t *, int );
-static int  ParseJSS        ( demux_t *, subtitle_t *, int );
+static int  ParsePSB        ( demux_t *, subtitle_t *, int );
-
-static struct
@@ -182 +184 @@
-    { "mpsub",      SUB_TYPE_MPSUB,       "MPSub",       ParseMPSub },
-    { "jacosub",    SUB_TYPE_JACOSUB,     "JacoSub",     ParseJSS },
+    { "psb",        SUB_TYPE_PSB,         "PowerDivx",   ParsePSB },
-    { NULL,         SUB_TYPE_UNKNOWN,     "Unknown",     NULL }
-};
@@ -366 +369 @@
-            {
-                p_sys->i_type = SUB_TYPE_PJS;
+            }
+            else if( sscanf( s, "{%d:%d:%d}", &i_dummy, &i_dummy, &i_dummy ) == 3 )
+            {
+                p_sys->i_type = SUB_TYPE_PSB;
-            }
-
@@ -1003 +1010 @@
- *      h:m:s Line1|Line2|Line3....
- */
- 
+
-                          int i_idx )
-{
@@ -1679 +1686 @@
-}
-
+static int ParsePSB( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx )
+{
+    VLC_UNUSED( i_idx );
+
+    demux_sys_t *p_sys = p_demux->p_sys;
+    text_t      *txt = &p_sys->txt;
+    char *psz_text;
+    int i;
+
+    for( ;; )
+    {
+        int h1, m1, s1;
+        int h2, m2, s2;
+        const char *s = TextGetLine( txt );
+
+        if( !s )
+            return VLC_EGENERIC;
+
+        psz_text = malloc( strlen( s ) + 1 );
+        if( !psz_text )
+            return VLC_ENOMEM;
+
+        if( sscanf( s, "{%d:%d:%d}{%d:%d:%d}%[^\r\n]",
+                    &h1, &m1, &s1, &h2, &m2, &s2, psz_text ) == 7 )
+        {
+            p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 +
+                                    (int64_t)m1 * 60*1000 +
+                                    (int64_t)s1 * 1000 ) * 1000;
+            p_subtitle->i_stop  = ( (int64_t)h2 * 3600*1000 +
+                                    (int64_t)m2 * 60*1000 +
+                                    (int64_t)s2 * 1000 ) * 1000;
+            break;
+        }
+        free( psz_text );
+    }
+
+    /* replace | by \n */
+    for( i = 0; psz_text[i] != '\0'; i++ )
+    {
+        if( psz_text[i] == '|' )
+            psz_text[i] = '\n';
+    }
+    p_subtitle->psz_text = psz_text;
+    return VLC_SUCCESS;
+}
+
+