Changeset 6ba2378ea683a7cbab6739cb18b64324ba56a377

Timestamp:

13/05/08 08:10:36 (7 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

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

git-parent:

[2828d7d1b3f14983d09f5cfb12b4ce13c8b827ed]

git-author:

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

Message:

Cosmetic, malloc checks and options completion.

Files:

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

modules/demux/subtitle.c

@@ -7 +7 @@
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *          Derk-Jan Hartman <hartman at videolan dot org>
+ *          Jean-Baptiste Kempf <jb@videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -58 +59 @@
-    N_("Force the subtiles format. Valid values are : \"microdvd\", " \
-    "\"subrip\",  \"ssa1\", \"ssa2-4\", \"ass\", \"vplayer\" " \
-
+
+
-    "should always work).")
-static const char *ppsz_sub_type[] =
@@ -64 +66 @@
-    "auto", "microdvd", "subrip", "subviewer", "ssa1",
-    "ssa2-4", "ass", "vplayer", "sami", "dvdsubtitle", "mpl2",
-
+, "mpsub", "jacosub"
-};
-
@@ -218 +220 @@
-    p_demux->pf_control = Control;
-    p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+    if( p_sys == NULL )
+        return VLC_ENOMEM;
+
-    p_sys->psz_header         = NULL;
-    p_sys->i_subtitle         = 0;
@@ -741 +746 @@
-                          int i_idx )
-{
+    VLC_UNUSED( i_idx );
-    demux_sys_t *p_sys = p_demux->p_sys;
-    text_t      *txt = &p_sys->txt;
@@ -887 +893 @@
-                         int i_idx )
-{
+    VLC_UNUSED( i_idx );
-    return ParseSubRipSubViewer( p_demux, p_subtitle,
-                                 "%d:%d:%d,%d --> %d:%d:%d,%d",
@@ -896 +903 @@
-                            int i_idx )
-{
+    VLC_UNUSED( i_idx );
+
-    return ParseSubRipSubViewer( p_demux, p_subtitle,
-                                 "%d:%d:%d.%d,%d:%d:%d.%d",
@@ -997 +1006 @@
-                          int i_idx )
-{
+    VLC_UNUSED( i_idx );
+
-    demux_sys_t *p_sys = p_demux->p_sys;
-    text_t      *txt = &p_sys->txt;
@@ -1062 +1073 @@
-static int  ParseSami( 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;
@@ -1160 +1172 @@
-                             int i_idx )
-{
+    VLC_UNUSED( i_idx );
+
-    demux_sys_t *p_sys = p_demux->p_sys;
-    text_t      *txt = &p_sys->txt;
@@ -1224 +1238 @@
-static int ParseMPL2( 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;
@@ -1272 +1288 @@
-static int ParseAQT( 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;
@@ -1324 +1342 @@
-static int ParsePJS( 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;
@@ -1337 +1357 @@
-
-        psz_text = malloc( strlen(s) + 1 );
+        if( !psz_text )
+            return VLC_ENOMEM;
-
-        /* Data Lines */
@@ -1361 +1383 @@
-static int ParseMPSub( 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;
@@ -1367 +1391 @@
-    for( ;; )
-    {
-        const char *s = TextGetLine( txt );
-        float f1, f2;
-        char p_dummy;
-        char *psz_temp;
-
+        const char *s = TextGetLine( txt );
-        if( !s )
-            return VLC_EGENERIC;
+
-        if( strstr( s, "FORMAT" ) )
-        {
@@ -1383 +1408 @@
-
-            psz_temp = malloc( strlen(s) );
+            if( !psz_temp )
+                return VLC_ENOMEM;
+
-            if( sscanf( s, "FORMAT=%[^\r\n]", psz_temp ) )
-            {
@@ -1434 +1462 @@
-static int ParseJSS( 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;
@@ -1452 +1482 @@
-
-        psz_text = malloc( strlen( s ) + 1 );
+        if( !psz_text )
+            return VLC_ENOMEM;
-        psz_orig = psz_text;
-
+        /* Complete time lines */
-        if( sscanf( s, "%d:%d:%d.%d %d:%d:%d.%d %[^\n\r]",
-                    &h1, &m1, &s1, &f1, &h2, &m2, &s2, &f2, psz_text ) == 9 )
@@ -1464 +1497 @@
-                * 1000000;
-        }
+        /* Short time lines */
-        else if( sscanf( s, "@%d @%d %[^\n\r]", &f1, &f2, psz_text ) == 3 )
-        {
@@ -1471 +1505 @@
-                    ( f2 + jss_time_shift ) / jss_time_resolution * 1000000.0 );
-        }
+        /* General Directive lines */
+        /* Only TIME and SHIFT are supported so far */
-        else if( s[0] == '#' )
-        {
@@ -1481 +1517 @@
-            switch( toupper( psz_text[1] ) )
-            {
-
-
-
-
+
+
+
+
+
+
+
-                     {
-
-
+
+
+
+
+
+
+
-                         {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                         }
-                         else
-                         {
-
-
-
+
+
+
+
-                         }
-                         jss_time_shift = ( ( h * 3600 + m * 60 + sec )
-                             * jss_time_resolution + f ) * inv;
-                     }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            free( psz_text );
@@ -1527 +1564 @@
-        }
-        else
-line
+type line, probably a comment
-        {
-            free( psz_text );
@@ -1543 +1580 @@
-
-            /* Directives are NOT parsed yet */
+            /* This has probably a better place in a decoder ? */
-            /* directive = malloc( strlen( psz_text ) + 1 );
-            if( sscanf( psz_text, "%s %[^\n\r]", directive, psz_text2 ) == 2 )*/
@@ -1550 +1588 @@
-        while( *psz_text == ' ' || *psz_text == '\t' ) psz_text++;
-
+
+        /* Clean all the lines from inline comments and other stuffs */
-        psz_text2 = calloc( strlen( psz_text) + 1, 1 );
-        psz_orig2 = psz_text2;
@@ -1638 +1678 @@
-    }
-}
+