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 );
+ SUB_TYPE_LONGTEXT, true )
+ change_string_list( ppsz_sub_type, NULL, NULL )
set_callbacks( Open, Close )
add_shortcut( "subtitle" )
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,
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 );
{
{ "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 },
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;
"%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,
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 +