/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <errno.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+
#include <sys/types.h>
+#include <limits.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "vlc_video.h"
+#include <vlc_demux.h>
#include "ps.h"
+#include "vobsub.h"
#define MAX_LINE 8192
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_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_DEMUX );
- set_capability( "demux2", 1 );
-
- 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" );
- add_shortcut( "subtitle" );
-vlc_module_end();
+ set_callbacks( Open, Close )
+
+ add_shortcut( "vobsub", "subtitle" )
+vlc_module_end ()
/*****************************************************************************
* Prototypes:
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_length;
text_t txt;
- FILE *p_vobsub_file;
-
+ stream_t *p_vobsub_stream;
+
/* all tracks */
int i_tracks;
vobsub_track_t *track;
-
+
int i_original_frame_width;
int i_original_frame_height;
- vlc_bool_t b_palette;
+ bool b_palette;
uint32_t palette[16];
};
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_file = NULL;
+ 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 = VLC_FALSE;
+ p_sys->b_palette = false;
memset( p_sys->palette, 0, 16 * sizeof( uint32_t ) );
/* Load the whole file */
}
}
- psz_vobname = ToLocale( p_demux->psz_path );
+ if( asprintf( &psz_vobname, "%s://%s", p_demux->psz_access, p_demux->psz_path ) == -1 )
+ {
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
i_len = strlen( psz_vobname );
-
- strcpy( psz_vobname + i_len - 4, ".sub" );
+ 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 );
free( p_sys );
- LocaleFree( psz_vobname );
return VLC_EGENERIC;
}
- LocaleFree( psz_vobname );
+ free( psz_vobname );
return VLC_SUCCESS;
}
/* Clean all subs from all tracks */
for( i = 0; i < p_sys->i_tracks; i++ )
- {
- if( p_sys->track[i].p_subtitles ) free( p_sys->track[i].p_subtitles );
- }
- if( p_sys->track ) free( p_sys->track );
-
- if( p_sys->p_vobsub_file )
- fclose( p_sys->p_vobsub_file );
+ free( p_sys->track[i].p_subtitles );
+
+ free( p_sys->track );
+
+ if( p_sys->p_vobsub_stream )
+ stream_Delete( p_sys->p_vobsub_stream );
free( p_sys );
}
pi64 = (int64_t*)va_arg( args, int64_t * );
for( i = 0; i < p_sys->i_tracks; i++ )
{
- vlc_bool_t b_selected;
+ 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 );
pf = (double*)va_arg( args, double * );
for( i = 0; i < p_sys->i_tracks; i++ )
{
- vlc_bool_t b_selected;
+ 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 );
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;
}
}
{
demux_sys_t *p_sys = p_demux->p_sys;
int64_t i_maxdate;
- int i;
+ int i, i_read;
for( i = 0; i < p_sys->i_tracks; i++ )
{
if( tk.i_current_subtitle >= tk.i_subtitles )
continue;
- i_maxdate = (int64_t) p_sys->i_next_demux_date;
+ i_maxdate = p_sys->i_next_demux_date;
if( i_maxdate <= 0 && tk.i_current_subtitle < tk.i_subtitles )
{
/* Should not happen */
- i_maxdate = (int64_t) tk.p_subtitles[tk.i_current_subtitle].i_start + 1;
+ i_maxdate = tk.p_subtitles[tk.i_current_subtitle].i_start + 1;
}
while( tk.i_current_subtitle < tk.i_subtitles &&
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;
}
}
/* 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 );
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 )
- {
- if( txt->line ) 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++ )
- {
- if( txt->line[i] ) free( txt->line[i] );
- }
- if( txt->line ) free( txt->line );
+ free( txt->line[i] );
+
+ free( txt->line );
txt->i_line = 0;
txt->i_line_count = 0;
}
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( ;; )
{
{
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 );
}
}
else if( !strncmp( "palette:", line, 8 ) )
{
- int i;
-
- /* Store the palette of the subs */
- if( sscanf( line, "palette: %x, %x, %x, %x, %x, %x, %x, %x, %x, %x, %x, %x, %x, %x, %x, %x",
- &p_sys->palette[0], &p_sys->palette[1], &p_sys->palette[2], &p_sys->palette[3],
- &p_sys->palette[4], &p_sys->palette[5], &p_sys->palette[6], &p_sys->palette[7],
- &p_sys->palette[8], &p_sys->palette[9], &p_sys->palette[10], &p_sys->palette[11],
- &p_sys->palette[12], &p_sys->palette[13], &p_sys->palette[14], &p_sys->palette[15] ) == 16 )
+ if( vobsub_palette_parse( line, p_sys->palette ) == VLC_SUCCESS )
{
- for( i = 0; i < 16; i++ )
- {
- uint8_t r = 0, g = 0, b = 0;
- uint8_t y = 0, u = 0, v = 0;
- r = (p_sys->palette[i] >> 16) & 0xff;
- g = (p_sys->palette[i] >> 8) & 0xff;
- b = (p_sys->palette[i] >> 0) & 0xff;
- /* msg_Dbg( p_demux, "palette %d: R=%x, G=%x, B=%x", i, r, g, b ); */
- y = (uint8_t) __MIN(abs(r * 2104 + g * 4130 + b * 802 + 4096 + 131072) >> 13, 235);
- u = (uint8_t) __MIN(abs(r * -1214 + g * -2384 + b * 3598 + 4096 + 1048576) >> 13, 240);
- v = (uint8_t) __MIN(abs(r * 3598 + g * -3013 + b * -585 + 4096 + 1048576) >> 13, 240);
- p_sys->palette[i] = 0;
- p_sys->palette[i] |= (y&0xff)<<16;
- p_sys->palette[i] |= (u&0xff);
- p_sys->palette[i] |= (v&0xff)<<8;
- /* msg_Dbg( p_demux, "palette %d: y=%x, u=%x, v=%x", i, y, u, v ); */
-
- }
- p_sys->b_palette = VLC_TRUE;
+ p_sys->b_palette = true;
msg_Dbg( p_demux, "vobsub palette read" );
}
else
}
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 = (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 ) );
+ 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 = (subtitle_t*)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_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 );
+ fmt.psz_language = language;
if( p_sys->b_palette )
{
fmt.subs.spu.palette[0] = 0xBeef;
int h, m, s, ms, count, loc = 0;
int i_sign = 1;
int64_t i_start, i_location = 0;
-
- vobsub_track_t *current_tk = &p_sys->track[p_sys->i_tracks - 1];
- if( sscanf( line, "timestamp: %d%n:%d:%d:%d, filepos: %x",
+ if( p_sys->i_tracks > 0 &&
+ sscanf( line, "timestamp: %d%n:%d:%d:%d, filepos: %x",
&h, &count, &m, &s, &ms, &loc ) >= 5 )
{
+ vobsub_track_t *current_tk = &p_sys->track[p_sys->i_tracks - 1];
subtitle_t *current_sub;
if( line[count-3] == '-' )
s * 1000 +
ms ) * 1000;
i_location = loc;
-
+
current_tk->i_subtitles++;
- current_tk->p_subtitles = (subtitle_t*)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 = (int64_t) i_start * i_sign;
+
+ 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 ) )
{
int i_sign = 1;
int64_t i_gap = 0;
- vobsub_track_t *current_tk = &p_sys->track[p_sys->i_tracks - 1];
-
- if( sscanf( line, "%*celay: %d%n:%d:%d:%d",
+ 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;
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, i_gap, current_tk->i_delay );
+ 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" );
}
}
}
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;
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" );
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_spu )
+
+ if( p_tk->p_es && p_tk->i_track_id == i_spu )
{
- es_out_Send( p_demux->out, tk.p_es, p_pkt );
- p_bk->i_pts = 0; /*only first packet has a pts */
+ 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;
}
- else if( i == p_sys->i_tracks - 1 )
- {
- block_Release( p_pkt );
- }
-#undef tk
+ }
+ if( i >= p_sys->i_tracks )
+ {
+ block_Release( p_pkt );
}
}
return VLC_SUCCESS;
}
+
projects / vlc / blobdiff