X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fvobsub.c;h=86423ad0103e85aeff3beafb827350b493ae2bfd;hb=66e45812305c60b92e2ea4ff99b130a2cb829320;hp=208284217b5f22acf404ce2dd61c3a34f2b7029f;hpb=d63b17d13ef0d76acda28c714c6299df44ffa6fc;p=vlc diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c index 208284217b..86423ad010 100644 --- a/modules/demux/vobsub.c +++ b/modules/demux/vobsub.c @@ -25,23 +25,20 @@ /***************************************************************************** * Preamble *****************************************************************************/ + #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include -#include - -#include #include +#include +#include #include #include "ps.h" #include "vobsub.h" -#define MAX_LINE 8192 - /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -69,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 { @@ -93,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 *); @@ -138,7 +136,6 @@ static int Open ( vlc_object_t *p_this ) return VLC_EGENERIC; } free( s ); - } else { @@ -146,20 +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 = malloc( sizeof( vobsub_track_t ) ); if( unlikely( !p_sys->track ) ) - { - free( p_sys ); - return VLC_ENOMEM; - } + goto error; p_sys->i_original_frame_width = -1; p_sys->i_original_frame_height = -1; p_sys->b_palette = false; @@ -177,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 ) { @@ -188,12 +181,9 @@ static int Open ( vlc_object_t *p_this ) } } - if( asprintf( &psz_vobname, "%s://%s", p_demux->psz_access, - p_demux->psz_location ) == -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 ); @@ -204,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; } /***************************************************************************** @@ -217,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 ); } @@ -329,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: @@ -350,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 ) @@ -455,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; } @@ -518,25 +515,25 @@ static int ParseVobSubIDX( demux_t *p_demux ) } else if( !strncmp( "id:", line, 3 ) ) { - char language[3]; + 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 = 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->p_subtitles = xmalloc( sizeof( subtitle_t ) ); current_tk->i_track_id = i_track_id; current_tk->i_delay = (int64_t)0;