# include "config.h"
#endif
-#include <assert.h>
-
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_memory.h>
-#include <errno.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
#include <ctype.h>
#include <vlc_demux.h>
"\"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[] =
{
add_string( "sub-type", "auto", NULL, N_("Subtitles format"),
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" )
{
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;
}
}
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 );
if( !txt->line )
return VLC_ENOMEM;
}
- free( psz );
}
if( txt->i_line_count <= 0 )
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 = 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;
}
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_or_free( p_sys->psz_header,
- strlen( p_sys->psz_header ) + strlen( s ) + 2 );
- assert( p_sys->psz_header );
- strcat( p_sys->psz_header, s );
- strcat( p_sys->psz_header, "\n" );
+ p_sys->psz_header = psz_header;
}
}
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 );
}
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;
(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;
}
}
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 );
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 )
/* Directives are NOT parsed yet */
/* This has probably a better place in a decoder ? */
/* directive = malloc( strlen( psz_text ) + 1 );
- assert( directive );
if( sscanf( psz_text, "%s %[^\n\r]", directive, psz_text2 ) == 2 )*/
}
/* 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;
}
}
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 );
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;
}
}