X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fsubtitle.c;h=5b273c5f02961b678102b144f21f8018c66aba80;hb=23edeb6131b5996dd6df6405349239f4204baae7;hp=16ca09c1f0e3ba3ecbc7f2bad658b28dea823a24;hpb=253e921f97b03d3cf7f7fbd4154505c7b6071946;p=vlc diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c index 16ca09c1f0..5b273c5f02 100644 --- a/modules/demux/subtitle.c +++ b/modules/demux/subtitle.c @@ -1,26 +1,26 @@ /***************************************************************************** * subtitle.c: Demux for subtitle text files. ***************************************************************************** - * Copyright (C) 1999-2007 the VideoLAN team + * Copyright (C) 1999-2007 VLC authors and VideoLAN * $Id$ * * Authors: Laurent Aimar * Derk-Jan Hartman * Jean-Baptiste Kempf * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -34,11 +34,8 @@ #include #include #include +#include -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif #include #include @@ -56,11 +53,9 @@ static void Close( vlc_object_t *p_this ); N_("Override the normal frames per second settings. " \ "This will only work with MicroDVD and SubRIP (SRT) subtitles.") #define SUB_TYPE_LONGTEXT \ - N_("Force the subtiles format. Valid values are : \"microdvd\", " \ - "\"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).") + N_("Force the subtiles format. Selecting \"auto\" means autodetection and should always work.") +#define SUB_DESCRIPTION_LONGTEXT \ + N_("Override the default track description.") static const char *const ppsz_sub_type[] = { @@ -70,25 +65,27 @@ static const char *const ppsz_sub_type[] = "subviewer1" }; -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 ); - add_integer( "sub-delay", 0, NULL, - N_("Subtitles delay"), - 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 ); - - add_shortcut( "subtitle" ); -vlc_module_end(); +vlc_module_begin () + set_shortname( N_("Subtitles")) + set_description( N_("Text subtitle parser") ) + set_capability( "demux", 0 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + add_float( "sub-fps", 0.0, + N_("Frames per Second"), + SUB_FPS_LONGTEXT, true ) + add_integer( "sub-delay", 0, + N_("Subtitle delay"), + SUB_DELAY_LONGTEXT, true ) + add_string( "sub-type", "auto", N_("Subtitle format"), + SUB_TYPE_LONGTEXT, true ) + change_string_list( ppsz_sub_type, ppsz_sub_type ) + add_string( "sub-description", NULL, N_("Subtitle description"), + SUB_DESCRIPTION_LONGTEXT, true ) + set_callbacks( Open, Close ) + + add_shortcut( "subtitle" ) +vlc_module_end () /***************************************************************************** * Prototypes: @@ -98,6 +95,7 @@ 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, @@ -172,6 +170,7 @@ struct demux_sys_t 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 ); @@ -197,6 +196,7 @@ static const 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 }, @@ -222,7 +222,7 @@ static const struct 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 @@ -295,6 +295,17 @@ static int Open ( vlc_object_t *p_this ) } free( psz_type ); + /* Detect Unicode while skipping the UTF-8 Byte Order Mark */ + bool unicode = false; + const uint8_t *p_data; + if( stream_Peek( p_demux->s, &p_data, 3 ) >= 3 + && !memcmp( p_data, "\xEF\xBB\xBF", 3 ) ) + { + unicode = true; + stream_Seek( p_demux->s, 3 ); /* skip BOM */ + msg_Dbg( p_demux, "detected Unicode Byte Order Mark" ); + } + /* Probe if unknown type */ if( p_sys->i_type == SUB_TYPE_UNKNOWN ) { @@ -329,6 +340,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; @@ -433,16 +453,15 @@ static int Open ( vlc_object_t *p_this ) /* It will nearly always work even for non seekable stream thanks the * caching system, and if it fails we lose just a few sub */ - if( stream_Seek( p_demux->s, 0 ) ) - { + if( stream_Seek( p_demux->s, unicode ? 3 : 0 ) ) msg_Warn( p_demux, "failed to rewind" ); - } } /* Quit on unknown subtitles */ if( p_sys->i_type == SUB_TYPE_UNKNOWN ) { - msg_Err( p_demux, "failed to recognize subtitle type" ); + stream_Seek( p_demux->s, 0 ); + msg_Warn( p_demux, "failed to recognize subtitle type" ); free( p_sys ); return VLC_EGENERIC; } @@ -469,10 +488,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 ) ) ) { - free( p_sys->subtitle ); TextUnload( &p_sys->txt ); free( p_sys ); return VLC_ENOMEM; @@ -506,18 +524,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 ); + if( unicode ) + fmt.subs.psz_encoding = strdup( "UTF-8" ); + 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; } @@ -617,6 +642,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) p_sys->i_next_demux_date = (int64_t)va_arg( args, int64_t ); return VLC_SUCCESS; + case DEMUX_GET_PTS_DELAY: case DEMUX_GET_FPS: case DEMUX_GET_META: case DEMUX_GET_ATTACHMENTS: @@ -663,15 +689,15 @@ static int Demux( demux_t *p_demux ) continue; } - if( ( p_block = block_New( p_demux, i_len ) ) == NULL ) + if( ( p_block = block_Alloc( i_len ) ) == NULL ) { p_sys->i_subtitle++; continue; } p_block->i_dts = - p_block->i_pts = 1 + p_subtitle->i_start; - if( p_subtitle->i_stop > 0 && p_subtitle->i_stop >= p_subtitle->i_start ) + 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; memcpy( p_block->p_buffer, p_subtitle->psz_text, i_len ); @@ -690,24 +716,22 @@ 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 - * wont take too much time + * would not take too much time */ 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, @@ -724,7 +748,6 @@ static void Fix( demux_t *p_demux ) } } while( !b_done ); } -#endif static int TextLoad( text_t *txt, stream_t *s ) { @@ -735,6 +758,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( ;; ) @@ -748,7 +773,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; } } @@ -816,7 +843,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) { @@ -842,7 +869,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; } @@ -892,7 +919,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; } } @@ -915,7 +943,7 @@ 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; @@ -946,6 +974,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, @@ -970,7 +1009,7 @@ static int ParseSSA( demux_t *p_demux, subtitle_t *p_subtitle, { const char *s = TextGetLine( txt ); int h1, m1, s1, c1, h2, m2, s2, c2; - char *psz_text; + char *psz_text, *psz_temp; char temp[16]; if( !s ) @@ -1013,9 +1052,14 @@ static int ParseSSA( demux_t *p_demux, subtitle_t *p_subtitle, int i_layer = ( p_sys->i_type == SUB_TYPE_ASS ) ? atoi( temp ) : 0; /* ReadOrder, Layer, %s(rest of fields) */ - snprintf( temp, sizeof(temp), "%d,%d,", i_idx, i_layer ); - memmove( psz_text + strlen(temp), psz_text, strlen(psz_text)+1 ); - memcpy( psz_text, temp, strlen(temp) ); + if( asprintf( &psz_temp, "%d,%d,%s", i_idx, i_layer, psz_text ) == -1 ) + { + free( psz_text ); + return VLC_ENOMEM; + } + + free( psz_text ); + psz_text = psz_temp; } p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 + @@ -1032,16 +1076,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; } } @@ -1079,7 +1118,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 ); @@ -1194,7 +1233,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; @@ -1242,7 +1281,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; } } @@ -1271,7 +1310,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 ); @@ -1307,12 +1346,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 ); @@ -1351,13 +1390,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 ) @@ -1375,7 +1417,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 ); @@ -1459,7 +1501,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; + } if( strstr( s, "FORMAT" ) ) { @@ -1471,7 +1516,10 @@ static int ParseMPSub( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) psz_temp = malloc( strlen(s) ); if( !psz_temp ) + { + free( psz_text ); return VLC_ENOMEM; + } if( sscanf( s, "FORMAT=%[^\r\n]", psz_temp ) ) { @@ -1504,7 +1552,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 ) @@ -1512,7 +1563,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; @@ -1586,10 +1637,10 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) strcpy( psz_text, s ); - switch( toupper( psz_text[1] ) ) + switch( toupper( (unsigned char)psz_text[1] ) ) { case 'S': - shift = isalpha( psz_text[2] ) ? 6 : 2 ; + shift = isalpha( (unsigned char)psz_text[2] ) ? 6 : 2 ; if( sscanf( &psz_text[shift], "%d", &h ) ) { @@ -1626,7 +1677,7 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) break; case 'T': - shift = isalpha( psz_text[2] ) ? 8 : 2 ; + shift = isalpha( (unsigned char)psz_text[2] ) ? 8 : 2 ; sscanf( &psz_text[shift], "%d", &p_sys->jss.i_time_resolution ); break; @@ -1641,13 +1692,16 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) continue; } } - - 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 ) @@ -1655,19 +1709,19 @@ 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; + psz_orig = psz_text; strcat( psz_text, s2 ); - } + } /* Skip the blanks */ while( *psz_text == ' ' || *psz_text == '\t' ) psz_text++; /* Parse the directives */ - if( isalpha( *psz_text ) || *psz_text == '[' ) + if( isalpha( (unsigned char)*psz_text ) || *psz_text == '[' ) { while( *psz_text != ' ' ) { psz_text++ ;}; @@ -1724,8 +1778,8 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) psz_text2++; break; } - if( ( toupper(*(psz_text + 1 ) ) == 'C' ) || - ( toupper(*(psz_text + 1 ) ) == 'F' ) ) + if( ( toupper((unsigned char)*(psz_text + 1 ) ) == 'C' ) || + ( toupper((unsigned char)*(psz_text + 1 ) ) == 'F' ) ) { psz_text++; psz_text++; break; @@ -1744,7 +1798,7 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) else if( *(psz_text + 1 ) == '\r' || *(psz_text + 1 ) == '\n' || *(psz_text + 1 ) == '\0' ) { - psz_text++; + psz_text++; } break; default: @@ -1811,7 +1865,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 || @@ -1829,14 +1883,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; @@ -1850,37 +1904,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 */ @@ -1889,7 +1934,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; @@ -1903,7 +1951,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; @@ -1949,12 +1997,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 ); @@ -2005,12 +2058,18 @@ static int ParseSubViewer1( 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; } }