#include <vlc_memory.h>
#include <ctype.h>
+#include <math.h>
#include <vlc_demux.h>
#include <vlc_charset.h>
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 },
static int Control( demux_t *, int, va_list );
static void Fix( demux_t * );
+static char * get_language_from_filename( const char * );
/*****************************************************************************
* Module initializer
/* Get the 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 );
+ if( f_fps >= 1.f )
+ p_sys->i_microsecperframe = llroundf( 1000000.f / f_fps );
- msg_Dbg( p_demux, "Movie fps: %f", f_fps );
+ msg_Dbg( p_demux, "Movie fps: %f", (double) f_fps );
/* Check for override of the fps */
f_fps = var_CreateGetFloat( p_demux, "sub-fps" );
- if( f_fps >= 1.0 )
+ if( f_fps >= 1.f )
{
- p_sys->i_microsecperframe = (int64_t)( (float)1000000 / f_fps );
- msg_Dbg( p_demux, "Override subtitle fps %f", f_fps );
+ p_sys->i_microsecperframe = llroundf( 1000000.f / f_fps );
+ msg_Dbg( p_demux, "Override subtitle fps %f", (double) f_fps );
}
/* Get or probe the type */
p_sys->i_type = SUB_TYPE_MICRODVD;
break;
}
- else if( sscanf( s,
- "%d:%d:%d,%d --> %d:%d:%d,%d",
+ 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 )
- {
- 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 ) == 8 ||
+ 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:%d,%d --> %d:%d:%d",
+ &i_dummy,&i_dummy,&i_dummy,&i_dummy,
+ &i_dummy,&i_dummy,&i_dummy ) == 7 ||
+ 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 ||
+ 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:%d.%d --> %d:%d:%d",
&i_dummy,&i_dummy,&i_dummy,&i_dummy,
- &i_dummy,&i_dummy,&i_dummy,&i_dummy ) == 8 )
+ &i_dummy,&i_dummy,&i_dummy ) == 7 ||
+ sscanf( s, "%d:%d:%d --> %d:%d:%d",
+ &i_dummy,&i_dummy,&i_dummy,
+ &i_dummy,&i_dummy,&i_dummy ) == 6 )
{
- msg_Err( p_demux, "Detected invalid SubRip file, playing anyway" );
- p_sys->i_type = SUB_TYPE_SUBRIP_DOT;
+ p_sys->i_type = SUB_TYPE_SUBRIP;
break;
}
else if( !strncasecmp( s, "!: This is a Sub Station Alpha v1", 33 ) )
}
else
es_format_Init( &fmt, SPU_ES, VLC_CODEC_SUBT );
+
+ /* Stupid language detection in the filename */
+ char * psz_language = get_language_from_filename( p_demux->psz_file );
+
+ if( psz_language )
+ {
+ fmt.psz_language = psz_language;
+ msg_Dbg( p_demux, "detected language %s of subtitle: %s", psz_language,
+ p_demux->psz_location );
+ }
+
if( unicode )
fmt.subs.psz_encoding = strdup( "UTF-8" );
char *psz_description = var_InheritString( p_demux, "sub-description" );
for( i = 0; i < p_sys->i_subtitles; i++ )
free( p_sys->subtitle[i].psz_text );
free( p_sys->subtitle );
+ free( p_sys->psz_header );
free( p_sys );
}
if( sscanf( s, "{%d}{}%[^\r\n]", &i_start, psz_text ) == 2 ||
sscanf( s, "{%d}{%d}%[^\r\n]", &i_start, &i_stop, psz_text ) == 3)
{
- float f_fps;
if( i_start != 1 || i_stop != 1 )
break;
/* We found a possible setting of the framerate "{1}{1}23.976" */
/* Check if it's usable, and if the sub-fps is not set */
- f_fps = us_strtod( psz_text, NULL );
- if( f_fps > 0.0 && var_GetFloat( p_demux, "sub-fps" ) <= 0.0 )
- p_sys->i_microsecperframe = (int64_t)((float)1000000 / f_fps);
+ float f_fps = us_strtof( psz_text, NULL );
+ if( f_fps > 0.f && var_GetFloat( p_demux, "sub-fps" ) <= 0.f )
+ p_sys->i_microsecperframe = llroundf(1000000.f / f_fps);
}
free( psz_text );
}
* We ignore line number for SubRip
*/
static int ParseSubRipSubViewer( demux_t *p_demux, subtitle_t *p_subtitle,
- const char *psz_fmt,
+ int (* pf_parse_timing)(subtitle_t *, const char *),
bool b_replace_br )
{
demux_sys_t *p_sys = p_demux->p_sys;
for( ;; )
{
const char *s = TextGetLine( txt );
- int h1, m1, s1, d1, h2, m2, s2, d2;
if( !s )
return VLC_EGENERIC;
- if( sscanf( s, psz_fmt,
- &h1, &m1, &s1, &d1,
- &h2, &m2, &s2, &d2 ) == 8 )
+ if( pf_parse_timing( p_subtitle, s) == VLC_SUCCESS &&
+ p_subtitle->i_start < p_subtitle->i_stop )
{
- p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 +
- (int64_t)m1 * 60*1000 +
- (int64_t)s1 * 1000 +
- (int64_t)d1 ) * 1000;
-
- p_subtitle->i_stop = ( (int64_t)h2 * 3600*1000 +
- (int64_t)m2 * 60*1000 +
- (int64_t)s2 * 1000 +
- (int64_t)d2 ) * 1000;
- if( p_subtitle->i_start < p_subtitle->i_stop )
- break;
+ break;
}
}
}
}
}
+
+/* subtitle_ParseSubRipTimingValue
+ * Parses SubRip timing value.
+ */
+static int subtitle_ParseSubRipTimingValue(int64_t *timing_value,
+ const char *s)
+{
+ int h1, m1, s1, d1 = 0;
+
+ if ( sscanf( s, "%d:%d:%d,%d",
+ &h1, &m1, &s1, &d1 ) == 4 ||
+ sscanf( s, "%d:%d:%d.%d",
+ &h1, &m1, &s1, &d1 ) == 4 ||
+ sscanf( s, "%d:%d:%d",
+ &h1, &m1, &s1) == 3 )
+ {
+ (*timing_value) = ( (int64_t)h1 * 3600 * 1000 +
+ (int64_t)m1 * 60 * 1000 +
+ (int64_t)s1 * 1000 +
+ (int64_t)d1 ) * 1000;
+
+ return VLC_SUCCESS;
+ }
+
+ return VLC_EGENERIC;
+}
+
+/* subtitle_ParseSubRipTiming
+ * Parses SubRip timing.
+ */
+static int subtitle_ParseSubRipTiming( subtitle_t *p_subtitle,
+ const char *s )
+{
+ int i_result = VLC_EGENERIC;
+ char *psz_start, *psz_stop;
+ psz_start = malloc( strlen(s) + 1 );
+ psz_stop = malloc( strlen(s) + 1 );
+
+ if( sscanf( s, "%s --> %s", psz_start, psz_stop) == 2 &&
+ subtitle_ParseSubRipTimingValue( &p_subtitle->i_start, psz_start ) == VLC_SUCCESS &&
+ subtitle_ParseSubRipTimingValue( &p_subtitle->i_stop, psz_stop ) == VLC_SUCCESS )
+ {
+ i_result = VLC_SUCCESS;
+ }
+
+ free(psz_start);
+ free(psz_stop);
+
+ return i_result;
+}
/* ParseSubRip
*/
static int ParseSubRip( demux_t *p_demux, subtitle_t *p_subtitle,
{
VLC_UNUSED( i_idx );
return ParseSubRipSubViewer( p_demux, p_subtitle,
- "%d:%d:%d,%d --> %d:%d:%d,%d",
+ &subtitle_ParseSubRipTiming,
false );
}
-/* ParseSubRipDot
- * Special version for buggy file using '.' instead of ','
+
+/* subtitle_ParseSubViewerTiming
+ * Parses SubViewer timing.
*/
-static int ParseSubRipDot( demux_t *p_demux, subtitle_t *p_subtitle,
- int i_idx )
+static int subtitle_ParseSubViewerTiming( subtitle_t *p_subtitle,
+ const char *s )
{
- VLC_UNUSED( i_idx );
- return ParseSubRipSubViewer( p_demux, p_subtitle,
- "%d:%d:%d.%d --> %d:%d:%d.%d",
- false );
+ int h1, m1, s1, d1, h2, m2, s2, d2;
+
+ if( sscanf( s, "%d:%d:%d.%d,%d:%d:%d.%d",
+ &h1, &m1, &s1, &d1, &h2, &m2, &s2, &d2) == 8 )
+ {
+ p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 +
+ (int64_t)m1 * 60*1000 +
+ (int64_t)s1 * 1000 +
+ (int64_t)d1 ) * 1000;
+
+ p_subtitle->i_stop = ( (int64_t)h2 * 3600*1000 +
+ (int64_t)m2 * 60*1000 +
+ (int64_t)s2 * 1000 +
+ (int64_t)d2 ) * 1000;
+ return VLC_SUCCESS;
+ }
+ return VLC_EGENERIC;
}
+
/* ParseSubViewer
*/
static int ParseSubViewer( demux_t *p_demux, subtitle_t *p_subtitle,
VLC_UNUSED( i_idx );
return ParseSubRipSubViewer( p_demux, p_subtitle,
- "%d:%d:%d.%d,%d:%d:%d.%d",
+ &subtitle_ParseSubViewerTiming,
true );
}
{
demux_sys_t *p_sys = p_demux->p_sys;
text_t *txt = &p_sys->txt;
+ size_t header_len = 0;
for( ;; )
{
free( psz_text );
/* All the other stuff we add to the header field */
- char *psz_header;
- if( asprintf( &psz_header, "%s%s\n",
- p_sys->psz_header ? p_sys->psz_header : "", s ) == -1 )
+ size_t s_len = strlen( s );
+ p_sys->psz_header = realloc_or_free( p_sys->psz_header, header_len + s_len + 2 );
+ if( !p_sys->psz_header )
return VLC_ENOMEM;
- p_sys->psz_header = psz_header;
+ snprintf( p_sys->psz_header + header_len, s_len + 2, "%s\n", s );
+ header_len += s_len + 1;
}
}
for( ;; )
{
- float f1, f2;
char p_dummy;
char *psz_temp;
if( sscanf( s, "FORMAT=%[^\r\n]", psz_temp ) )
{
- float f_fps;
- f_fps = us_strtod( psz_temp, NULL );
- if( f_fps > 0.0 && var_GetFloat( p_demux, "sub-fps" ) <= 0.0 )
+ float f_fps = us_strtof( psz_temp, NULL );
+
+ if( f_fps > 0.f && var_GetFloat( p_demux, "sub-fps" ) <= 0.f )
var_SetFloat( p_demux, "sub-fps", f_fps );
- p_sys->mpsub.f_factor = 1.0;
+ p_sys->mpsub.f_factor = 1.f;
free( psz_temp );
break;
}
free( psz_temp );
}
+
/* Data Lines */
- f1 = us_strtod( s, &psz_temp );
+ float f1 = us_strtof( s, &psz_temp );
if( *psz_temp )
{
- f2 = us_strtod( psz_temp, NULL );
+ float f2 = us_strtof( 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_subtitle->i_start = llroundf(10000.f * 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);
+ p_subtitle->i_stop = llroundf(10000.f * p_sys->mpsub.f_total);
break;
}
}
strcat( psz_text, "\n" );
}
}
+
+/* Matches filename.xx.srt */
+static char * get_language_from_filename( const char * psz_sub_file )
+{
+ char *psz_ret = NULL;
+ char *psz_tmp, *psz_language_begin;
+
+ if( !psz_sub_file ) return NULL;
+ char *psz_work = strdup( psz_sub_file );
+
+ /* Removing extension, but leaving the dot */
+ psz_tmp = strrchr( psz_work, '.' );
+ if( psz_tmp )
+ {
+ psz_tmp[0] = '\0';
+ psz_language_begin = strrchr( psz_work, '.' );
+ if( psz_language_begin )
+ psz_ret = strdup(++psz_language_begin);
+ psz_tmp[0] = '.';
+ }
+
+ free( psz_work );
+ return psz_ret;
+}