#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <errno.h>
#include <sys/types.h>
#include <limits.h>
#include <vlc_demux.h>
-#include <vlc_charset.h>
#include "ps.h"
#include "vobsub.h"
set_callbacks( Open, Close )
- add_shortcut( "vobsub" )
- add_shortcut( "subtitle" )
+ add_shortcut( "vobsub", "subtitle" )
vlc_module_end ()
/*****************************************************************************
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 ) )
+ {
+ 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;
}
}
- if( asprintf( &psz_vobname, "%s://%s", p_demux->psz_access, p_demux->psz_path ) == -1 )
+ if( asprintf( &psz_vobname, "%s://%s", p_demux->psz_access,
+ p_demux->psz_location ) == -1 )
{
free( p_sys );
return VLC_EGENERIC;
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 );
}
else if( !strncmp( "id:", line, 3 ) )
{
- char language[20];
+ char language[3];
int i_track_id;
es_format_t fmt;
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 ) );
+ 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 = 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;
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;
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
{
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;
}
}