/*****************************************************************************
* subtitle.c: Demux vobsub files.
*****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
+ * Copyright (C) 1999-2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
-#include <errno.h>
#include <sys/types.h>
+#include <limits.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "vlc_video.h"
+#include <vlc_demux.h>
#include "ps.h"
+#include "vobsub.h"
#define MAX_LINE 8192
static int Open ( vlc_object_t *p_this );
static void Close( vlc_object_t *p_this );
-vlc_module_begin();
- set_description( _("Vobsub subtitles demux") );
- set_capability( "demux2", 0 );
-
- set_callbacks( Open, Close );
+vlc_module_begin ()
+ set_description( N_("Vobsub subtitles parser") )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_DEMUX )
+ set_capability( "demux", 1 )
+
+ set_callbacks( Open, Close )
- add_shortcut( "vobsub" );
-vlc_module_end();
+ add_shortcut( "vobsub", "subtitle" )
+vlc_module_end ()
/*****************************************************************************
* Prototypes:
typedef struct
{
- mtime_t i_start;
- mtime_t i_stop;
-
+ int64_t i_start;
int i_vobsub_location;
} subtitle_t;
+typedef struct
+{
+ es_format_t fmt;
+ es_out_id_t *p_es;
+ int i_track_id;
+
+ int i_current_subtitle;
+ int i_subtitles;
+ subtitle_t *p_subtitles;
+
+ int64_t i_delay;
+} vobsub_track_t;
struct demux_sys_t
{
- int i_type;
- text_t txt;
- es_out_id_t *es;
-
int64_t i_next_demux_date;
+ int64_t i_length;
- int i_subtitle;
- int i_subtitles;
- subtitle_t *subtitle;
- FILE *p_vobsub_file;
+ text_t txt;
+ stream_t *p_vobsub_stream;
- int64_t i_length;
+ /* all tracks */
+ int i_tracks;
+ vobsub_track_t *track;
+
+ int i_original_frame_width;
+ int i_original_frame_height;
+ bool b_palette;
+ uint32_t palette[16];
};
static int Demux( demux_t * );
static int Control( demux_t *, int, va_list );
-static int ParseVobSubIDX( demux_t *, subtitle_t * );
-static int DemuxVobSub( demux_t *f, block_t *);
+static int ParseVobSubIDX( demux_t * );
+static int DemuxVobSub( demux_t *, block_t *);
/*****************************************************************************
* Module initializer
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- es_format_t fmt;
- int i_max;
+ char *psz_vobname, *s;
+ int i_len;
- if( strcmp( p_demux->psz_demux, "vobsub" ) )
- {
- msg_Dbg( p_demux, "vobsub demux discarded" );
- return VLC_EGENERIC;
- }
-
- p_demux->pf_demux = Demux;
- p_demux->pf_control = Control;
- p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
- p_sys->i_subtitle = 0;
- p_sys->i_subtitles= 0;
- p_sys->subtitle = NULL;
- p_sys->p_vobsub_file = NULL;
-
- char *s = NULL;
if( ( s = stream_ReadLine( p_demux->s ) ) != NULL )
{
if( !strcasestr( s, "# VobSub index file" ) )
{
- msg_Err( p_demux, "this doesn't seem to be a vobsub file, bailing" );
+ msg_Dbg( p_demux, "this doesn't seem to be a vobsub file" );
free( s );
+ if( stream_Seek( p_demux->s, 0 ) )
+ {
+ msg_Warn( p_demux, "failed to rewind" );
+ }
return VLC_EGENERIC;
}
free( s );
- s = NULL;
- if( stream_Seek( p_demux->s, 0 ) )
- {
- msg_Warn( p_demux, "failed to rewind" );
- }
}
else
{
- msg_Err( p_demux, "could not read vobsub IDX file" );
+ msg_Dbg( p_demux, "could not read vobsub IDX file" );
return VLC_EGENERIC;
}
+ p_demux->pf_demux = Demux;
+ p_demux->pf_control = Control;
+ p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+ if( unlikely( !p_sys ) )
+ return VLC_ENOMEM;
+ p_sys->i_length = 0;
+ p_sys->p_vobsub_stream = NULL;
+ p_sys->i_tracks = 0;
+ p_sys->track = malloc( sizeof( vobsub_track_t ) );
+ if( unlikely( !p_sys->track ) )
+ {
+ free( p_sys );
+ return VLC_ENOMEM;
+ }
+ p_sys->i_original_frame_width = -1;
+ p_sys->i_original_frame_height = -1;
+ p_sys->b_palette = false;
+ memset( p_sys->palette, 0, 16 * sizeof( uint32_t ) );
+
/* Load the whole file */
TextLoad( &p_sys->txt, p_demux->s );
/* Parse it */
- for( i_max = 0;; )
+ ParseVobSubIDX( p_demux );
+
+ /* Unload */
+ TextUnload( &p_sys->txt );
+
+ /* Find the total length of the vobsubs */
+ if( p_sys->i_tracks > 0 )
{
- if( p_sys->i_subtitles >= i_max )
+ int i;
+ for( i = 0; i < p_sys->i_tracks; i++ )
{
- i_max += 500;
- if( !( p_sys->subtitle = realloc( p_sys->subtitle,
- sizeof(subtitle_t) * i_max ) ) )
+ if( p_sys->track[i].i_subtitles > 1 )
{
- msg_Err( p_demux, "out of memory");
- return VLC_ENOMEM;
+ if( p_sys->track[i].p_subtitles[p_sys->track[i].i_subtitles-1].i_start > p_sys->i_length )
+ p_sys->i_length = (int64_t) p_sys->track[i].p_subtitles[p_sys->track[i].i_subtitles-1].i_start + ( 1 *1000 *1000 );
}
}
-
- if( ParseVobSubIDX( p_demux, &p_sys->subtitle[p_sys->i_subtitles] ) )
- break;
-
- p_sys->i_subtitles++;
}
- /* Unload */
- TextUnload( &p_sys->txt );
- msg_Dbg(p_demux, "loaded %d subtitles", p_sys->i_subtitles );
-
- /* Fix subtitle (order and time) *** */
- p_sys->i_subtitle = 0;
- p_sys->i_length = 0;
- if( p_sys->i_subtitles > 0 )
+ if( asprintf( &psz_vobname, "%s://%s", p_demux->psz_access, p_demux->psz_path ) == -1 )
{
- p_sys->i_length = p_sys->subtitle[p_sys->i_subtitles-1].i_stop;
- /* +1 to avoid 0 */
- if( p_sys->i_length <= 0 )
- p_sys->i_length = p_sys->subtitle[p_sys->i_subtitles-1].i_start+1;
+ free( p_sys );
+ return VLC_EGENERIC;
}
-
- int i_len = strlen( p_demux->psz_path );
- char *psz_vobname = strdup( p_demux->psz_path );
-
- strcpy( psz_vobname + i_len - 4, ".sub" );
+ i_len = strlen( psz_vobname );
+ if( i_len >= 4 ) memcpy( psz_vobname + i_len - 4, ".sub", 4 );
/* open file */
- if( !( p_sys->p_vobsub_file = fopen( psz_vobname, "rb" ) ) )
+ p_sys->p_vobsub_stream = stream_UrlNew( p_demux, psz_vobname );
+ if( p_sys->p_vobsub_stream == NULL )
{
msg_Err( p_demux, "couldn't open .sub Vobsub file: %s",
psz_vobname );
+ free( psz_vobname );
+ free( p_sys );
+ return VLC_EGENERIC;
}
free( psz_vobname );
- es_format_Init( &fmt, SPU_ES, VLC_FOURCC( 's','p','u',' ' ) );
-
- p_sys->es = es_out_Add( p_demux->out, &fmt );
-
return VLC_SUCCESS;
}
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
+ int i;
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
- if( p_sys->subtitle )
- free( p_sys->subtitle );
+ /* Clean all subs from all tracks */
+ for( i = 0; i < p_sys->i_tracks; i++ )
+ free( p_sys->track[i].p_subtitles );
- if( p_sys->p_vobsub_file )
- fclose( p_sys->p_vobsub_file );
+ free( p_sys->track );
+
+ if( p_sys->p_vobsub_stream )
+ stream_Delete( p_sys->p_vobsub_stream );
free( p_sys );
}
{
demux_sys_t *p_sys = p_demux->p_sys;
int64_t *pi64, i64;
+ int i;
double *pf, f;
switch( i_query )
{
case DEMUX_GET_LENGTH:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = p_sys->i_length;
+ *pi64 = (int64_t) p_sys->i_length;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * );
- if( p_sys->i_subtitle < p_sys->i_subtitles )
+ for( i = 0; i < p_sys->i_tracks; i++ )
{
- *pi64 = p_sys->subtitle[p_sys->i_subtitle].i_start;
+ bool b_selected;
+ /* Check the ES is selected */
+ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
+ p_sys->track[i].p_es, &b_selected );
+ if( b_selected ) break;
+ }
+ if( i < p_sys->i_tracks && p_sys->track[i].i_current_subtitle < p_sys->track[i].i_subtitles )
+ {
+ *pi64 = p_sys->track[i].p_subtitles[p_sys->track[i].i_current_subtitle].i_start;
return VLC_SUCCESS;
}
return VLC_EGENERIC;
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 )
+ for( i = 0; i < p_sys->i_tracks; i++ )
{
- p_sys->i_subtitle++;
+ p_sys->track[i].i_current_subtitle = 0;
+ while( p_sys->track[i].i_current_subtitle < p_sys->track[i].i_subtitles &&
+ p_sys->track[i].p_subtitles[p_sys->track[i].i_current_subtitle].i_start < i64 )
+ {
+ p_sys->track[i].i_current_subtitle++;
+ }
+
+ if( p_sys->track[i].i_current_subtitle >= p_sys->track[i].i_subtitles )
+ return VLC_EGENERIC;
}
-
- if( p_sys->i_subtitle >= p_sys->i_subtitles )
- return VLC_EGENERIC;
return VLC_SUCCESS;
case DEMUX_GET_POSITION:
pf = (double*)va_arg( args, double * );
- if( p_sys->i_subtitle >= p_sys->i_subtitles )
+ for( i = 0; i < p_sys->i_tracks; i++ )
+ {
+ bool b_selected;
+ /* Check the ES is selected */
+ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
+ p_sys->track[i].p_es, &b_selected );
+ if( b_selected ) break;
+ }
+ if( p_sys->track[i].i_current_subtitle >= p_sys->track[i].i_subtitles )
{
*pf = 1.0;
}
- else if( p_sys->i_subtitles > 0 )
+ else if( p_sys->track[i].i_subtitles > 0 )
{
- *pf = (double)p_sys->subtitle[p_sys->i_subtitle].i_start /
+ *pf = (double)p_sys->track[i].p_subtitles[p_sys->track[i].i_current_subtitle].i_start /
(double)p_sys->i_length;
}
else
case DEMUX_SET_POSITION:
f = (double)va_arg( args, double );
- i64 = f * p_sys->i_length;
+ i64 = (int64_t) f * p_sys->i_length;
- p_sys->i_subtitle = 0;
- while( p_sys->i_subtitle < p_sys->i_subtitles &&
- p_sys->subtitle[p_sys->i_subtitle].i_start < i64 )
+ for( i = 0; i < p_sys->i_tracks; i++ )
{
- p_sys->i_subtitle++;
+ p_sys->track[i].i_current_subtitle = 0;
+ while( p_sys->track[i].i_current_subtitle < p_sys->track[i].i_subtitles &&
+ p_sys->track[i].p_subtitles[p_sys->track[i].i_current_subtitle].i_start < i64 )
+ {
+ p_sys->track[i].i_current_subtitle++;
+ }
+ if( p_sys->track[i].i_current_subtitle >= p_sys->track[i].i_subtitles )
+ return VLC_EGENERIC;
}
- if( p_sys->i_subtitle >= p_sys->i_subtitles )
- return VLC_EGENERIC;
return VLC_SUCCESS;
case DEMUX_SET_NEXT_DEMUX_TIME:
case DEMUX_GET_FPS:
case DEMUX_GET_META:
case DEMUX_GET_TITLE_INFO:
+ case DEMUX_HAS_UNSUPPORTED_META:
+ case DEMUX_GET_ATTACHMENTS:
+ case DEMUX_CAN_RECORD:
return VLC_EGENERIC;
default:
- msg_Err( p_demux, "unknown query in subtitle control" );
+ msg_Warn( p_demux, "unknown query in subtitle control" );
return VLC_EGENERIC;
}
}
{
demux_sys_t *p_sys = p_demux->p_sys;
int64_t i_maxdate;
+ int i, i_read;
- if( p_sys->i_subtitle >= p_sys->i_subtitles )
- return 0;
-
- i_maxdate = p_sys->i_next_demux_date;
- if( i_maxdate <= 0 && p_sys->i_subtitle < p_sys->i_subtitles )
- {
- /* Should not happen */
- i_maxdate = p_sys->subtitle[p_sys->i_subtitle].i_start + 1;
- }
-
- while( p_sys->i_subtitle < p_sys->i_subtitles &&
- p_sys->subtitle[p_sys->i_subtitle].i_start < i_maxdate )
+ for( i = 0; i < p_sys->i_tracks; i++ )
{
- int i_pos = p_sys->subtitle[p_sys->i_subtitle].i_vobsub_location;
- block_t *p_block;
- int i_size = 0;
+#define tk p_sys->track[i]
+ if( tk.i_current_subtitle >= tk.i_subtitles )
+ continue;
- /* first compute SPU size */
- if( p_sys->i_subtitle + 1 < p_sys->i_subtitles )
+ i_maxdate = p_sys->i_next_demux_date;
+ if( i_maxdate <= 0 && tk.i_current_subtitle < tk.i_subtitles )
{
- i_size = p_sys->subtitle[p_sys->i_subtitle+1].i_vobsub_location - i_pos;
+ /* Should not happen */
+ i_maxdate = tk.p_subtitles[tk.i_current_subtitle].i_start + 1;
}
- if( i_size <= 0 ) i_size = 65535; /* Invalid or EOF */
- /* Seek at the right place */
- if( fseek( p_sys->p_vobsub_file, i_pos, SEEK_SET ) )
+ while( tk.i_current_subtitle < tk.i_subtitles &&
+ tk.p_subtitles[tk.i_current_subtitle].i_start < i_maxdate )
{
- msg_Warn( p_demux,
- "cannot seek at right vobsub location %d", i_pos );
- p_sys->i_subtitle++;
- continue;
- }
+ int i_pos = tk.p_subtitles[tk.i_current_subtitle].i_vobsub_location;
+ block_t *p_block;
+ int i_size = 0;
- /* allocate a packet */
- if( ( p_block = block_New( p_demux, i_size ) ) == NULL )
- {
- p_sys->i_subtitle++;
- continue;
- }
+ /* first compute SPU size */
+ if( tk.i_current_subtitle + 1 < tk.i_subtitles )
+ {
+ i_size = tk.p_subtitles[tk.i_current_subtitle+1].i_vobsub_location - i_pos;
+ }
+ if( i_size <= 0 ) i_size = 65535; /* Invalid or EOF */
- /* read data */
- p_block->i_buffer = fread( p_block->p_buffer, 1, i_size,
- p_sys->p_vobsub_file );
- if( p_block->i_buffer <= 6 )
- {
- block_Release( p_block );
- p_sys->i_subtitle++;
- continue;
- }
+ /* Seek at the right place */
+ if( stream_Seek( p_sys->p_vobsub_stream, i_pos ) )
+ {
+ msg_Warn( p_demux,
+ "cannot seek in the VobSub to the correct time %d", i_pos );
+ tk.i_current_subtitle++;
+ continue;
+ }
+
+ /* allocate a packet */
+ if( ( p_block = block_New( p_demux, i_size ) ) == NULL )
+ {
+ tk.i_current_subtitle++;
+ continue;
+ }
+
+ /* read data */
+ i_read = stream_Read( p_sys->p_vobsub_stream, p_block->p_buffer, i_size );
+ if( i_read <= 6 )
+ {
+ block_Release( p_block );
+ tk.i_current_subtitle++;
+ continue;
+ }
+ p_block->i_buffer = i_read;
- /* pts */
- p_block->i_pts = p_sys->subtitle[p_sys->i_subtitle].i_start;
+ /* pts */
+ p_block->i_pts = VLC_TS_0 + tk.p_subtitles[tk.i_current_subtitle].i_start;
- /* demux this block */
- DemuxVobSub( p_demux, p_block );
+ /* demux this block */
+ DemuxVobSub( p_demux, p_block );
- p_sys->i_subtitle++;
+ tk.i_current_subtitle++;
+ }
+#undef tk
}
/* */
static int TextLoad( text_t *txt, stream_t *s )
{
- int i_line_max;
-
- /* init txt */
- i_line_max = 500;
- txt->i_line_count = 0;
- txt->i_line = 0;
- txt->line = calloc( i_line_max, sizeof( char * ) );
+ char **lines = NULL;
+ size_t n = 0;
/* load the complete file */
for( ;; )
{
char *psz = stream_ReadLine( s );
+ char **ppsz_new;
- if( psz == NULL )
+ if( psz == NULL || (n >= INT_MAX/sizeof(char *)) )
break;
- txt->line[txt->i_line_count++] = psz;
- if( txt->i_line_count >= i_line_max )
+ ppsz_new = realloc( lines, (n + 1) * sizeof (char *) );
+ if( ppsz_new == NULL )
{
- i_line_max += 100;
- txt->line = realloc( txt->line, i_line_max * sizeof( char*) );
+ free( psz );
+ break;
}
+ lines = ppsz_new;
+ lines[n++] = psz;
}
- if( txt->i_line_count <= 0 )
- {
- free( txt->line );
- return VLC_EGENERIC;
- }
+ txt->i_line_count = n;
+ txt->i_line = 0;
+ txt->line = lines;
return VLC_SUCCESS;
}
+
static void TextUnload( text_t *txt )
{
int i;
for( i = 0; i < txt->i_line_count; i++ )
- {
free( txt->line[i] );
- }
+
free( txt->line );
txt->i_line = 0;
txt->i_line_count = 0;
return txt->line[txt->i_line++];
}
-static void TextPreviousLine( text_t *txt )
-{
- if( txt->i_line > 0 )
- txt->i_line--;
-}
-static int ParseVobSubIDX( demux_t *p_demux, subtitle_t *p_subtitle )
+static int ParseVobSubIDX( demux_t *p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
text_t *txt = &p_sys->txt;
-
- /*
- * Parse the idx file. Each line:
- * timestamp: hh:mm:ss:mss, filepos: loc
- * hexint is the hex location of the vobsub in the .sub file
- *
- */
- char *p;
- char buffer_text[MAX_LINE + 1];
- unsigned int i_start, i_location;
-
- p_subtitle->i_start = 0;
- p_subtitle->i_stop = 0;
- p_subtitle->i_vobsub_location = 0;
+ char *line;
+ vobsub_track_t *current_tk = NULL;
for( ;; )
{
- unsigned int h, m, s, ms, loc;
-
- if( ( p = TextGetLine( txt ) ) == NULL )
+ if( ( line = TextGetLine( txt ) ) == NULL )
{
return( VLC_EGENERIC );
}
- i_start = 0;
- memset( buffer_text, '\0', MAX_LINE );
- if( sscanf( p, "timestamp: %d:%d:%d:%d, filepos: %x%[^\r\n]",
- &h, &m, &s, &ms, &loc, buffer_text ) == 5 )
+ if( *line == 0 || *line == '\r' || *line == '\n' || *line == '#' )
{
- i_start = ( (mtime_t)h * 3600*1000 +
- (mtime_t)m * 60*1000 +
- (mtime_t)s * 1000 +
- (mtime_t)ms ) * 1000;
- i_location = loc;
- break;
+ continue;
+ }
+ else if( !strncmp( "size:", line, 5 ) )
+ {
+ /* Store the original size of the video */
+ if( vobsub_size_parse( line, &p_sys->i_original_frame_width,
+ &p_sys->i_original_frame_height ) == VLC_SUCCESS )
+ {
+ msg_Dbg( p_demux, "original frame size: %dx%d", p_sys->i_original_frame_width, p_sys->i_original_frame_height );
+ }
+ else
+ {
+ msg_Warn( p_demux, "reading original frame size failed" );
+ }
+ }
+ else if( !strncmp( "palette:", line, 8 ) )
+ {
+ if( vobsub_palette_parse( line, p_sys->palette ) == VLC_SUCCESS )
+ {
+ p_sys->b_palette = true;
+ msg_Dbg( p_demux, "vobsub palette read" );
+ }
+ else
+ {
+ msg_Warn( p_demux, "reading original palette failed" );
+ }
+ }
+ else if( !strncmp( "id:", line, 3 ) )
+ {
+ char language[3];
+ int i_track_id;
+ es_format_t fmt;
+
+ /* Lets start a new track */
+ if( sscanf( line, "id: %2s, index: %d",
+ language, &i_track_id ) == 2 )
+ {
+ p_sys->i_tracks++;
+ p_sys->track = xrealloc( p_sys->track,
+ sizeof( vobsub_track_t ) * (p_sys->i_tracks + 1 ) );
+ language[2] = '\0';
+
+ /* Init the track */
+ current_tk = &p_sys->track[p_sys->i_tracks - 1];
+ memset( current_tk, 0, sizeof( vobsub_track_t ) );
+ current_tk->i_current_subtitle = 0;
+ current_tk->i_subtitles = 0;
+ current_tk->p_subtitles = xmalloc( sizeof( subtitle_t ) );;
+ current_tk->i_track_id = i_track_id;
+ current_tk->i_delay = (int64_t)0;
+
+ es_format_Init( &fmt, SPU_ES, VLC_CODEC_SPU );
+ fmt.subs.spu.i_original_frame_width = p_sys->i_original_frame_width;
+ fmt.subs.spu.i_original_frame_height = p_sys->i_original_frame_height;
+ fmt.psz_language = language;
+ if( p_sys->b_palette )
+ {
+ fmt.subs.spu.palette[0] = 0xBeef;
+ memcpy( &fmt.subs.spu.palette[1], p_sys->palette, 16 * sizeof( uint32_t ) );
+ }
+
+ current_tk->p_es = es_out_Add( p_demux->out, &fmt );
+ msg_Dbg( p_demux, "new vobsub track detected" );
+ }
+ else
+ {
+ msg_Warn( p_demux, "reading new track failed" );
+ }
+ }
+ else if( !strncmp( line, "timestamp:", 10 ) )
+ {
+ /*
+ * timestamp: [sign]hh:mm:ss:mss, filepos: loc
+ * loc is the hex location of the spu in the .sub file
+ */
+ int h, m, s, ms, count, loc = 0;
+ int i_sign = 1;
+ int64_t i_start, i_location = 0;
+
+ if( p_sys->i_tracks > 0 &&
+ sscanf( line, "timestamp: %d%n:%d:%d:%d, filepos: %x",
+ &h, &count, &m, &s, &ms, &loc ) >= 5 )
+ {
+ vobsub_track_t *current_tk = &p_sys->track[p_sys->i_tracks - 1];
+ subtitle_t *current_sub;
+
+ if( line[count-3] == '-' )
+ {
+ i_sign = -1;
+ h = -h;
+ }
+ i_start = (int64_t) ( h * 3600*1000 +
+ m * 60*1000 +
+ s * 1000 +
+ ms ) * 1000;
+ i_location = loc;
+
+ current_tk->i_subtitles++;
+ current_tk->p_subtitles =
+ xrealloc( current_tk->p_subtitles,
+ sizeof( subtitle_t ) * (current_tk->i_subtitles + 1 ) );
+ current_sub = ¤t_tk->p_subtitles[current_tk->i_subtitles - 1];
+
+ current_sub->i_start = i_start * i_sign;
+ current_sub->i_start += current_tk->i_delay;
+ current_sub->i_vobsub_location = i_location;
+ }
+ else
+ {
+ msg_Warn( p_demux, "reading timestamp failed" );
+ }
+ }
+ else if( !strncasecmp( line, "delay:", 6 ) )
+ {
+ /*
+ * delay: [sign]hh:mm:ss:mss
+ */
+ int h, m, s, ms, count = 0;
+ int i_sign = 1;
+ int64_t i_gap = 0;
+
+ if( p_sys->i_tracks > 0 &&
+ sscanf( line, "%*celay: %d%n:%d:%d:%d",
+ &h, &count, &m, &s, &ms ) >= 4 )
+ {
+ vobsub_track_t *current_tk = &p_sys->track[p_sys->i_tracks - 1];
+ if( line[count-3] == '-' )
+ {
+ i_sign = -1;
+ h = -h;
+ }
+ i_gap = (int64_t) ( h * 3600*1000 +
+ m * 60*1000 +
+ s * 1000 +
+ ms ) * 1000;
+
+ current_tk->i_delay = current_tk->i_delay + (i_gap * i_sign);
+ msg_Dbg( p_demux, "sign: %+d gap: %+"PRId64" global delay: %+"PRId64"",
+ i_sign, i_gap, current_tk->i_delay );
+ }
+ else
+ {
+ msg_Warn( p_demux, "reading delay failed" );
+ }
}
}
- p_subtitle->i_start = (mtime_t)i_start;
- p_subtitle->i_stop = 0;
- p_subtitle->i_vobsub_location = i_location;
- fprintf( stderr, "time: %x, location: %x\n", i_start, i_location );
return( 0 );
}
-static int DemuxVobSub( demux_t *p_demux, block_t *p_bk )
+static int DemuxVobSub( demux_t *p_demux, block_t *p_bk )
{
demux_sys_t *p_sys = p_demux->p_sys;
uint8_t *p = p_bk->p_buffer;
uint8_t *p_end = &p_bk->p_buffer[p_bk->i_buffer];
+ int i;
- while( p < p_end )
+ while( p + 6 < p_end )
{
int i_size = ps_pkt_size( p, p_end - p );
block_t *p_pkt;
int i_spu;
if( i_size <= 0 )
+ break;
+
+ if( i_size > p_end - p )
{
+ msg_Warn( p_demux, "broken PES size" );
break;
}
+
if( p[0] != 0 || p[1] != 0 || p[2] != 0x01 )
{
msg_Warn( p_demux, "invalid PES" );
if( p[3] != 0xbd )
{
- msg_Dbg( p_demux, "we don't need these ps packets (id=0x1%2.2x)", p[3] );
+ /* msg_Dbg( p_demux, "we don't need these ps packets (id=0x1%2.2x)", p[3] ); */
p += i_size;
continue;
}
continue;
}
i_spu = i_id&0x1f;
- msg_Dbg( p_demux, "SPU track %d size %d", i_spu, i_size );
+ /* msg_Dbg( p_demux, "SPU track %d size %d", i_spu, i_size ); */
- /* FIXME i_spu == determines which of the spu tracks we will show. */
- if( p_sys->es && i_spu == 0 )
+ for( i = 0; i < p_sys->i_tracks; i++ )
{
+ vobsub_track_t *p_tk = &p_sys->track[i];
+
p_pkt->i_dts = p_pkt->i_pts = p_bk->i_pts;
p_pkt->i_length = 0;
- es_out_Send( p_demux->out, p_sys->es, p_pkt );
- p_bk->i_pts = 0; /* only first packet has a pts */
+ if( p_tk->p_es && p_tk->i_track_id == i_spu )
+ {
+ es_out_Send( p_demux->out, p_tk->p_es, p_pkt );
+ p_bk->i_pts = VLC_TS_INVALID; /*only first packet has a pts */
+ break;
+ }
}
- else
+ if( i >= p_sys->i_tracks )
{
block_Release( p_pkt );
- continue;
}
}
return VLC_SUCCESS;
}
+
projects / vlc / blobdiff