X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fvobsub.c;h=86423ad0103e85aeff3beafb827350b493ae2bfd;hb=314f2f9409b347f3c3fae70ec851ae394f085aec;hp=e6f6c7e797fbebfe2662c860c560b13c5acbdf14;hpb=174f75debc6ff4b0b3a7037bc21e7b77bfe2a9d8;p=vlc diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c index e6f6c7e797..86423ad010 100644 --- a/modules/demux/vobsub.c +++ b/modules/demux/vobsub.c @@ -25,25 +25,20 @@ /***************************************************************************** * Preamble *****************************************************************************/ + #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include -#include - -#include -#include #include +#include +#include #include -#include #include "ps.h" #include "vobsub.h" -#define MAX_LINE 8192 - /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -58,8 +53,7 @@ vlc_module_begin () set_callbacks( Open, Close ) - add_shortcut( "vobsub" ) - add_shortcut( "subtitle" ) + add_shortcut( "vobsub", "subtitle" ) vlc_module_end () /***************************************************************************** @@ -72,8 +66,6 @@ typedef struct int i_line; char **line; } text_t; -static int TextLoad( text_t *, stream_t *s ); -static void TextUnload( text_t * ); typedef struct { @@ -96,25 +88,28 @@ typedef struct 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; + stream_t *p_vobsub_stream; /* 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]; + 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 *); @@ -141,7 +136,6 @@ static int Open ( vlc_object_t *p_this ) return VLC_EGENERIC; } free( s ); - } else { @@ -149,13 +143,17 @@ static int Open ( vlc_object_t *p_this ) 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 = (vobsub_track_t *)malloc( sizeof( vobsub_track_t ) ); + 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; @@ -173,8 +171,7 @@ static int Open ( vlc_object_t *p_this ) /* Find the total length of the vobsubs */ if( p_sys->i_tracks > 0 ) { - int i; - for( i = 0; i < p_sys->i_tracks; i++ ) + for( int i = 0; i < p_sys->i_tracks; i++ ) { if( p_sys->track[i].i_subtitles > 1 ) { @@ -184,11 +181,9 @@ static int Open ( vlc_object_t *p_this ) } } - if( asprintf( &psz_vobname, "%s://%s", p_demux->psz_access, p_demux->psz_path ) == -1 ) - { - free( p_sys ); - return VLC_EGENERIC; - } + if( asprintf( &psz_vobname, "%s://%s", p_demux->psz_access, p_demux->psz_location ) == -1 ) + goto error; + i_len = strlen( psz_vobname ); if( i_len >= 4 ) memcpy( psz_vobname + i_len - 4, ".sub", 4 ); @@ -199,12 +194,23 @@ static int Open ( vlc_object_t *p_this ) msg_Err( p_demux, "couldn't open .sub Vobsub file: %s", psz_vobname ); free( psz_vobname ); - free( p_sys ); - return VLC_EGENERIC; + 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; } /***************************************************************************** @@ -212,19 +218,16 @@ static int Open ( vlc_object_t *p_this ) *****************************************************************************/ 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; - /* Clean all subs from all tracks */ - for( i = 0; i < p_sys->i_tracks; i++ ) - free( p_sys->track[i].p_subtitles ); - - free( p_sys->track ); - 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 ); } @@ -324,6 +327,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) 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: @@ -345,9 +349,9 @@ static int Demux( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; int64_t i_maxdate; - int i, i_read; + 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 ) @@ -401,7 +405,7 @@ static int Demux( demux_t *p_demux ) 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 ); @@ -450,12 +454,10 @@ static int TextLoad( text_t *txt, stream_t *s ) 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; } @@ -513,30 +515,32 @@ static int ParseVobSubIDX( demux_t *p_demux ) } 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: %2s, index: %d", + if( sscanf( line, "id: %32[^ ,], index: %d", language, &i_track_id ) == 2 ) { p_sys->i_tracks++; - p_sys->track = 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 = malloc( sizeof( subtitle_t ) );; + 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 = strdup( language ); + fmt.psz_language = language; if( p_sys->b_palette ) { fmt.subs.spu.palette[0] = 0xBeef; @@ -580,7 +584,9 @@ static int ParseVobSubIDX( demux_t *p_demux ) i_location = loc; current_tk->i_subtitles++; - current_tk->p_subtitles = realloc( current_tk->p_subtitles, sizeof( subtitle_t ) * (current_tk->i_subtitles + 1 ) ); + 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; @@ -617,9 +623,8 @@ static int ParseVobSubIDX( demux_t *p_demux ) ms ) * 1000; current_tk->i_delay = current_tk->i_delay + (i_gap * i_sign); - msg_Dbg( p_demux, "sign: %+d gap: %+lld global delay: %+lld", - i_sign, (long long)i_gap, - (long long)current_tk->i_delay ); + msg_Dbg( p_demux, "sign: %+d gap: %+"PRId64" global delay: %+"PRId64"", + i_sign, i_gap, current_tk->i_delay ); } else { @@ -691,7 +696,7 @@ static int DemuxVobSub( demux_t *p_demux, block_t *p_bk ) 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 = 0; /*only first packet has a pts */ + p_bk->i_pts = VLC_TS_INVALID; /*only first packet has a pts */ break; } }