/*****************************************************************************
* Preamble
*****************************************************************************/
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <assert.h>
+#include <limits.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_memory.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"
-#define MAX_LINE 8192
-
/*****************************************************************************
* Module descriptor
*****************************************************************************/
set_callbacks( Open, Close )
- add_shortcut( "vobsub" )
- add_shortcut( "subtitle" )
+ add_shortcut( "vobsub", "subtitle" )
vlc_module_end ()
/*****************************************************************************
int i_line;
char **line;
} text_t;
-static int TextLoad( text_t *, stream_t *s );
-static void TextUnload( text_t * );
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 *);
return VLC_EGENERIC;
}
free( s );
-
}
else
{
return VLC_EGENERIC;
}
- p_demux->pf_demux = Demux;
- p_demux->pf_control = Control;
+ /* */
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
- assert( p_sys );
+ 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 ) );
- assert( p_sys->track );
+ 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;
/* 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 )
{
}
}
- 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 );
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;
}
/*****************************************************************************
*****************************************************************************/
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 );
}
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:
{
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 )
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 );
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;
}
}
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 = realloc_or_free( p_sys->track,
+ p_sys->track = xrealloc( p_sys->track,
sizeof( vobsub_track_t ) * (p_sys->i_tracks + 1 ) );
- assert( p_sys->track );
- 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 ) );;
- assert( current_tk->p_subtitles );
+ current_tk->p_subtitles = xmalloc( sizeof( subtitle_t ) );
current_tk->i_track_id = i_track_id;
current_tk->i_delay = (int64_t)0;
current_tk->i_subtitles++;
current_tk->p_subtitles =
- realloc_or_free( current_tk->p_subtitles,
+ xrealloc( current_tk->p_subtitles,
sizeof( subtitle_t ) * (current_tk->i_subtitles + 1 ) );
- assert( current_tk->p_subtitles );
current_sub = ¤t_tk->p_subtitles[current_tk->i_subtitles - 1];
current_sub->i_start = i_start * i_sign;
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;
}
}
projects / vlc / blobdiff