X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fvobsub.c;h=86423ad0103e85aeff3beafb827350b493ae2bfd;hb=314f2f9409b347f3c3fae70ec851ae394f085aec;hp=cb7c462230b2e7d7d80c3cf04af8f83769bf0a09;hpb=4d7e35825e6fc2768e046c7dcdc637057ad89b24;p=vlc diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c index cb7c462230..86423ad010 100644 --- a/modules/demux/vobsub.c +++ b/modules/demux/vobsub.c @@ -1,7 +1,7 @@ /***************************************************************************** * subtitle.c: Demux vobsub files. ***************************************************************************** - * Copyright (C) 1999-2004 VideoLAN + * Copyright (C) 1999-2004 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -19,24 +19,25 @@ * * 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 -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include -#include -#include "vlc_video.h" +#include -#include "ps.h" +#include +#include +#include -#define MAX_LINE 8192 +#include "ps.h" +#include "vobsub.h" /***************************************************************************** * Module descriptor @@ -44,14 +45,16 @@ 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 ) - add_shortcut( "vobsub" ); -vlc_module_end(); + set_callbacks( Open, Close ) + + add_shortcut( "vobsub", "subtitle" ) +vlc_module_end () /***************************************************************************** * Prototypes: @@ -63,12 +66,10 @@ typedef struct int i_line; char **line; } text_t; -static int TextLoad( text_t *, stream_t *s ); -static void TextUnload( text_t * ); typedef struct { - mtime_t i_start; + int64_t i_start; int i_vobsub_location; } subtitle_t; @@ -77,31 +78,38 @@ 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 { - int64_t i_next_demux_date; - int64_t i_length; + int64_t i_next_demux_date; + int64_t i_length; + + text_t txt; + stream_t *p_vobsub_stream; - text_t txt; - FILE *p_vobsub_file; - /* all tracks */ - int i_tracks; - vobsub_track_t *track; - - int i_original_frame_width; - int i_original_frame_height; + 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 TextLoad( text_t *, stream_t *s ); +static void TextUnload( text_t * ); static int ParseVobSubIDX( demux_t * ); static int DemuxVobSub( demux_t *, block_t *); @@ -112,46 +120,45 @@ static int Open ( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; - 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->p_vobsub_file = NULL; - p_sys->i_tracks = 0; - p_sys->track = (vobsub_track_t*)malloc( sizeof( vobsub_track_t ) ); - p_sys->i_original_frame_width = -1; - p_sys->i_original_frame_height = -1; - - 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->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 ) ) + goto error; + 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 ); @@ -161,20 +168,49 @@ static int Open ( vlc_object_t *p_this ) /* Unload */ TextUnload( &p_sys->txt ); - int i_len = strlen( p_demux->psz_path ); - char *psz_vobname = strdup( p_demux->psz_path ); + /* Find the total length of the vobsubs */ + if( p_sys->i_tracks > 0 ) + { + for( int i = 0; i < p_sys->i_tracks; i++ ) + { + if( p_sys->track[i].i_subtitles > 1 ) + { + 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( asprintf( &psz_vobname, "%s://%s", p_demux->psz_access, p_demux->psz_location ) == -1 ) + goto error; - 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 ); + goto error; } free( psz_vobname ); + p_demux->pf_demux = Demux; + p_demux->pf_control = Control; + return VLC_SUCCESS; + +error: + /* Clean all subs from all tracks */ + for( int i = 0; i < p_sys->i_tracks; i++ ) + free( p_sys->track[i].p_subtitles ); + free( p_sys->track ); + free( p_sys ); + + return VLC_EGENERIC; } /***************************************************************************** @@ -185,13 +221,13 @@ static void Close( vlc_object_t *p_this ) demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys = p_demux->p_sys; - /* Clean all subs from all tracks - if( p_sys->subtitle ) - free( p_sys->subtitle ); -*/ - if( p_sys->p_vobsub_file ) - fclose( p_sys->p_vobsub_file ); + if( p_sys->p_vobsub_stream ) + stream_Delete( p_sys->p_vobsub_stream ); + /* Clean all subs from all tracks */ + for( int i = 0; i < p_sys->i_tracks; i++ ) + free( p_sys->track[i].p_subtitles ); + free( p_sys->track ); free( p_sys ); } @@ -202,79 +238,106 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { 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_current_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( i < p_sys->i_tracks && p_sys->track[i].i_current_subtitle < p_sys->track[i].i_subtitles ) { - *pi64 = p_sys->subtitle[p_sys->i_current_subtitle].i_start; + *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_current_subtitle = 0; - while( p_sys->i_current_subtitle < p_sys->i_subtitles && - p_sys->subtitle[p_sys->i_current_subtitle].i_start < i64 ) + for( i = 0; i < p_sys->i_tracks; i++ ) { - p_sys->i_current_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_current_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_current_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_current_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 { *pf = 0.0; - }*/ + } return VLC_SUCCESS; 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_current_subtitle = 0; - while( p_sys->i_current_subtitle < p_sys->i_subtitles && - p_sys->subtitle[p_sys->i_current_subtitle].i_start < i64 ) + for( i = 0; i < p_sys->i_tracks; i++ ) { - p_sys->i_current_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_current_subtitle >= p_sys->i_subtitles ) - return VLC_EGENERIC;*/ return VLC_SUCCESS; case DEMUX_SET_NEXT_DEMUX_TIME: p_sys->i_next_demux_date = (int64_t)va_arg( args, int64_t ); return VLC_SUCCESS; + case DEMUX_GET_PTS_DELAY: 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; } } @@ -286,13 +349,13 @@ static int Demux( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; int64_t i_maxdate; - int i; + int i_read; - for( i = 0; i < p_sys->i_tracks; i++ ) + for( int i = 0; i < p_sys->i_tracks; i++ ) { #define tk p_sys->track[i] if( tk.i_current_subtitle >= tk.i_subtitles ) - return 0; + continue; i_maxdate = p_sys->i_next_demux_date; if( i_maxdate <= 0 && tk.i_current_subtitle < tk.i_subtitles ) @@ -316,10 +379,10 @@ static int Demux( demux_t *p_demux ) 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 ) ) + if( stream_Seek( p_sys->p_vobsub_stream, i_pos ) ) { msg_Warn( p_demux, - "cannot seek at right vobsub location %d", i_pos ); + "cannot seek in the VobSub to the correct time %d", i_pos ); tk.i_current_subtitle++; continue; } @@ -332,17 +395,17 @@ static int Demux( demux_t *p_demux ) } /* 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 ) + 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 = tk.p_subtitles[tk.i_current_subtitle].i_start; + p_block->i_pts = VLC_TS_0 + tk.p_subtitles[tk.i_current_subtitle].i_start; /* demux this block */ DemuxVobSub( p_demux, p_block ); @@ -360,47 +423,41 @@ static int Demux( demux_t *p_demux ) 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++ ) - { + for( int i = 0; i < txt->i_line_count; i++ ) free( txt->line[i] ); - } free( txt->line ); + txt->i_line = 0; txt->i_line_count = 0; } @@ -418,7 +475,7 @@ static int ParseVobSubIDX( demux_t *p_demux ) demux_sys_t *p_sys = p_demux->p_sys; text_t *txt = &p_sys->txt; char *line; - vobsub_track_t *current_tk; + vobsub_track_t *current_tk = NULL; for( ;; ) { @@ -426,14 +483,16 @@ static int ParseVobSubIDX( demux_t *p_demux ) { return( VLC_EGENERIC ); } - - if( *line == 0 || *line == '\r' || *line == '\n' || *line == '#' ) + + if( *line == 0 || *line == '\r' || *line == '\n' || *line == '#' ) + { continue; + } else if( !strncmp( "size:", line, 5 ) ) { /* Store the original size of the video */ - if( sscanf( line, "size: %dx%d", - &p_sys->i_original_frame_width, &p_sys->i_original_frame_height ) == 2 ) + 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 ); } @@ -442,33 +501,53 @@ static int ParseVobSubIDX( demux_t *p_demux ) 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[20]; + char language[33]; /* Usually 2 or 3 letters, sometimes more. + Spec (or lack of) doesn't define any limit */ int i_track_id; es_format_t fmt; /* Lets start a new track */ - if( sscanf( line, "id: %s, index: %d", + if( sscanf( line, "id: %32[^ ,], index: %d", language, &i_track_id ) == 2 ) { p_sys->i_tracks++; - p_sys->track = (vobsub_track_t*)realloc( p_sys->track, sizeof( vobsub_track_t ) * (p_sys->i_tracks + 1 ) ); + p_sys->track = xrealloc( p_sys->track, + sizeof( vobsub_track_t ) * (p_sys->i_tracks + 1 ) ); /* 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 = NULL; + 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_FOURCC( 's','p','u',' ' ) ); + 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 = strdup( language ); - current_tk->p_es = es_out_Add( p_demux->out, &fmt ); + 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 @@ -479,22 +558,77 @@ static int ParseVobSubIDX( demux_t *p_demux ) else if( !strncmp( line, "timestamp:", 10 ) ) { /* - * timestamp: hh:mm:ss:mss, filepos: loc + * timestamp: [sign]hh:mm:ss:mss, filepos: loc * loc is the hex location of the spu in the .sub file - * */ - unsigned int h, m, s, ms, loc; - int i_start, i_location = 0; + int h, m, s, ms, count, loc = 0; + int i_sign = 1; + int64_t i_start, i_location = 0; - if( sscanf( line, "timestamp: %d:%d:%d:%d, filepos: %x", - &h, &m, &s, &ms, &loc ) == 5 ) + if( p_sys->i_tracks > 0 && + sscanf( line, "timestamp: %d%n:%d:%d:%d, filepos: %x", + &h, &count, &m, &s, &ms, &loc ) >= 5 ) { - i_start = ( (mtime_t)h * 3600*1000 + - (mtime_t)m * 60*1000 + - (mtime_t)s * 1000 + - (mtime_t)ms ) * 1000; + 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; - break; + + 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" ); } } } @@ -508,7 +642,7 @@ static int DemuxVobSub( demux_t *p_demux, block_t *p_bk ) 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; @@ -516,9 +650,14 @@ static int DemuxVobSub( demux_t *p_demux, block_t *p_bk ) 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" ); @@ -527,7 +666,7 @@ static int DemuxVobSub( demux_t *p_demux, block_t *p_bk ) 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; } @@ -545,28 +684,28 @@ static int DemuxVobSub( demux_t *p_demux, block_t *p_bk ) 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. */ for( i = 0; i < p_sys->i_tracks; i++ ) { -#define tk p_sys->track[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; - - if( tk.p_es && tk.i_track_id == i_id ) - { - es_out_Send( p_demux->out, tk.p_es, p_pkt ); - p_bk->i_pts = 0; /* only first packet has a pts */ - } - else + + if( p_tk->p_es && p_tk->i_track_id == i_spu ) { - block_Release( p_pkt ); - continue; + 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; } } -#undef tk + if( i >= p_sys->i_tracks ) + { + block_Release( p_pkt ); + } } return VLC_SUCCESS; } +