X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fsubtitle.c;h=b8021d883d0477e6b2d039bb6f651be16a32e606;hb=HEAD;hp=21ea8fa0144253cfa75369ab1f05d698bfd677c9;hpb=3845f37d56912d6b82f6374a2d85fef06bb8e5c9;p=vlc diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c index 21ea8fa014..b8021d883d 100644 --- a/modules/demux/subtitle.c +++ b/modules/demux/subtitle.c @@ -31,14 +31,11 @@ # include "config.h" #endif -#include +#include #include #include +#include -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif #include #include @@ -57,36 +54,42 @@ static void Close( vlc_object_t *p_this ); "This will only work with MicroDVD and SubRIP (SRT) subtitles.") #define SUB_TYPE_LONGTEXT \ N_("Force the subtiles format. Valid values are : \"microdvd\", " \ - "\"subrip\", \"ssa1\", \"ssa2-4\", \"ass\", \"vplayer\" " \ - "\"sami\", \"dvdsubtitle\", \"mpl2\", \"aqt\", \"pjs\" "\ - "\"mpsub\" \"jacosub\" \"psb\" and \"auto\" (meaning autodetection, this " \ - "should always work).") -static const char *ppsz_sub_type[] = + "\"subrip\", \"subviewer\", \"ssa1\", \"ssa2-4\", \"ass\", \"vplayer\", " \ + "\"sami\", \"dvdsubtitle\", \"mpl2\", \"aqt\", \"pjs\", "\ + "\"mpsub\", \"jacosub\", \"psb\", \"realtext\", \"dks\", \"subviewer1\", " \ + " and \"auto\" (meaning autodetection, this should always work).") +#define SUB_DESCRIPTION_LONGTEXT \ + N_("Override the default track description.") + +static const char *const ppsz_sub_type[] = { "auto", "microdvd", "subrip", "subviewer", "ssa1", "ssa2-4", "ass", "vplayer", "sami", "dvdsubtitle", "mpl2", - "aqt", "pjs", "mpsub", "jacosub", "psb" + "aqt", "pjs", "mpsub", "jacosub", "psb", "realtext", "dks", + "subviewer1" }; -vlc_module_begin(); - set_shortname( _("Subtitles")); - set_description( _("Text subtitles parser") ); - set_capability( "demux", 0 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); +vlc_module_begin () + set_shortname( N_("Subtitles")) + set_description( N_("Text subtitles parser") ) + set_capability( "demux", 0 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) add_float( "sub-fps", 0.0, NULL, N_("Frames per second"), - SUB_FPS_LONGTEXT, true ); + SUB_FPS_LONGTEXT, true ) add_integer( "sub-delay", 0, NULL, N_("Subtitles delay"), - SUB_DELAY_LONGTEXT, true ); + SUB_DELAY_LONGTEXT, true ) add_string( "sub-type", "auto", NULL, N_("Subtitles format"), - SUB_TYPE_LONGTEXT, true ); - change_string_list( ppsz_sub_type, NULL, NULL ); - set_callbacks( Open, Close ); + SUB_TYPE_LONGTEXT, true ) + change_string_list( ppsz_sub_type, NULL, NULL ) + add_string( "sub-description", NULL, NULL, N_("Subtitles description"), + SUB_DESCRIPTION_LONGTEXT, true ) + set_callbacks( Open, Close ) - add_shortcut( "subtitle" ); -vlc_module_end(); + add_shortcut( "subtitle" ) +vlc_module_end () /***************************************************************************** * Prototypes: @@ -96,13 +99,14 @@ enum SUB_TYPE_UNKNOWN = -1, SUB_TYPE_MICRODVD, SUB_TYPE_SUBRIP, + SUB_TYPE_SUBRIP_DOT, /* Invalid SubRip file (dot instead of comma) */ SUB_TYPE_SSA1, SUB_TYPE_SSA2_4, SUB_TYPE_ASS, SUB_TYPE_VPLAYER, SUB_TYPE_SAMI, - SUB_TYPE_SUBVIEWER, //SUBVIEWER 2! - SUB_TYPE_DVDSUBTITLE, + SUB_TYPE_SUBVIEWER, /* SUBVIEWER 2 */ + SUB_TYPE_DVDSUBTITLE, /* Mplayer calls it subviewer2 */ SUB_TYPE_MPL2, SUB_TYPE_AQT, SUB_TYPE_PJS, @@ -110,8 +114,9 @@ enum SUB_TYPE_JACOSUB, SUB_TYPE_PSB, SUB_TYPE_RT, - SUB_TYPE_SUBVIEW1, - SUB_TYPE_DKS + SUB_TYPE_DKS, + SUB_TYPE_SUBVIEW1 /* SUBVIEWER 1 - mplayer calls it subrip09, + and Gnome subtitles SubViewer 1.0 */ }; typedef struct @@ -148,10 +153,28 @@ struct demux_sys_t subtitle_t *subtitle; int64_t i_length; + + /* */ + struct + { + bool b_inited; + + int i_comment; + int i_time_resolution; + int i_time_shift; + } jss; + struct + { + bool b_inited; + + float f_total; + float f_factor; + } mpsub; }; static int ParseMicroDvd ( demux_t *, subtitle_t *, int ); static int ParseSubRip ( demux_t *, subtitle_t *, int ); +static int ParseSubRipDot ( demux_t *, subtitle_t *, int ); static int ParseSubViewer ( demux_t *, subtitle_t *, int ); static int ParseSSA ( demux_t *, subtitle_t *, int ); static int ParseVplayer ( demux_t *, subtitle_t *, int ); @@ -165,9 +188,9 @@ static int ParseJSS ( demux_t *, subtitle_t *, int ); static int ParsePSB ( demux_t *, subtitle_t *, int ); static int ParseRealText ( demux_t *, subtitle_t *, int ); static int ParseDKS ( demux_t *, subtitle_t *, int ); -static int ParseSub1 ( demux_t *, subtitle_t *, int ); +static int ParseSubViewer1 ( demux_t *, subtitle_t *, int ); -static struct +static const struct { const char *psz_type_name; int i_type; @@ -177,6 +200,7 @@ static struct { { "microdvd", SUB_TYPE_MICRODVD, "MicroDVD", ParseMicroDvd }, { "subrip", SUB_TYPE_SUBRIP, "SubRIP", ParseSubRip }, + { "subrip-dot", SUB_TYPE_SUBRIP_DOT, "SubRIP(Dot)", ParseSubRipDot }, { "subviewer", SUB_TYPE_SUBVIEWER, "SubViewer", ParseSubViewer }, { "ssa1", SUB_TYPE_SSA1, "SSA-1", ParseSSA }, { "ssa2-4", SUB_TYPE_SSA2_4, "SSA-2/3/4", ParseSSA }, @@ -192,14 +216,17 @@ static struct { "psb", SUB_TYPE_PSB, "PowerDivx", ParsePSB }, { "realtext", SUB_TYPE_RT, "RealText", ParseRealText }, { "dks", SUB_TYPE_DKS, "DKS", ParseDKS }, - { "subviewer1", SUB_TYPE_SUBVIEW1, "Subviewer 1", ParseSub1 }, + { "subviewer1", SUB_TYPE_SUBVIEW1, "Subviewer 1", ParseSubViewer1 }, { NULL, SUB_TYPE_UNKNOWN, "Unknown", NULL } }; +/* When adding support for more formats, be sure to add their file extension + * to src/input/subtitles.c to enable auto-detection. + */ static int Demux( demux_t * ); static int Control( demux_t *, int, va_list ); -/*static void Fix( demux_t * );*/ +static void Fix( demux_t * ); /***************************************************************************** * Module initializer @@ -232,6 +259,9 @@ static int Open ( vlc_object_t *p_this ) p_sys->subtitle = NULL; p_sys->i_microsecperframe = 40000; + p_sys->jss.b_inited = false; + p_sys->mpsub.b_inited = false; + /* Get the FPS */ f_fps = var_CreateGetFloat( p_demux, "sub-original-fps" ); /* FIXME */ if( f_fps >= 1.0 ) @@ -250,7 +280,7 @@ static int Open ( vlc_object_t *p_this ) /* Get or probe the type */ p_sys->i_type = SUB_TYPE_UNKNOWN; psz_type = var_CreateGetString( p_demux, "sub-type" ); - if( *psz_type ) + if( psz_type && *psz_type ) { int i; @@ -303,6 +333,15 @@ static int Open ( vlc_object_t *p_this ) p_sys->i_type = SUB_TYPE_SUBRIP; break; } + else if( sscanf( s, + "%d:%d:%d.%d --> %d:%d:%d.%d", + &i_dummy,&i_dummy,&i_dummy,&i_dummy, + &i_dummy,&i_dummy,&i_dummy,&i_dummy ) == 8 ) + { + msg_Err( p_demux, "Detected invalid SubRip file, playing anyway" ); + p_sys->i_type = SUB_TYPE_SUBRIP_DOT; + break; + } else if( !strncasecmp( s, "!: This is a Sub Station Alpha v1", 33 ) ) { p_sys->i_type = SUB_TYPE_SSA1; @@ -416,7 +455,7 @@ static int Open ( vlc_object_t *p_this ) /* Quit on unknown subtitles */ if( p_sys->i_type == SUB_TYPE_UNKNOWN ) { - msg_Err( p_demux, "failed to recognize subtitle type" ); + msg_Warn( p_demux, "failed to recognize subtitle type" ); free( p_sys ); return VLC_EGENERIC; } @@ -443,11 +482,9 @@ static int Open ( vlc_object_t *p_this ) if( p_sys->i_subtitles >= i_max ) { i_max += 500; - if( !( p_sys->subtitle = realloc( p_sys->subtitle, + if( !( p_sys->subtitle = realloc_or_free( p_sys->subtitle, sizeof(subtitle_t) * i_max ) ) ) { - msg_Err( p_demux, "out of memory"); - free( p_sys->subtitle ); TextUnload( &p_sys->txt ); free( p_sys ); return VLC_ENOMEM; @@ -481,18 +518,25 @@ static int Open ( vlc_object_t *p_this ) p_sys->i_type == SUB_TYPE_SSA2_4 || p_sys->i_type == SUB_TYPE_ASS ) { - es_format_Init( &fmt, SPU_ES, VLC_FOURCC( 's','s','a',' ' ) ); + Fix( p_demux ); + es_format_Init( &fmt, SPU_ES, VLC_CODEC_SSA ); } else { - es_format_Init( &fmt, SPU_ES, VLC_FOURCC( 's','u','b','t' ) ); + es_format_Init( &fmt, SPU_ES, VLC_CODEC_SUBT ); } + char *psz_description = var_InheritString( p_demux, "sub-description" ); + if( psz_description && *psz_description ) + fmt.psz_description = psz_description; + else + free( psz_description ); if( p_sys->psz_header != NULL ) { fmt.i_extra = strlen( p_sys->psz_header ) + 1; fmt.p_extra = strdup( p_sys->psz_header ); } p_sys->es = es_out_Add( p_demux->out, &fmt ); + es_format_Clean( &fmt ); return VLC_SUCCESS; } @@ -541,9 +585,15 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case DEMUX_SET_TIME: i64 = (int64_t)va_arg( args, int64_t ); p_sys->i_subtitle = 0; - while( p_sys->i_subtitle < p_sys->i_subtitles && - p_sys->subtitle[p_sys->i_subtitle].i_start < i64 ) + while( p_sys->i_subtitle < p_sys->i_subtitles ) { + const subtitle_t *p_subtitle = &p_sys->subtitle[p_sys->i_subtitle]; + + if( p_subtitle->i_start > i64 ) + break; + if( p_subtitle->i_stop > p_subtitle->i_start && p_subtitle->i_stop > i64 ) + break; + p_sys->i_subtitle++; } @@ -591,6 +641,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case DEMUX_GET_ATTACHMENTS: case DEMUX_GET_TITLE_INFO: case DEMUX_HAS_UNSUPPORTED_META: + case DEMUX_CAN_RECORD: return VLC_EGENERIC; default: @@ -620,12 +671,13 @@ static int Demux( demux_t *p_demux ) while( p_sys->i_subtitle < p_sys->i_subtitles && p_sys->subtitle[p_sys->i_subtitle].i_start < i_maxdate ) { + const subtitle_t *p_subtitle = &p_sys->subtitle[p_sys->i_subtitle]; + block_t *p_block; - int i_len = strlen( p_sys->subtitle[p_sys->i_subtitle].psz_text ) + 1; + int i_len = strlen( p_subtitle->psz_text ) + 1; - if( i_len <= 1 ) + if( i_len <= 1 || p_subtitle->i_start < 0 ) { - /* empty subtitle */ p_sys->i_subtitle++; continue; } @@ -636,30 +688,15 @@ static int Demux( demux_t *p_demux ) continue; } - if( p_sys->subtitle[p_sys->i_subtitle].i_start < 0 ) - { - p_sys->i_subtitle++; - continue; - } + p_block->i_dts = + p_block->i_pts = VLC_TS_0 + p_subtitle->i_start; + if( p_subtitle->i_stop >= 0 && p_subtitle->i_stop >= p_subtitle->i_start ) + p_block->i_length = p_subtitle->i_stop - p_subtitle->i_start; - p_block->i_pts = p_sys->subtitle[p_sys->i_subtitle].i_start; - p_block->i_dts = p_block->i_pts; - if( p_sys->subtitle[p_sys->i_subtitle].i_stop > 0 ) - { - p_block->i_length = - p_sys->subtitle[p_sys->i_subtitle].i_stop - p_block->i_pts; - } + memcpy( p_block->p_buffer, p_subtitle->psz_text, i_len ); + + es_out_Send( p_demux->out, p_sys->es, p_block ); - memcpy( p_block->p_buffer, - p_sys->subtitle[p_sys->i_subtitle].psz_text, i_len ); - if( p_block->i_pts > 0 ) - { - es_out_Send( p_demux->out, p_sys->es, p_block ); - } - else - { - block_Release( p_block ); - } p_sys->i_subtitle++; } @@ -672,12 +709,10 @@ static int Demux( demux_t *p_demux ) /***************************************************************************** * Fix: fix time stamp and order of subtitle *****************************************************************************/ -#ifdef USE_THIS_UNUSED_PIECE_OF_CODE static void Fix( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; bool b_done; - int i_index; /* *** fix order (to be sure...) *** */ /* We suppose that there are near in order and this durty bubble sort @@ -686,10 +721,10 @@ static void Fix( demux_t *p_demux ) do { b_done = true; - for( i_index = 1; i_index < p_sys->i_subtitles; i_index++ ) + for( int i_index = 1; i_index < p_sys->i_subtitles; i_index++ ) { if( p_sys->subtitle[i_index].i_start < - p_sys->subtitle[i_index - 1].i_start ) + p_sys->subtitle[i_index - 1].i_start ) { subtitle_t sub_xch; memcpy( &sub_xch, @@ -706,7 +741,6 @@ static void Fix( demux_t *p_demux ) } } while( !b_done ); } -#endif static int TextLoad( text_t *txt, stream_t *s ) { @@ -717,6 +751,8 @@ static int TextLoad( text_t *txt, stream_t *s ) txt->i_line_count = 0; txt->i_line = 0; txt->line = calloc( i_line_max, sizeof( char * ) ); + if( !txt->line ) + return VLC_ENOMEM; /* load the complete file */ for( ;; ) @@ -730,7 +766,9 @@ static int TextLoad( text_t *txt, stream_t *s ) if( txt->i_line_count >= i_line_max ) { i_line_max += 100; - txt->line = realloc( txt->line, i_line_max * sizeof( char * ) ); + txt->line = realloc_or_free( txt->line, i_line_max * sizeof( char * ) ); + if( !txt->line ) + return VLC_ENOMEM; } } @@ -798,7 +836,7 @@ static int ParseMicroDvd( demux_t *p_demux, subtitle_t *p_subtitle, return VLC_ENOMEM; i_start = 0; - i_stop = 0; + i_stop = -1; if( sscanf( s, "{%d}{}%[^\r\n]", &i_start, psz_text ) == 2 || sscanf( s, "{%d}{%d}%[^\r\n]", &i_start, &i_stop, psz_text ) == 3) { @@ -824,7 +862,7 @@ static int ParseMicroDvd( demux_t *p_demux, subtitle_t *p_subtitle, /* */ p_subtitle->i_start = i_start * p_sys->i_microsecperframe; - p_subtitle->i_stop = i_stop * p_sys->i_microsecperframe; + p_subtitle->i_stop = i_stop >= 0 ? (i_stop * p_sys->i_microsecperframe) : -1; p_subtitle->psz_text = psz_text; return VLC_SUCCESS; } @@ -874,7 +912,8 @@ static int ParseSubRipSubViewer( demux_t *p_demux, subtitle_t *p_subtitle, (int64_t)m2 * 60*1000 + (int64_t)s2 * 1000 + (int64_t)d2 ) * 1000; - break; + if( p_subtitle->i_start < p_subtitle->i_stop ) + break; } } @@ -882,19 +921,14 @@ static int ParseSubRipSubViewer( demux_t *p_demux, subtitle_t *p_subtitle, psz_text = strdup(""); if( !psz_text ) return VLC_ENOMEM; + for( ;; ) { const char *s = TextGetLine( txt ); int i_len; int i_old; - if( !s ) - { - free( psz_text ); - return VLC_EGENERIC; - } - - i_len = strlen( s ); + i_len = s ? strlen( s ) : 0; if( i_len <= 0 ) { p_subtitle->psz_text = psz_text; @@ -902,9 +936,11 @@ static int ParseSubRipSubViewer( demux_t *p_demux, subtitle_t *p_subtitle, } i_old = strlen( psz_text ); - psz_text = realloc( psz_text, i_old + i_len + 1 + 1 ); + psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 ); if( !psz_text ) + { return VLC_ENOMEM; + } strcat( psz_text, s ); strcat( psz_text, "\n" ); @@ -912,7 +948,7 @@ static int ParseSubRipSubViewer( demux_t *p_demux, subtitle_t *p_subtitle, if( b_replace_br ) { char *p; - + while( ( p = strstr( psz_text, "[br]" ) ) ) { *p++ = '\n'; @@ -931,6 +967,17 @@ static int ParseSubRip( demux_t *p_demux, subtitle_t *p_subtitle, "%d:%d:%d,%d --> %d:%d:%d,%d", false ); } +/* ParseSubRipDot + * Special version for buggy file using '.' instead of ',' + */ +static int ParseSubRipDot( demux_t *p_demux, subtitle_t *p_subtitle, + int i_idx ) +{ + VLC_UNUSED( i_idx ); + return ParseSubRipSubViewer( p_demux, p_subtitle, + "%d:%d:%d.%d --> %d:%d:%d.%d", + false ); +} /* ParseSubViewer */ static int ParseSubViewer( demux_t *p_demux, subtitle_t *p_subtitle, @@ -1017,16 +1064,11 @@ static int ParseSSA( demux_t *p_demux, subtitle_t *p_subtitle, free( psz_text ); /* All the other stuff we add to the header field */ - if( !p_sys->psz_header ) - p_sys->psz_header = strdup( "" ); - if( !p_sys->psz_header ) + char *psz_header; + if( asprintf( &psz_header, "%s%s\n", + p_sys->psz_header ? p_sys->psz_header : "", s ) == -1 ) return VLC_ENOMEM; - - p_sys->psz_header = - realloc( p_sys->psz_header, - strlen( p_sys->psz_header ) + strlen( s ) + 2 ); - strcat( p_sys->psz_header, s ); - strcat( p_sys->psz_header, "\n" ); + p_sys->psz_header = psz_header; } } @@ -1064,7 +1106,7 @@ static int ParseVplayer( demux_t *p_demux, subtitle_t *p_subtitle, p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 + (int64_t)m1 * 60*1000 + (int64_t)s1 * 1000 ) * 1000; - p_subtitle->i_stop = 0; + p_subtitle->i_stop = -1; break; } free( psz_text ); @@ -1179,7 +1221,7 @@ static int ParseSami( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) } p_subtitle->i_start = i_start * 1000; - p_subtitle->i_stop = 0; + p_subtitle->i_stop = -1; p_subtitle->psz_text = strdup( text ); return VLC_SUCCESS; @@ -1227,7 +1269,7 @@ static int ParseDVDSubtitle( demux_t *p_demux, subtitle_t *p_subtitle, (int64_t)m1 * 60*1000 + (int64_t)s1 * 1000 + (int64_t)c1 * 10) * 1000; - p_subtitle->i_stop = 0; + p_subtitle->i_stop = -1; break; } } @@ -1256,7 +1298,7 @@ static int ParseDVDSubtitle( demux_t *p_demux, subtitle_t *p_subtitle, } i_old = strlen( psz_text ); - psz_text = realloc( psz_text, i_old + i_len + 1 + 1 ); + psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 ); if( !psz_text ) return VLC_ENOMEM; strcat( psz_text, s ); @@ -1292,12 +1334,12 @@ static int ParseMPL2( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) return VLC_ENOMEM; i_start = 0; - i_stop = 0; + i_stop = -1; if( sscanf( s, "[%d][] %[^\r\n]", &i_start, psz_text ) == 2 || sscanf( s, "[%d][%d] %[^\r\n]", &i_start, &i_stop, psz_text ) == 3) { p_subtitle->i_start = (int64_t)i_start * 100000; - p_subtitle->i_stop = (int64_t)i_stop * 100000; + p_subtitle->i_stop = i_stop >= 0 ? ((int64_t)i_stop * 100000) : -1; break; } free( psz_text ); @@ -1336,13 +1378,16 @@ static int ParseAQT( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) const char *s = TextGetLine( txt ); if( !s ) + { + free( psz_text ); return VLC_EGENERIC; + } /* Data Lines */ if( sscanf (s, "-->> %d", &t) == 1) { p_subtitle->i_start = (int64_t)t; /* * FPS*/ - p_subtitle->i_stop = 0; + p_subtitle->i_stop = -1; /* Starting of a subtitle */ if( i_firstline ) @@ -1360,7 +1405,7 @@ static int ParseAQT( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) else { i_old = strlen( psz_text ) + 1; - psz_text = realloc( psz_text, i_old + strlen( s ) + 1 ); + psz_text = realloc_or_free( psz_text, i_old + strlen( s ) + 1 ); if( !psz_text ) return VLC_ENOMEM; strcat( psz_text, s ); @@ -1420,9 +1465,6 @@ static int ParsePJS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) return VLC_SUCCESS; } -static float mpsub_total = 0.0; -static float mpsub_factor = 0.0; - static int ParseMPSub( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) { VLC_UNUSED( i_idx ); @@ -1431,6 +1473,14 @@ static int ParseMPSub( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) text_t *txt = &p_sys->txt; char *psz_text = strdup( "" ); + if( !p_sys->mpsub.b_inited ) + { + p_sys->mpsub.f_total = 0.0; + p_sys->mpsub.f_factor = 0.0; + + p_sys->mpsub.b_inited = true; + } + for( ;; ) { float f1, f2; @@ -1439,19 +1489,25 @@ static int ParseMPSub( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) const char *s = TextGetLine( txt ); if( !s ) + { + free( psz_text ); return VLC_EGENERIC; + } if( strstr( s, "FORMAT" ) ) { if( sscanf (s, "FORMAT=TIM%c", &p_dummy ) == 1 && p_dummy == 'E') { - mpsub_factor = 100.0; + p_sys->mpsub.f_factor = 100.0; break; } psz_temp = malloc( strlen(s) ); if( !psz_temp ) + { + free( psz_text ); return VLC_ENOMEM; + } if( sscanf( s, "FORMAT=%[^\r\n]", psz_temp ) ) { @@ -1460,19 +1516,21 @@ static int ParseMPSub( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) if( f_fps > 0.0 && var_GetFloat( p_demux, "sub-fps" ) <= 0.0 ) var_SetFloat( p_demux, "sub-fps", f_fps ); - mpsub_factor = 1.0; + p_sys->mpsub.f_factor = 1.0; free( psz_temp ); break; } free( psz_temp ); } /* Data Lines */ - if( sscanf (s, "%f %f", &f1, &f2 ) == 2 ) + f1 = us_strtod( s, &psz_temp ); + if( *psz_temp ) { - mpsub_total += f1 * mpsub_factor; - p_subtitle->i_start = (int64_t)(10000.0 * mpsub_total); - mpsub_total += f2 * mpsub_factor; - p_subtitle->i_stop = (int64_t)(10000.0 * mpsub_total); + f2 = us_strtod( psz_temp, NULL ); + p_sys->mpsub.f_total += f1 * p_sys->mpsub.f_factor; + p_subtitle->i_start = (int64_t)(10000.0 * p_sys->mpsub.f_total); + p_sys->mpsub.f_total += f2 * p_sys->mpsub.f_factor; + p_subtitle->i_stop = (int64_t)(10000.0 * p_sys->mpsub.f_total); break; } } @@ -1482,7 +1540,10 @@ static int ParseMPSub( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) const char *s = TextGetLine( txt ); if( !s ) + { + free( psz_text ); return VLC_EGENERIC; + } int i_len = strlen( s ); if( i_len == 0 ) @@ -1490,7 +1551,7 @@ static int ParseMPSub( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) int i_old = strlen( psz_text ); - psz_text = realloc( psz_text, i_old + i_len + 1 + 1 ); + psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 ); if( !psz_text ) return VLC_ENOMEM; @@ -1512,10 +1573,14 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) char *psz_text2, *psz_orig2; int h1, h2, m1, m2, s1, s2, f1, f2; - static int i_comment = 0; + if( !p_sys->jss.b_inited ) + { + p_sys->jss.i_comment = 0; + p_sys->jss.i_time_resolution = 30; + p_sys->jss.i_time_shift = 0; - static int jss_time_resolution = 30; - static int jss_time_shift = 0; + p_sys->jss.b_inited = true; + } /* Parse the main lines */ for( ;; ) @@ -1534,10 +1599,10 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) &h1, &m1, &s1, &f1, &h2, &m2, &s2, &f2, psz_text ) == 9 ) { p_subtitle->i_start = ( (int64_t)( h1 *3600 + m1 * 60 + s1 ) + - (int64_t)( ( f1 + jss_time_shift ) / jss_time_resolution ) ) + (int64_t)( ( f1 + p_sys->jss.i_time_shift ) / p_sys->jss.i_time_resolution ) ) * 1000000; p_subtitle->i_stop = ( (int64_t)( h2 *3600 + m2 * 60 + s2 ) + - (int64_t)( ( f2 + jss_time_shift ) / jss_time_resolution ) ) + (int64_t)( ( f2 + p_sys->jss.i_time_shift ) / p_sys->jss.i_time_resolution ) ) * 1000000; break; } @@ -1545,9 +1610,9 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) else if( sscanf( s, "@%d @%d %[^\n\r]", &f1, &f2, psz_text ) == 3 ) { p_subtitle->i_start = (int64_t)( - ( f1 + jss_time_shift ) / jss_time_resolution * 1000000.0 ); + ( f1 + p_sys->jss.i_time_shift ) / p_sys->jss.i_time_resolution * 1000000.0 ); p_subtitle->i_stop = (int64_t)( - ( f2 + jss_time_shift ) / jss_time_resolution * 1000000.0 ); + ( f2 + p_sys->jss.i_time_shift ) / p_sys->jss.i_time_resolution * 1000000.0 ); break; } /* General Directive lines */ @@ -1594,15 +1659,15 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) sscanf( &psz_text[shift], "%d.%d", &sec, &f); sec *= inv; } - jss_time_shift = ( ( h * 3600 + m * 60 + sec ) - * jss_time_resolution + f ) * inv; + p_sys->jss.i_time_shift = ( ( h * 3600 + m * 60 + sec ) + * p_sys->jss.i_time_resolution + f ) * inv; } break; case 'T': shift = isalpha( psz_text[2] ) ? 8 : 2 ; - sscanf( &psz_text[shift], "%d", &jss_time_resolution ); + sscanf( &psz_text[shift], "%d", &p_sys->jss.i_time_resolution ); break; } free( psz_orig ); @@ -1616,12 +1681,15 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) } } - while( psz_text[ strlen( psz_text ) - 1 ] == '\\' ) - { + while( psz_text[ strlen( psz_text ) - 1 ] == '\\' ) + { const char *s2 = TextGetLine( txt ); if( !s2 ) + { + free( psz_orig ); return VLC_EGENERIC; + } int i_len = strlen( s2 ); if( i_len == 0 ) @@ -1629,13 +1697,13 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) int i_old = strlen( psz_text ); - psz_text = realloc( psz_text, i_old + i_len + 1 ); + psz_text = realloc_or_free( psz_text, i_old + i_len + 1 ); if( !psz_text ) return VLC_ENOMEM; psz_orig = psz_text; strcat( psz_text, s2 ); - } + } /* Skip the blanks */ while( *psz_text == ' ' || *psz_text == '\t' ) psz_text++; @@ -1664,17 +1732,17 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) switch( *psz_text ) { case '{': - i_comment++; + p_sys->jss.i_comment++; break; case '}': - if( i_comment ) + if( p_sys->jss.i_comment ) { - i_comment = 0; + p_sys->jss.i_comment = 0; if( (*(psz_text + 1 ) ) == ' ' ) psz_text++; } break; case '~': - if( !i_comment ) + if( !p_sys->jss.i_comment ) { *psz_text2 = ' '; psz_text2++; @@ -1684,7 +1752,7 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) case '\t': if( (*(psz_text + 1 ) ) == ' ' || (*(psz_text + 1 ) ) == '\t' ) break; - if( !i_comment ) + if( !p_sys->jss.i_comment ) { *psz_text2 = ' '; psz_text2++; @@ -1722,7 +1790,7 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) } break; default: - if( !i_comment ) + if( !p_sys->jss.i_comment ) { *psz_text2 = *psz_text; psz_text2++; @@ -1785,7 +1853,7 @@ static int ParsePSB( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) static int64_t ParseRealTime( char *psz, int *h, int *m, int *s, int *f ) { - if( strlen( psz ) == 0 ) return 0; + if( *psz == '\0' ) return 0; if( sscanf( psz, "%d:%d:%d.%d", h, m, s, f ) == 4 || sscanf( psz, "%d:%d.%d", m, s, f ) == 3 || sscanf( psz, "%d.%d", s, f ) == 2 || @@ -1803,14 +1871,14 @@ static int ParseRealText( 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; - char psz_end[12]= "", psz_begin[12] = ""; + char *psz_text = NULL; for( ;; ) { int h1 = 0, m1 = 0, s1 = 0, f1 = 0; int h2 = 0, m2 = 0, s2 = 0, f2 = 0; const char *s = TextGetLine( txt ); + free( psz_text ); if( !s ) return VLC_EGENERIC; @@ -1824,37 +1892,28 @@ static int ParseRealText( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) char *psz_temp = strcasestr( s, "]%[^\n\r]", + "<%*[t|T]ime %*[b|B]egin=\"%11[^\"]\" %*[e|E]nd=\"%11[^\"]%*[^>]%[^\n\r]", psz_begin, psz_end, psz_text) != 3 ) && /* Line has begin and no end */ ( sscanf( psz_temp, - "<%*[t|T]ime %*[b|B]egin=\"%[^\"]\"%*[^>]%[^\n\r]", + "<%*[t|T]ime %*[b|B]egin=\"%11[^\"]\"%*[^>]%[^\n\r]", psz_begin, psz_text ) != 2) ) /* Line is not recognized */ { - free( psz_text ); continue; } /* Get the times */ int64_t i_time = ParseRealTime( psz_begin, &h1, &m1, &s1, &f1 ); - if( i_time >= 0) - { - p_subtitle->i_start = i_time; - } + p_subtitle->i_start = i_time >= 0 ? i_time : 0; i_time = ParseRealTime( psz_end, &h2, &m2, &s2, &f2 ); - if( i_time >= 0 ) - { - p_subtitle->i_stop = i_time; - } + p_subtitle->i_stop = i_time >= 0 ? i_time : -1; break; } - /* Line is not recognized */ - else continue; - free( psz_text ); } /* Get the following Lines */ @@ -1863,7 +1922,10 @@ static int ParseRealText( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) const char *s = TextGetLine( txt ); if( !s ) + { + free( psz_text ); return VLC_EGENERIC; + } int i_len = strlen( s ); if( i_len == 0 ) break; @@ -1877,7 +1939,7 @@ static int ParseRealText( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) int i_old = strlen( psz_text ); - psz_text = realloc( psz_text, i_old + i_len + 1 + 1 ); + psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 ); if( !psz_text ) return VLC_ENOMEM; @@ -1923,12 +1985,17 @@ static int ParseDKS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) char *s = TextGetLine( txt ); if( !s ) + { + free( psz_text ); return VLC_EGENERIC; + } if( sscanf( s, "[%d:%d:%d]", &h2, &m2, &s2 ) == 3 ) p_subtitle->i_stop = ( (int64_t)h2 * 3600*1000 + (int64_t)m2 * 60*1000 + (int64_t)s2 * 1000 ) * 1000; + else + p_subtitle->i_stop = -1; break; } free( psz_text ); @@ -1946,7 +2013,7 @@ static int ParseDKS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) return VLC_SUCCESS; } -static int ParseSub1( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) +static int ParseSubViewer1( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) { VLC_UNUSED( i_idx ); @@ -1979,12 +2046,18 @@ static int ParseSub1( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) s = TextGetLine( txt ); if( !s ) + { + free( psz_text ); return VLC_EGENERIC; + } if( sscanf( s, "[%d:%d:%d]", &h2, &m2, &s2 ) == 3 ) p_subtitle->i_stop = ( (int64_t)h2 * 3600*1000 + (int64_t)m2 * 60*1000 + (int64_t)s2 * 1000 ) * 1000; + else + p_subtitle->i_stop = -1; + break; } }