#include <vlc_charset.h>
#include <vlc_fs.h>
#include <vlc_strings.h>
+#include <vlc_modules.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
*****************************************************************************/
static void Destructor( input_thread_t * p_input );
-static void *Run ( vlc_object_t *p_this );
+static void *Run ( void * );
static input_thread_t * Create ( vlc_object_t *, input_item_t *,
const char *, bool, input_resource_t * );
static int UpdateTitleSeekpointFromDemux( input_thread_t * );
static void UpdateGenericFromDemux( input_thread_t * );
-static void MRLSections( input_thread_t *, char *, int *, int *, int *, int *);
+static void MRLSections( const char *, int *, int *, int *, int *);
static input_source_t *InputSourceNew( input_thread_t *);
static int InputSourceInit( input_thread_t *, input_source_t *,
- const char *, const char *psz_forced_demux );
+ const char *, const char *psz_forced_demux,
+ bool b_in_can_fail );
static void InputSourceClean( input_source_t * );
static void InputSourceMeta( input_thread_t *, input_source_t *, vlc_meta_t * );
static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment,
int i_new, input_attachment_t **pp_new );
-static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_forced );
+enum {
+ SUB_NOFLAG = 0x00,
+ SUB_FORCED = 0x01,
+ SUB_CANFAIL = 0x02,
+};
+static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, unsigned i_flags );
static void input_ChangeState( input_thread_t *p_input, int i_state ); /* TODO fix name */
-/* Do not let a pts_delay from access/demux go beyong 60s */
-#define INPUT_PTS_DELAY_MAX INT64_C(60000000)
-
#undef input_Create
/**
* Create a new input_thread_t.
int input_Start( input_thread_t *p_input )
{
/* Create thread and wait for its readiness. */
- if( vlc_thread_create( p_input, "input", Run,
- VLC_THREAD_PRIORITY_INPUT ) )
+ p_input->p->is_running = !vlc_clone( &p_input->p->thread,
+ Run, p_input, VLC_THREAD_PRIORITY_INPUT );
+ if( !p_input->p->is_running )
{
input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
}
-input_resource_t *input_DetachResource( input_thread_t *p_input )
+void input_Join( input_thread_t *p_input )
{
- assert( p_input->b_dead );
-
- input_resource_SetInput( p_input->p->p_resource, NULL );
+ if( p_input->p->is_running )
+ vlc_join( p_input->p->thread, NULL );
+}
- input_resource_t *p_resource = input_resource_Detach( p_input->p->p_resource );
- p_input->p->p_sout = NULL;
+void input_Release( input_thread_t *p_input )
+{
+ vlc_object_release( p_input );
+}
- return p_resource;
+/**
+ * Close an input
+ *
+ * It does not call input_Stop itself.
+ */
+void input_Close( input_thread_t *p_input )
+{
+ input_Join( p_input );
+ input_Release( p_input );
}
/**
static void ObjectKillChildrens( input_thread_t *p_input, vlc_object_t *p_obj )
{
vlc_list_t *p_list;
- int i;
/* FIXME ObjectKillChildrens seems a very bad idea in fact */
- i = vlc_internals( p_obj )->i_object_type;
- if( i == VLC_OBJECT_VOUT ||i == VLC_OBJECT_AOUT ||
- p_obj == VLC_OBJECT(p_input->p->p_sout) ||
- i == VLC_OBJECT_DECODER )
+ if( p_obj == VLC_OBJECT(p_input->p->p_sout) )
return;
vlc_object_kill( p_obj );
p_list = vlc_list_children( p_obj );
- for( i = 0; i < p_list->i_count; i++ )
+ for( int i = 0; i < p_list->i_count; i++ )
ObjectKillChildrens( p_input, p_list->p_values[i].p_object );
vlc_list_release( p_list );
}
const char *psz_header, bool b_quick,
input_resource_t *p_resource )
{
- static const char input_name[] = "input";
input_thread_t *p_input = NULL; /* thread descriptor */
int i;
/* Allocate descriptor */
- p_input = vlc_custom_create( p_parent, sizeof( *p_input ),
- VLC_OBJECT_INPUT, input_name );
+ p_input = vlc_custom_create( p_parent, sizeof( *p_input ), "input" );
if( p_input == NULL )
return NULL;
- vlc_object_attach( p_input, p_parent );
-
/* Construct a nice name for the input timer */
char psz_timer_name[255];
char * psz_name = input_item_GetName( p_item );
if( !p_input->p )
return NULL;
+ /* Parse input options */
+ vlc_mutex_lock( &p_item->lock );
+ assert( (int)p_item->optflagc == p_item->i_options );
+ for( i = 0; i < p_item->i_options; i++ )
+ var_OptionParse( VLC_OBJECT(p_input), p_item->ppsz_options[i],
+ !!(p_item->optflagv[i] & VLC_INPUT_OPTION_TRUSTED) );
+ vlc_mutex_unlock( &p_item->lock );
+
p_input->b_preparsing = b_quick;
p_input->psz_header = psz_header ? strdup( psz_header ) : NULL;
p_input->p->title = NULL;
p_input->p->i_title_offset = p_input->p->i_seekpoint_offset = 0;
p_input->p->i_state = INIT_S;
- p_input->p->i_rate = INPUT_RATE_DEFAULT
- / var_CreateGetFloat( p_input, "rate" );
- /* Currently, the input rate variable is an integer. So we need to destroy
- * the float variable inherited from the configuration. */
- var_Destroy( p_input, "rate" );
+ p_input->p->i_rate = INPUT_RATE_DEFAULT;
p_input->p->b_recording = false;
memset( &p_input->p->bookmark, 0, sizeof(p_input->p->bookmark) );
TAB_INIT( p_input->p->i_bookmark, p_input->p->pp_bookmark );
/* */
if( p_resource )
- p_input->p->p_resource = p_resource;
+ {
+ p_input->p->p_resource_private = NULL;
+ p_input->p->p_resource = input_resource_Hold( p_resource );
+ }
else
- p_input->p->p_resource = input_resource_New();
+ {
+ p_input->p->p_resource_private = input_resource_New( VLC_OBJECT( p_input ) );
+ p_input->p->p_resource = input_resource_Hold( p_input->p->p_resource_private );
+ }
input_resource_SetInput( p_input->p->p_resource, p_input );
/* Init control buffer */
vlc_cond_init( &p_input->p->wait_control );
p_input->p->i_control = 0;
p_input->p->b_abort = false;
-
- /* Parse input options */
- vlc_mutex_lock( &p_item->lock );
- assert( (int)p_item->optflagc == p_item->i_options );
- for( i = 0; i < p_item->i_options; i++ )
- var_OptionParse( VLC_OBJECT(p_input), p_item->ppsz_options[i],
- !!(p_item->optflagv[i] & VLC_INPUT_OPTION_TRUSTED) );
- vlc_mutex_unlock( &p_item->lock );
+ p_input->p->is_running = false;
/* Create Object Variables for private use only */
input_ConfigVarInit( p_input );
es_out_Delete( p_input->p->p_es_out_display );
if( p_input->p->p_resource )
- input_resource_Delete( p_input->p->p_resource );
+ input_resource_Release( p_input->p->p_resource );
+ if( p_input->p->p_resource_private )
+ input_resource_Release( p_input->p->p_resource_private );
vlc_gc_decref( p_input->p->p_item );
* This is the "normal" thread that spawns the input processing chain,
* reads the stream, cleans up and waits
*****************************************************************************/
-static void *Run( vlc_object_t *p_this )
+static void *Run( void *obj )
{
- input_thread_t *p_input = (input_thread_t *)p_this;
+ input_thread_t *p_input = (input_thread_t *)obj;
const int canc = vlc_savecancel();
if( Init( p_input ) )
{
msg_Dbg( p_input, "EOF reached" );
p_input->p->input.b_eof = true;
+ es_out_Eos(p_input->p->p_es_out);
}
else if( i_ret < 0 )
{
val.i_int = PAUSE_S;
Control( p_input, INPUT_CONTROL_SET_STATE, val );
- b_pause_after_eof = false;
b_paused = true;
}
else
break;
}
+#ifndef NDEBUG
msg_Dbg( p_input, "control type=%d", i_type );
+#endif
if( Control( p_input, i_type, val ) )
{
if( p_input->b_preparsing )
return;
+ vlc_mutex_lock( &p_input->p->p_item->lock );
/* Create global title (from master) */
p_input->p->i_title = p_master->i_title;
p_input->p->title = p_master->title;
p_input->p->b_can_pace_control = p_master->b_can_pace_control;
p_input->p->b_can_pause = p_master->b_can_pause;
p_input->p->b_can_rate_control = p_master->b_can_rate_control;
+ vlc_mutex_unlock( &p_input->p->p_item->lock );
}
static void StartTitle( input_thread_t * p_input )
var_SetTime( p_input, "spu-delay", (mtime_t)i_delay * 100000 );
/* Look for and add subtitle files */
- bool b_forced = true;
+ unsigned i_flags = SUB_FORCED;
char *psz_subtitle = var_GetNonEmptyString( p_input, "sub-file" );
if( psz_subtitle != NULL )
{
msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle );
- SubtitleAdd( p_input, psz_subtitle, b_forced );
- b_forced = false;
+ SubtitleAdd( p_input, psz_subtitle, i_flags );
+ i_flags = SUB_NOFLAG;
}
if( var_GetBool( p_input, "sub-autodetect-file" ) )
{
if( !psz_subtitle || strcmp( psz_subtitle, ppsz_subs[i] ) )
{
- SubtitleAdd( p_input, ppsz_subs[i], b_forced );
- b_forced = false;
+ i_flags |= SUB_CANFAIL;
+ SubtitleAdd( p_input, ppsz_subs[i], i_flags );
+ i_flags = SUB_NOFLAG;
}
free( ppsz_subs[i] );
{
var_SetString( p_input, "sub-description", a->psz_description ? a->psz_description : "");
- SubtitleAdd( p_input, psz_mrl, b_forced );
+ SubtitleAdd( p_input, psz_mrl, i_flags );
- b_forced = false;
+ i_flags = SUB_NOFLAG;
free( psz_mrl );
}
vlc_input_attachment_Delete( a );
if( *psz == 0 )
break;
- msg_Dbg( p_input, "adding slave input '%s'", psz );
+ char *uri = make_URI( psz, NULL );
+ psz = psz_delim;
+ if( uri == NULL )
+ continue;
+ msg_Dbg( p_input, "adding slave input '%s'", uri );
input_source_t *p_slave = InputSourceNew( p_input );
- if( p_slave && !InputSourceInit( p_input, p_slave, psz, NULL ) )
+ if( p_slave && !InputSourceInit( p_input, p_slave, uri, NULL, false ) )
TAB_APPEND( p_input->p->i_slave, p_input->p->slave, p_slave );
else
free( p_slave );
-
- psz = psz_delim;
+ free( uri );
}
free( psz_org );
}
const int i_cr_average = var_GetInteger( p_input, "cr-average" ) * i_pts_delay / DEFAULT_PTS_DELAY;
/* */
- es_out_SetJitter( p_input->p->p_es_out, i_pts_delay, i_cr_average );
+ es_out_SetDelay( p_input->p->p_es_out_display, AUDIO_ES, i_audio_delay );
+ es_out_SetDelay( p_input->p->p_es_out_display, SPU_ES, i_spu_delay );
+ es_out_SetJitter( p_input->p->p_es_out, i_pts_delay, 0, i_cr_average );
}
static void InitPrograms( input_thread_t * p_input )
{
int i_es_out_mode;
- vlc_value_t val;
+ vlc_list_t list;
/* Compute correct pts_delay */
UpdatePtsDelay( p_input );
i_es_out_mode = ES_OUT_MODE_AUTO;
if( p_input->p->p_sout )
{
+ char *prgms;
+
if( var_GetBool( p_input, "sout-all" ) )
{
i_es_out_mode = ES_OUT_MODE_ALL;
}
else
+ if( (prgms = var_GetNonEmptyString( p_input, "programs" )) != NULL )
{
- var_Get( p_input, "programs", &val );
- if( val.p_list && val.p_list->i_count )
+ char *buf;
+
+ TAB_INIT( list.i_count, list.p_values );
+ for( const char *prgm = strtok_r( prgms, ",", &buf );
+ prgm != NULL;
+ prgm = strtok_r( NULL, ",", &buf ) )
{
+ vlc_value_t val = { .i_int = atoi( prgm ) };
+ INSERT_ELEM( list.p_values, list.i_count, list.i_count, val );
+ }
+
+ if( list.i_count > 0 )
i_es_out_mode = ES_OUT_MODE_PARTIAL;
/* Note : we should remove the "program" callback. */
- }
- else
- {
- var_FreeList( &val, NULL );
- }
+
+ free( prgms );
}
}
es_out_SetMode( p_input->p->p_es_out, i_es_out_mode );
else if( i_es_out_mode == ES_OUT_MODE_PARTIAL )
{
demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1,
- val.p_list );
+ &list );
+ TAB_CLEAN( list.i_count, list.p_values );
}
else
{
demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP,
- (int) var_GetInteger( p_input, "program" ), NULL );
+ es_out_GetGroupForced( p_input->p->p_es_out ), NULL );
}
}
/* */
if( InputSourceInit( p_input, &p_input->p->input,
- p_input->p->p_item->psz_uri, NULL ) )
+ p_input->p->p_item->psz_uri, NULL, false ) )
{
goto error;
}
LoadSubtitles( p_input );
LoadSlaves( p_input );
InitPrograms( p_input );
+
+ double f_rate = var_InheritFloat( p_input, "rate" );
+ if( f_rate != 0.0 && f_rate != 1.0 )
+ {
+ vlc_value_t val = { .i_int = INPUT_RATE_DEFAULT / f_rate };
+ input_ControlPush( p_input, INPUT_CONTROL_SET_RATE, &val );
+ }
}
if( !p_input->b_preparsing && p_input->p->p_sout )
{
/* We don't want a high input priority here or we'll
* end-up sucking up all the CPU time */
- vlc_thread_set_priority( p_input, VLC_THREAD_PRIORITY_LOW );
+ vlc_set_priority( p_input->p->thread, VLC_THREAD_PRIORITY_LOW );
}
msg_Dbg( p_input, "starting in %s mode",
input_resource_RequestSout( p_input->p->p_resource,
p_input->p->p_sout, NULL );
input_resource_SetInput( p_input->p->p_resource, NULL );
+ if( p_input->p->p_resource_private )
+ input_resource_Terminate( p_input->p->p_resource_private );
}
if( !p_input->b_preparsing && libvlc_stats( p_input ) )
input_resource_RequestSout( p_input->p->p_resource,
p_input->p->p_sout, NULL );
input_resource_SetInput( p_input->p->p_resource, NULL );
+ if( p_input->p->p_resource_private )
+ input_resource_Terminate( p_input->p->p_resource_private );
}
/*****************************************************************************
break;
case INPUT_CONTROL_SET_RATE:
- case INPUT_CONTROL_SET_RATE_SLOWER:
- case INPUT_CONTROL_SET_RATE_FASTER:
{
- int i_rate;
- int i_rate_sign;
-
/* Get rate and direction */
- if( i_type == INPUT_CONTROL_SET_RATE )
- {
- i_rate = abs( val.i_int );
- i_rate_sign = val.i_int < 0 ? -1 : 1;
- }
- else
- {
- static const int ppi_factor[][2] = {
- {1,64}, {1,32}, {1,16}, {1,8}, {1,4}, {1,3}, {1,2}, {2,3},
- {1,1},
- {3,2}, {2,1}, {3,1}, {4,1}, {8,1}, {16,1}, {32,1}, {64,1},
- {0,0}
- };
- int i_error;
- int i_idx;
- int i;
-
- i_rate_sign = p_input->p->i_rate < 0 ? -1 : 1;
-
- i_error = INT_MAX;
- i_idx = -1;
- for( i = 0; ppi_factor[i][0] != 0; i++ )
- {
- const int i_test_r = INPUT_RATE_DEFAULT * ppi_factor[i][0] / ppi_factor[i][1];
- const int i_test_e = abs( abs( p_input->p->i_rate ) - i_test_r );
- if( i_test_e < i_error )
- {
- i_idx = i;
- i_error = i_test_e;
- }
- }
-
- assert( i_idx >= 0 && ppi_factor[i_idx][0] != 0 );
-
- if( i_type == INPUT_CONTROL_SET_RATE_SLOWER )
- {
- if( ppi_factor[i_idx+1][0] > 0 )
- i_rate = INPUT_RATE_DEFAULT * ppi_factor[i_idx+1][0] / ppi_factor[i_idx+1][1];
- else
- i_rate = INPUT_RATE_MAX+1;
- }
- else
- {
- assert( i_type == INPUT_CONTROL_SET_RATE_FASTER );
- if( i_idx > 0 )
- i_rate = INPUT_RATE_DEFAULT * ppi_factor[i_idx-1][0] / ppi_factor[i_idx-1][1];
- else
- i_rate = INPUT_RATE_MIN-1;
- }
- }
+ int i_rate = abs( val.i_int );
+ int i_rate_sign = val.i_int < 0 ? -1 : 1;
/* Check rate bound */
if( i_rate < INPUT_RATE_MIN )
break;
case INPUT_CONTROL_SET_AUDIO_DELAY:
- if( !es_out_SetDelay( p_input->p->p_es_out_display, AUDIO_ES, val.i_time ) )
- {
- input_SendEventAudioDelay( p_input, val.i_time );
- UpdatePtsDelay( p_input );
- }
+ input_SendEventAudioDelay( p_input, val.i_time );
+ UpdatePtsDelay( p_input );
break;
case INPUT_CONTROL_SET_SPU_DELAY:
- if( !es_out_SetDelay( p_input->p->p_es_out_display, SPU_ES, val.i_time ) )
- {
- input_SendEventSubtitleDelay( p_input, val.i_time );
- UpdatePtsDelay( p_input );
- }
+ input_SendEventSubtitleDelay( p_input, val.i_time );
+ UpdatePtsDelay( p_input );
break;
case INPUT_CONTROL_SET_TITLE:
case INPUT_CONTROL_ADD_SLAVE:
if( val.psz_string )
{
+ char *uri = make_URI( val.psz_string, NULL );
+ if( uri == NULL )
+ break;
+
input_source_t *slave = InputSourceNew( p_input );
- if( slave && !InputSourceInit( p_input, slave, val.psz_string, NULL ) )
+ if( slave && !InputSourceInit( p_input, slave, uri, NULL, false ) )
{
vlc_meta_t *p_meta;
int64_t i_time;
/* Add the slave */
- msg_Dbg( p_input, "adding %s as slave on the fly",
- val.psz_string );
+ msg_Dbg( p_input, "adding %s as slave on the fly", uri );
/* Set position */
if( demux_Control( p_input->p->input.p_demux,
else
{
free( slave );
- msg_Warn( p_input, "failed to add %s as slave",
- val.psz_string );
+ msg_Warn( p_input, "failed to add %s as slave", uri );
}
+ free( uri );
}
break;
if( bookmark.i_time_offset < 0 && bookmark.i_byte_offset < 0 )
{
- msg_Err( p_input, "invalid bookmark %d", val.i_int );
+ msg_Err( p_input, "invalid bookmark %"PRId64, val.i_int );
break;
}
p_input->p->input.p_stream )
{
const uint64_t i_size = stream_Size( p_input->p->input.p_stream );
- if( i_size > 0 && bookmark.i_byte_offset <= i_size )
+ if( i_size > 0 && (uint64_t)bookmark.i_byte_offset <= i_size )
{
val.f_float = (double)bookmark.i_byte_offset / i_size;
b_force_update = Control( p_input, INPUT_CONTROL_SET_POSITION, val );
*****************************************************************************/
static int InputSourceInit( input_thread_t *p_input,
input_source_t *in, const char *psz_mrl,
- const char *psz_forced_demux )
+ const char *psz_forced_demux, bool b_in_can_fail )
{
- const char *psz_access;
- const char *psz_demux;
- char *psz_path;
+ const char *psz_access, *psz_demux, *psz_path, *psz_anchor;
char *psz_var_demux = NULL;
double f_fps;
goto error;
/* Split uri */
- input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_dup );
-
- /* FIXME: file:// handling plugins do not support URIs properly...
- * So we pre-decode the URI to a path for them. Note that we do not do it
- * for non-standard VLC-specific schemes. */
- if( !strcmp( psz_access, "file" ) )
- {
- if( psz_path[0] != '/'
-#if (DIR_SEP_CHAR != '/')
- /* We accept invalid URIs too. */
- && psz_path[0] != DIR_SEP_CHAR
-#endif
- )
- { /* host specified -> only localhost is supported */
- static const size_t i_localhost = sizeof("localhost")-1;
- if( strncmp( psz_path, "localhost/", i_localhost + 1) != 0 )
- {
- msg_Err( p_input, "cannot open remote file `%s://%s'",
- psz_access, psz_path );
- msg_Info( p_input, "Did you mean `%s:///%s'?",
- psz_access, psz_path );
- goto error;
- }
- psz_path += i_localhost;
- }
- /* Remove HTML anchor if present (not supported). */
- char *p = strchr( psz_path, '#' );
- if( p )
- *p = '\0';
- /* Then URI-decode the path. */
- decode_URI( psz_path );
-#if defined( WIN32 ) && !defined( UNDER_CE )
- /* Strip leading slash in front of the drive letter */
- psz_path++;
-#endif
-#if (DIR_SEP_CHAR != '/')
- /* Turn slashes into anti-slashes */
- for( char *s = strchr( psz_path, '/' ); s; s = strchr( s + 1, '/' ) )
- *s = DIR_SEP_CHAR;
-#endif
- }
+ input_SplitMRL( &psz_access, &psz_demux, &psz_path, &psz_anchor, psz_dup );
msg_Dbg( p_input, "`%s' gives access `%s' demux `%s' path `%s'",
psz_mrl, psz_access, psz_demux, psz_path );
if( !p_input->b_preparsing )
{
- /* Hack to allow udp://@:port syntax */
- if( !psz_access ||
- (strncmp( psz_access, "udp", 3 ) &&
- strncmp( psz_access, "rtp", 3 )) )
- {
- /* Find optional titles and seekpoints */
- MRLSections( p_input, psz_path, &in->i_title_start, &in->i_title_end,
+ /* Find optional titles and seekpoints */
+ MRLSections( psz_anchor, &in->i_title_start, &in->i_title_end,
&in->i_seekpoint_start, &in->i_seekpoint_end );
- }
-
if( psz_forced_demux && *psz_forced_demux )
{
psz_demux = psz_forced_demux;
/* Preparsing is only for file:// */
if( *psz_demux )
goto error;
- if( !*psz_access ) /* path without scheme:// */
- psz_access = "file";
if( strcmp( psz_access, "file" ) )
goto error;
msg_Dbg( p_input, "trying to pre-parse %s", psz_path );
if( in->p_demux )
{
/* Get infos from access_demux */
- int i_ret = demux_Control( in->p_demux,
- DEMUX_GET_PTS_DELAY, &in->i_pts_delay );
- assert( !i_ret );
- in->i_pts_delay = __MAX( 0, __MIN( in->i_pts_delay, INPUT_PTS_DELAY_MAX ) );
-
-
in->b_title_demux = true;
if( demux_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
&in->title, &in->i_title,
{
if( vlc_object_alive( p_input ) )
{
- msg_Err( p_input, "open of `%s' failed: %s", psz_mrl,
- msg_StackMsg() );
- dialog_Fatal( p_input, _("Your input can't be opened"),
- _("VLC is unable to open the MRL '%s'."
- " Check the log for details."), psz_mrl );
+ msg_Err( p_input, "open of `%s' failed", psz_mrl );
+ if( !b_in_can_fail )
+ dialog_Fatal( p_input, _("Your input can't be opened"),
+ _("VLC is unable to open the MRL '%s'."
+ " Check the log for details."), psz_mrl );
}
goto error;
}
if( !p_input->b_preparsing )
{
bool b_can_seek;
- access_Control( in->p_access,
- ACCESS_GET_PTS_DELAY, &in->i_pts_delay );
- in->i_pts_delay = __MAX( 0, __MIN( in->i_pts_delay, INPUT_PTS_DELAY_MAX ) );
in->b_title_demux = false;
if( access_Control( in->p_access, ACCESS_GET_TITLE_INFO,
psz_demux = in->p_access->psz_demux;
}
- {
- /* Take access/stream redirections into account */
- char *psz_real_path;
- char *psz_buf = NULL;
- if( in->p_stream->psz_path )
- {
- const char *psz_a, *psz_d;
- psz_buf = strdup( in->p_stream->psz_path );
- input_SplitMRL( &psz_a, &psz_d, &psz_real_path, psz_buf );
- }
- else
- {
- psz_real_path = psz_path;
- }
- in->p_demux = demux_New( p_input, p_input, psz_access, psz_demux,
- psz_real_path,
- in->p_stream, p_input->p->p_es_out,
- p_input->b_preparsing );
- free( psz_buf );
- }
+ in->p_demux = demux_New( p_input, p_input, psz_access, psz_demux,
+ /* Take access/stream redirections into account: */
+ in->p_stream->psz_path ? in->p_stream->psz_path : psz_path,
+ in->p_stream, p_input->p->p_es_out,
+ p_input->b_preparsing );
if( in->p_demux == NULL )
{
{
msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
psz_access, psz_demux, psz_path );
- dialog_Fatal( VLC_OBJECT( p_input ),
- _("VLC can't recognize the input's format"),
- _("The format of '%s' cannot be detected. "
- "Have a look at the log for details."), psz_mrl );
+ if( !b_in_can_fail )
+ dialog_Fatal( VLC_OBJECT( p_input ),
+ _("VLC can't recognize the input's format"),
+ _("The format of '%s' cannot be detected. "
+ "Have a look at the log for details."), psz_mrl );
}
goto error;
}
/* get attachment
* FIXME improve for b_preparsing: move it after GET_META and check psz_arturl */
- if( 1 || !p_input->b_preparsing )
+ if( !p_input->b_preparsing )
{
int i_attachment;
input_attachment_t **attachment;
i_attachment, attachment );
vlc_mutex_unlock( &p_input->p->p_item->lock );
}
+
+ /* PTS delay: request from demux first. This is required for
+ * access_demux and some special cases like SDP demux. Otherwise,
+ * fallback to access */
+ if( demux_Control( in->p_demux, DEMUX_GET_PTS_DELAY,
+ &in->i_pts_delay ) )
+ {
+ /* GET_PTS_DELAY is mandatory for access_demux */
+ assert( in->p_access );
+ access_Control( in->p_access,
+ ACCESS_GET_PTS_DELAY, &in->i_pts_delay );
+ }
+ if( in->i_pts_delay > INPUT_PTS_DELAY_MAX )
+ in->i_pts_delay = INPUT_PTS_DELAY_MAX;
+ else if( in->i_pts_delay < 0 )
+ in->i_pts_delay = 0;
}
+
if( !demux_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) && f_fps > 0.0 )
{
vlc_mutex_lock( &p_input->p->p_item->lock );
return;
demux_meta_t *p_demux_meta =
- vlc_custom_create( p_demux, sizeof( *p_demux_meta ),
- VLC_OBJECT_GENERIC, "demux meta" );
+ vlc_custom_create( p_demux, sizeof( *p_demux_meta ), "demux meta" );
if( !p_demux_meta )
return;
- vlc_object_attach( p_demux_meta, p_demux );
p_demux_meta->p_demux = p_demux;
p_demux_meta->p_item = p_input->p->p_item;
* MRLSplit: parse the access, demux and url part of the
* Media Resource Locator.
*****************************************************************************/
-void input_SplitMRL( const char **ppsz_access, const char **ppsz_demux, char **ppsz_path,
- char *psz_dup )
+void input_SplitMRL( const char **access, const char **demux,
+ const char **path, const char **anchor, char *buf )
{
- char *psz_access = NULL;
- char *psz_demux = NULL;
- char *psz_path;
-
- /* Either there is an access/demux specification before ://
- * or we have a plain local file path. */
- psz_path = strstr( psz_dup, "://" );
- if( psz_path != NULL )
- {
- *psz_path = '\0';
- psz_path += 3; /* skips "://" */
-
- /* Separate access from demux (<access>/<demux>://<path>) */
- psz_access = psz_dup;
- psz_demux = strchr( psz_access, '/' );
- if( psz_demux )
- *psz_demux++ = '\0';
-
- /* We really don't want module name substitution here! */
- if( psz_access[0] == '$' )
- psz_access++;
- if( psz_demux && psz_demux[0] == '$' )
- psz_demux++;
+ char *p;
+
+ /* Separate <path> from <access>[/<demux>]:// */
+ p = strstr( buf, "://" );
+ if( p != NULL )
+ {
+ *p = '\0';
+ p += 3; /* skips "://" */
+ *path = p;
+
+ /* Remove HTML anchor if present (not supported).
+ * The hash symbol itself should be URI-encoded. */
+ p = strchr( p, '#' );
+ if( p != NULL )
+ {
+ *(p++) = '\0';
+ *anchor = p;
+ }
+ else
+ *anchor = "";
}
else
{
- psz_path = psz_dup;
+#ifndef NDEBUG
+ fprintf( stderr, "%s(\"%s\") probably not a valid URI!\n", __func__,
+ buf );
+#endif
+ /* Note: this is a valid non const pointer to "": */
+ *path = buf + strlen( buf );
+ }
+
+ /* Separate access from demux */
+ p = strchr( buf, '/' );
+ if( p != NULL )
+ {
+ *(p++) = '\0';
+ if( p[0] == '$' )
+ p++;
+ *demux = p;
}
- *ppsz_access = psz_access ? psz_access : "";
- *ppsz_demux = psz_demux ? psz_demux : "";
- *ppsz_path = psz_path;
+ else
+ *demux = "";
+
+ /* We really don't want module name substitution here! */
+ p = buf;
+ if( p[0] == '$' )
+ p++;
+ *access = p;
}
-static inline bool next(char ** src)
+static const char *MRLSeekPoint( const char *str, int *title, int *chapter )
{
char *end;
- errno = 0;
- long result = strtol( *src, &end, 0 );
- if( errno != 0 || result >= LONG_MAX || result <= LONG_MIN ||
- end == *src )
+ unsigned long u;
+
+ /* Look for the title */
+ u = strtoul( str, &end, 0 );
+ *title = (str == end || u > (unsigned long)INT_MAX) ? -1 : (int)u;
+ str = end;
+
+ /* Look for the chapter */
+ if( *str == ':' )
{
- return false;
+ str++;
+ u = strtoul( str, &end, 0 );
+ *chapter = (str == end || u > (unsigned long)INT_MAX) ? -1 : (int)u;
+ str = end;
}
- *src = end;
- return true;
+ else
+ *chapter = -1;
+
+ return str;
}
+
/*****************************************************************************
* MRLSections: parse title and seekpoint info from the Media Resource Locator.
*
* Syntax:
- * [url][@[title-start][:chapter-start][-[title-end][:chapter-end]]]
+ * [url][@[title_start][:chapter_start][-[title_end][:chapter_end]]]
*****************************************************************************/
-static void MRLSections( input_thread_t *p_input, char *psz_source,
+static void MRLSections( const char *p,
int *pi_title_start, int *pi_title_end,
int *pi_chapter_start, int *pi_chapter_end )
{
- char *psz, *psz_end, *psz_next, *psz_check;
-
- *pi_title_start = *pi_title_end = -1;
- *pi_chapter_start = *pi_chapter_end = -1;
+ *pi_title_start = *pi_title_end = *pi_chapter_start = *pi_chapter_end = -1;
- /* Start by parsing titles and chapters */
- if( !psz_source || !( psz = strrchr( psz_source, '@' ) ) ) return;
+ int title_start, chapter_start, title_end, chapter_end;
+ if( *p != '-' )
+ p = MRLSeekPoint( p, &title_start, &chapter_start );
+ else
+ title_start = chapter_start = -1;
- /* Check we are really dealing with a title/chapter section */
- psz_check = psz + 1;
- if( !*psz_check ) return;
- if( isdigit(*psz_check) )
- if(!next(&psz_check)) return;
- if( *psz_check != ':' && *psz_check != '-' && *psz_check ) return;
- if( *psz_check == ':' && ++psz_check )
- {
- if( isdigit(*psz_check) )
- if(!next(&psz_check)) return;
- }
- if( *psz_check != '-' && *psz_check ) return;
- if( *psz_check == '-' && ++psz_check )
- {
- if( isdigit(*psz_check) )
- if(!next(&psz_check)) return;
- }
- if( *psz_check != ':' && *psz_check ) return;
- if( *psz_check == ':' && ++psz_check )
- {
- if( isdigit(*psz_check) )
- if(!next(&psz_check)) return;
- }
- if( *psz_check ) return;
-
- /* Separate start and end */
- *psz++ = 0;
- if( ( psz_end = strchr( psz, '-' ) ) ) *psz_end++ = 0;
-
- /* Look for the start title */
- *pi_title_start = strtol( psz, &psz_next, 0 );
- if( !*pi_title_start && psz == psz_next ) *pi_title_start = -1;
- *pi_title_end = *pi_title_start;
- psz = psz_next;
-
- /* Look for the start chapter */
- if( *psz ) psz++;
- *pi_chapter_start = strtol( psz, &psz_next, 0 );
- if( !*pi_chapter_start && psz == psz_next ) *pi_chapter_start = -1;
- *pi_chapter_end = *pi_chapter_start;
-
- if( psz_end )
- {
- /* Look for the end title */
- *pi_title_end = strtol( psz_end, &psz_next, 0 );
- if( !*pi_title_end && psz_end == psz_next ) *pi_title_end = -1;
- psz_end = psz_next;
+ if( *p == '-' )
+ p = MRLSeekPoint( p + 1, &title_end, &chapter_end );
+ else
+ title_end = chapter_end = -1;
- /* Look for the end chapter */
- if( *psz_end ) psz_end++;
- *pi_chapter_end = strtol( psz_end, &psz_next, 0 );
- if( !*pi_chapter_end && psz_end == psz_next ) *pi_chapter_end = -1;
- }
+ if( *p ) /* syntax error */
+ return;
- msg_Dbg( p_input, "source=`%s' title=%d/%d seekpoint=%d/%d",
- psz_source, *pi_title_start, *pi_chapter_start,
- *pi_title_end, *pi_chapter_end );
+ *pi_title_start = title_start;
+ *pi_title_end = title_end;
+ *pi_chapter_start = chapter_start;
+ *pi_chapter_end = chapter_end;
}
/*****************************************************************************
* input_AddSubtitles: add a subtitles file and enable it
*****************************************************************************/
-static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_forced )
+static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, unsigned i_flags )
{
input_source_t *sub;
vlc_value_t count;
free( psz_path );
}
+ char *url = make_URI( psz_subtitle, "file" );
+
var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL );
sub = InputSourceNew( p_input );
- if( !sub || InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) )
+ if( !sub || !url
+ || InputSourceInit( p_input, sub, url, "subtitle", (i_flags & SUB_CANFAIL) ) )
{
free( sub );
+ free( url );
return;
}
+ free( url );
TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub );
/* Select the ES */
- if( b_forced && !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) )
+ if( (i_flags & SUB_FORCED) && !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) )
{
if( count.i_int == 0 )
count.i_int++;
if( !psz_tmp )
return NULL;
- char *psz_tmp2 = filename_sanitize( psz_tmp );
- free( psz_tmp );
+ filename_sanitize( psz_tmp );
- if( !psz_tmp2 ||
- asprintf( &psz_file, "%s"DIR_SEP"%s%s%s",
- psz_path, psz_tmp2,
+ if( asprintf( &psz_file, "%s"DIR_SEP"%s%s%s",
+ psz_path, psz_tmp,
psz_extension ? "." : "",
psz_extension ? psz_extension : "" ) < 0 )
psz_file = NULL;
- free( psz_tmp2 );
+ free( psz_tmp );
return psz_file;
}
else
projects / vlc / blobdiff