X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fsubtitle.c;h=b8021d883d0477e6b2d039bb6f651be16a32e606;hb=d66255d540dfac647c8a7d8aded8522a02b3ca2d;hp=db8d8632fed0cbe428a1764c077385e6ba83cfe2;hpb=6ba2378ea683a7cbab6739cb18b64324ba56a377;p=vlc diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c index db8d8632fe..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\" 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" + "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,18 +99,24 @@ 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, SUB_TYPE_MPSUB, - SUB_TYPE_JACOSUB + SUB_TYPE_JACOSUB, + SUB_TYPE_PSB, + SUB_TYPE_RT, + SUB_TYPE_DKS, + SUB_TYPE_SUBVIEW1 /* SUBVIEWER 1 - mplayer calls it subrip09, + and Gnome subtitles SubViewer 1.0 */ }; typedef struct @@ -144,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 ); @@ -158,8 +185,12 @@ static int ParseAQT ( demux_t *, subtitle_t *, int ); static int ParsePJS ( demux_t *, subtitle_t *, int ); 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 int ParseRealText ( demux_t *, subtitle_t *, int ); +static int ParseDKS ( 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; @@ -169,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 }, @@ -181,21 +213,20 @@ static struct { "pjs", SUB_TYPE_PJS, "PhoenixSub", ParsePJS }, { "mpsub", SUB_TYPE_MPSUB, "MPSub", ParseMPSub }, { "jacosub", SUB_TYPE_JACOSUB, "JacoSub", ParseJSS }, + { "psb", SUB_TYPE_PSB, "PowerDivx", ParsePSB }, + { "realtext", SUB_TYPE_RT, "RealText", ParseRealText }, + { "dks", SUB_TYPE_DKS, "DKS", ParseDKS }, + { "subviewer1", SUB_TYPE_SUBVIEW1, "Subviewer 1", ParseSubViewer1 }, { NULL, SUB_TYPE_UNKNOWN, "Unknown", NULL } }; - -/* Missing Detect - SubViewer 1 - JSS - RealText - Subrip09 - */ - +/* 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 @@ -228,8 +259,11 @@ 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" ); + f_fps = var_CreateGetFloat( p_demux, "sub-original-fps" ); /* FIXME */ if( f_fps >= 1.0 ) p_sys->i_microsecperframe = (int64_t)( (float)1000000 / f_fps ); @@ -246,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; @@ -299,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; @@ -329,10 +372,13 @@ static int Open ( vlc_object_t *p_this ) p_sys->i_type = SUB_TYPE_SUBVIEWER; /* I hope this will work */ break; } - else if( sscanf( s, "%d:%d:%d.%d %d:%d:%d", &i_dummy, &i_dummy, &i_dummy, &i_dummy, &i_dummy, &i_dummy, &i_dummy ) == 7 || - sscanf( s, "@%d @%d", &i_dummy, &i_dummy) == 2) + else if( sscanf( s, "%d:%d:%d.%d %d:%d:%d", + &i_dummy, &i_dummy, &i_dummy, &i_dummy, + &i_dummy, &i_dummy, &i_dummy ) == 7 || + sscanf( s, "@%d @%d", &i_dummy, &i_dummy) == 2) { p_sys->i_type = SUB_TYPE_JACOSUB; + break; } else if( sscanf( s, "%d:%d:%d:", &i_dummy, &i_dummy, &i_dummy ) == 3 || sscanf( s, "%d:%d:%d ", &i_dummy, &i_dummy, &i_dummy ) == 3 ) @@ -346,6 +392,17 @@ static int Open ( vlc_object_t *p_this ) p_sys->i_type = SUB_TYPE_DVDSUBTITLE; break; } + else if( sscanf( s, "[%d:%d:%d]%c", + &i_dummy, &i_dummy, &i_dummy, &p_dummy ) == 4 ) + { + p_sys->i_type = SUB_TYPE_DKS; + break; + } + else if( strstr( s, "*** START SCRIPT" ) ) + { + p_sys->i_type = SUB_TYPE_SUBVIEW1; + break; + } else if( sscanf( s, "[%d][%d]", &i_dummy, &i_dummy ) == 2 || sscanf( s, "[%d][]", &i_dummy ) == 1) { @@ -357,14 +414,28 @@ static int Open ( vlc_object_t *p_this ) && p_dummy =='E' ) ) { p_sys->i_type = SUB_TYPE_MPSUB; + break; } else if( sscanf( s, "-->> %d", &i_dummy) == 1 ) { p_sys->i_type = SUB_TYPE_AQT; + break; } else if( sscanf( s, "%d,%d,", &i_dummy, &i_dummy ) == 2 ) { p_sys->i_type = SUB_TYPE_PJS; + break; + } + else if( sscanf( s, "{%d:%d:%d}", + &i_dummy, &i_dummy, &i_dummy ) == 3 ) + { + p_sys->i_type = SUB_TYPE_PSB; + break; + } + else if( strcasestr( s, "i_type = SUB_TYPE_RT; + break; } free( s ); @@ -380,9 +451,11 @@ static int Open ( vlc_object_t *p_this ) 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" ); + msg_Warn( p_demux, "failed to recognize subtitle type" ); free( p_sys ); return VLC_EGENERIC; } @@ -409,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; @@ -447,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; } @@ -507,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++; } @@ -557,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: @@ -586,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; } @@ -602,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++; } @@ -638,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 @@ -652,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, @@ -672,7 +741,6 @@ static void Fix( demux_t *p_demux ) } } while( !b_done ); } -#endif static int TextLoad( text_t *txt, stream_t *s ) { @@ -683,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( ;; ) @@ -696,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; } } @@ -764,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) { @@ -790,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; } @@ -840,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; } } @@ -848,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; @@ -868,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" ); @@ -878,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'; @@ -897,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, @@ -983,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; } } @@ -1002,7 +1078,7 @@ static int ParseSSA( demux_t *p_demux, subtitle_t *p_subtitle, * or * h:m:s Line1|Line2|Line3.... */ -static int ParseVplayer( demux_t *p_demux, subtitle_t *p_subtitle, +static int ParseVplayer( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) { VLC_UNUSED( i_idx ); @@ -1030,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 ); @@ -1145,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; @@ -1193,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; } } @@ -1222,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 ); @@ -1258,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 ); @@ -1302,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 ) @@ -1318,7 +1397,7 @@ static int ParseAQT( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) /* We have been too far: end of the subtitle, begin of next */ else { - txt->i_line--; + TextPreviousLine( txt ); break; } } @@ -1326,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 ); @@ -1346,6 +1425,7 @@ static int ParsePJS( 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; + int i; for( ;; ) { @@ -1372,14 +1452,19 @@ static int ParsePJS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) } 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; msg_Dbg( p_demux, "%s", psz_text ); 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 ); @@ -1388,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; @@ -1396,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 ) ) { @@ -1417,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; } } @@ -1439,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 ) @@ -1447,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; @@ -1468,10 +1572,15 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) char *psz_text, *psz_orig; char *psz_text2, *psz_orig2; int h1, h2, m1, m2, s1, s2, f1, f2; - static int i_comment = 0; - static int jss_time_resolution = 30; - static int jss_time_shift = 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; + + p_sys->jss.b_inited = true; + } /* Parse the main lines */ for( ;; ) @@ -1480,29 +1589,31 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) if( !s ) return VLC_EGENERIC; - psz_text = malloc( strlen( s ) + 1 ); - if( !psz_text ) + psz_orig = malloc( strlen( s ) + 1 ); + if( !psz_orig ) return VLC_ENOMEM; - psz_orig = psz_text; + psz_text = psz_orig; /* 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 ) { 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; } /* Short time lines */ 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 */ /* Only TIME and SHIFT are supported so far */ @@ -1548,133 +1659,411 @@ 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_text ); + free( psz_orig ); continue; } else /* Unkown type line, probably a comment */ { - free( psz_text ); + free( psz_orig ); continue; } + } + + while( psz_text[ strlen( psz_text ) - 1 ] == '\\' ) + { + const char *s2 = TextGetLine( txt ); - /* Skip the blanks */ - while( *psz_text == ' ' || *psz_text == '\t' ) psz_text++; - - /* Parse the directives */ - if( isalpha( *psz_text ) || *psz_text == '[' ) + if( !s2 ) { - while( *psz_text != ' ' ) - { psz_text++ ;}; - - /* 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 )*/ + free( psz_orig ); + return VLC_EGENERIC; } - /* Skip the blanks after directives */ - while( *psz_text == ' ' || *psz_text == '\t' ) psz_text++; + int i_len = strlen( s2 ); + if( i_len == 0 ) + break; + + int i_old = strlen( psz_text ); + + 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++; + + /* Parse the directives */ + if( isalpha( *psz_text ) || *psz_text == '[' ) + { + while( *psz_text != ' ' ) + { psz_text++ ;}; + + /* 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 )*/ + } + /* Skip the blanks after directives */ + 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; + /* Clean all the lines from inline comments and other stuffs */ + psz_orig2 = calloc( strlen( psz_text) + 1, 1 ); + psz_text2 = psz_orig2; - for( ; *psz_text != '\0' && *psz_text != '\n' && *psz_text != '\r'; ) + for( ; *psz_text != '\0' && *psz_text != '\n' && *psz_text != '\r'; ) + { + switch( *psz_text ) { - switch( *psz_text ) + case '{': + p_sys->jss.i_comment++; + break; + case '}': + if( p_sys->jss.i_comment ) { - case '{': - i_comment++; + p_sys->jss.i_comment = 0; + if( (*(psz_text + 1 ) ) == ' ' ) psz_text++; + } + break; + case '~': + if( !p_sys->jss.i_comment ) + { + *psz_text2 = ' '; + psz_text2++; + } + break; + case ' ': + case '\t': + if( (*(psz_text + 1 ) ) == ' ' || (*(psz_text + 1 ) ) == '\t' ) break; - case '}': - if( i_comment ) - { - i_comment = 0; - if( (*(psz_text + 1 ) ) == ' ' ) psz_text++; - } + if( !p_sys->jss.i_comment ) + { + *psz_text2 = ' '; + psz_text2++; + } + break; + case '\\': + if( (*(psz_text + 1 ) ) == 'n' ) + { + *psz_text2 = '\n'; + psz_text++; + psz_text2++; break; - case '~': - if( !i_comment ) - { - *psz_text2 = ' '; - psz_text2++; - } + } + if( ( toupper(*(psz_text + 1 ) ) == 'C' ) || + ( toupper(*(psz_text + 1 ) ) == 'F' ) ) + { + psz_text++; psz_text++; break; - case ' ': - case '\t': - if( (*(psz_text + 1 ) ) == ' ' || (*(psz_text + 1 ) ) == '\t' ) - break; - if( !i_comment ) - { - *psz_text2 = ' '; - psz_text2++; - } + } + if( (*(psz_text + 1 ) ) == 'B' || (*(psz_text + 1 ) ) == 'b' || + (*(psz_text + 1 ) ) == 'I' || (*(psz_text + 1 ) ) == 'i' || + (*(psz_text + 1 ) ) == 'U' || (*(psz_text + 1 ) ) == 'u' || + (*(psz_text + 1 ) ) == 'D' || (*(psz_text + 1 ) ) == 'N' ) + { + psz_text++; break; - case '\\': - if( (*(psz_text + 1 ) ) == 'n' ) - { - *psz_text2 = '\n'; - psz_text++; - psz_text2++; - break; - } - if( ( toupper(*(psz_text + 1 ) ) == 'C' ) || - ( toupper(*(psz_text + 1 ) ) == 'F' ) ) - { - psz_text++; psz_text++; - break; - } - if( (*(psz_text + 1 ) ) == 'B' || (*(psz_text + 1 ) ) == 'b' || - (*(psz_text + 1 ) ) == 'I' || (*(psz_text + 1 ) ) == 'i' || - (*(psz_text + 1 ) ) == 'U' || (*(psz_text + 1 ) ) == 'u' || - (*(psz_text + 1 ) ) == 'D' || (*(psz_text + 1 ) ) == 'N' ) - { - psz_text++; - break; - } - if( (*(psz_text + 1 ) ) == '~' || (*(psz_text + 1 ) ) == '{' || - (*(psz_text + 1 ) ) == '\\' ) - psz_text++; - else if( *(psz_text + 1 ) == '\r' || *(psz_text + 1 ) == '\n' - || *(psz_text + 1 ) == '\0' ) - { - char *s2 = TextGetLine( txt ); - if( !s2 ) - return VLC_EGENERIC; - - while ( *s2 == ' ' ) s2++; - - /* Here to parse the second line, we should add s2 to - psz_text and go on the for( ) line 1556 in order to - parse the next line. - */ - } - default: - if( !i_comment ) - { - *psz_text2 = *psz_text; - psz_text2++; - } } - psz_text++; + if( (*(psz_text + 1 ) ) == '~' || (*(psz_text + 1 ) ) == '{' || + (*(psz_text + 1 ) ) == '\\' ) + psz_text++; + else if( *(psz_text + 1 ) == '\r' || *(psz_text + 1 ) == '\n' || + *(psz_text + 1 ) == '\0' ) + { + psz_text++; + } + break; + default: + if( !p_sys->jss.i_comment ) + { + *psz_text2 = *psz_text; + psz_text2++; + } + } + psz_text++; + } + + p_subtitle->psz_text = psz_orig2; + msg_Dbg( p_demux, "%s", p_subtitle->psz_text ); + free( psz_orig ); + return VLC_SUCCESS; +} + +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; +} + +static int64_t ParseRealTime( char *psz, int *h, int *m, int *s, int *f ) +{ + 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 || + sscanf( psz, "%d:%d", m, s ) == 2 || + sscanf( psz, "%d", s ) == 1 ) + { + return (int64_t)((( *h * 60 + *m ) * 60 ) + *s ) * 1000 * 1000 + + (int64_t)*f * 10 * 1000; + } + else return VLC_EGENERIC; +} + +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 = 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; + + psz_text = malloc( strlen( s ) + 1 ); + if( !psz_text ) + return VLC_ENOMEM; + + /* Find the good begining. This removes extra spaces at the beginning + of the line.*/ + char *psz_temp = strcasestr( s, "]%[^\n\r]", + psz_begin, psz_end, psz_text) != 3 ) && + /* Line has begin and no end */ + ( sscanf( psz_temp, + "<%*[t|T]ime %*[b|B]egin=\"%11[^\"]\"%*[^>]%[^\n\r]", + psz_begin, psz_text ) != 2) ) + /* Line is not recognized */ + { + continue; + } + + /* Get the times */ + int64_t i_time = ParseRealTime( psz_begin, &h1, &m1, &s1, &f1 ); + p_subtitle->i_start = i_time >= 0 ? i_time : 0; + + i_time = ParseRealTime( psz_end, &h2, &m2, &s2, &f2 ); + p_subtitle->i_stop = i_time >= 0 ? i_time : -1; + break; + } + } + + /* Get the following Lines */ + for( ;; ) + { + const char *s = TextGetLine( txt ); + + if( !s ) + { + free( psz_text ); + return VLC_EGENERIC; + } + + int i_len = strlen( s ); + if( i_len == 0 ) break; + + if( strcasestr( s, "" that remained after the sscanf */ + memmove( &psz_text[0], &psz_text[1], strlen( psz_text ) ); + + p_subtitle->psz_text = psz_text; + + return VLC_SUCCESS; +} + +static int ParseDKS( 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; + + for( ;; ) + { + int h1, m1, s1; + int h2, m2, s2; + 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]%[^\r\n]", + &h1, &m1, &s1, psz_text ) == 4 ) + { + p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 + + (int64_t)m1 * 60*1000 + + (int64_t)s1 * 1000 ) * 1000; + + 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 ); + } + + /* replace [br] by \n */ + char *p; + while( ( p = strstr( psz_text, "[br]" ) ) ) + { + *p++ = '\n'; + memmove( p, &p[3], strlen(&p[3])+1 ); + } + + p_subtitle->psz_text = psz_text; + return VLC_SUCCESS; +} + +static int ParseSubViewer1( 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; + + for( ;; ) + { + int h1, m1, s1; + int h2, m2, s2; + char *s = TextGetLine( txt ); - p_subtitle->psz_text = psz_orig2; - free( psz_orig ); - return VLC_SUCCESS; + if( !s ) + return VLC_EGENERIC; + + if( sscanf( s, "[%d:%d:%d]", &h1, &m1, &s1 ) == 3 ) + { + p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 + + (int64_t)m1 * 60*1000 + + (int64_t)s1 * 1000 ) * 1000; + + char *s = TextGetLine( txt ); + if( !s ) + return VLC_EGENERIC; + + psz_text = strdup( s ); + if( !psz_text ) + return VLC_ENOMEM; + + 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; + } } + + p_subtitle->psz_text = psz_text; + + return VLC_SUCCESS; }