X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=35da58bd31014e589b6593654d4653b3310b4210;hb=9e94d8105c8d858b8d419290648126627c807572;hp=151d4566225c5d9fa6a233fa0f4eb7c88a1e470b;hpb=97dc478598f7aada4034fcec00f8377ceb6e029c;p=vlc diff --git a/src/input/input.c b/src/input/input.c index 151d456622..35da58bd31 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -31,9 +31,9 @@ #include -#include #include #include +#include #include "input_internal.h" #include "event.h" @@ -43,14 +43,17 @@ #include "demux.h" #include "stream.h" #include "item.h" +#include "resource.h" #include #include "../stream_output/stream_output.h" -#include +#include #include #include +#include #include +#include #ifdef HAVE_SYS_STAT_H # include @@ -62,20 +65,19 @@ static void Destructor( input_thread_t * p_input ); static void *Run ( vlc_object_t *p_this ); -static void *RunAndDestroy ( vlc_object_t *p_this ); static input_thread_t * Create ( vlc_object_t *, input_item_t *, - const char *, bool, sout_instance_t * ); + const char *, bool, input_resource_t * ); static int Init ( input_thread_t *p_input ); -static void WaitDie ( input_thread_t *p_input ); static void End ( input_thread_t *p_input ); -static void MainLoop( input_thread_t *p_input ); +static void MainLoop( input_thread_t *p_input, bool b_interactive ); static void ObjectKillChildrens( input_thread_t *, vlc_object_t * ); -static inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t *, mtime_t i_deadline ); -static void ControlReduce( input_thread_t * ); -static bool Control( input_thread_t *, int, vlc_value_t ); +static inline int ControlPop( input_thread_t *, int *, vlc_value_t *, mtime_t i_deadline, bool b_postpone_seek ); +static void ControlRelease( int i_type, vlc_value_t val ); +static bool ControlIsSeekRequest( int i_type ); +static bool Control( input_thread_t *, int, vlc_value_t ); static int UpdateTitleSeekpointFromAccess( input_thread_t * ); static void UpdateGenericFromAccess( input_thread_t * ); @@ -93,13 +95,14 @@ static void InputSourceMeta( input_thread_t *, input_source_t *, vlc_meta_t * ); /* TODO */ //static void InputGetAttachments( input_thread_t *, input_source_t * ); -static void SlaveDemux( input_thread_t *p_input ); +static void SlaveDemux( input_thread_t *p_input, bool *pb_demux_polled ); static void SlaveSeek( input_thread_t *p_input ); static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta ); static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta ); -static char *InputGetExtraFiles( input_thread_t *p_input, - const char *psz_access, const char *psz_path ); +static void InputGetExtraFiles( input_thread_t *p_input, + int *pi_list, char ***pppsz_list, + const char *psz_access, const char *psz_path ); static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment, int i_new, input_attachment_t **pp_new ); @@ -108,6 +111,175 @@ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_for static void input_ChangeState( input_thread_t *p_input, int i_state ); /* TODO fix name */ +#undef input_Create +/** + * Create a new input_thread_t. + * + * You need to call input_Start on it when you are done + * adding callback on the variables/events you want to monitor. + * + * \param p_parent a vlc_object + * \param p_item an input item + * \param psz_log an optional prefix for this input logs + * \param p_resource an optional input ressource + * \return a pointer to the spawned input thread + */ +input_thread_t *input_Create( vlc_object_t *p_parent, + input_item_t *p_item, + const char *psz_log, input_resource_t *p_resource ) +{ + return Create( p_parent, p_item, psz_log, false, p_resource ); +} + +#undef input_CreateAndStart +/** + * Create a new input_thread_t and start it. + * + * Provided for convenience. + * + * \see input_Create + */ +input_thread_t *input_CreateAndStart( vlc_object_t *p_parent, + input_item_t *p_item, const char *psz_log ) +{ + input_thread_t *p_input = input_Create( p_parent, p_item, psz_log, NULL ); + + if( input_Start( p_input ) ) + { + vlc_object_release( p_input ); + return NULL; + } + return p_input; +} + +#undef input_Read +/** + * Initialize an input thread and run it until it stops by itself. + * + * \param p_parent a vlc_object + * \param p_item an input item + * \return an error code, VLC_SUCCESS on success + */ +int input_Read( vlc_object_t *p_parent, input_item_t *p_item ) +{ + input_thread_t *p_input = Create( p_parent, p_item, NULL, false, NULL ); + if( !p_input ) + return VLC_EGENERIC; + + if( !Init( p_input ) ) + { + MainLoop( p_input, false ); + End( p_input ); + } + + vlc_object_release( p_input ); + return VLC_SUCCESS; +} + +/** + * Initialize an input and initialize it to preparse the item + * This function is blocking. It will only accept parsing regular files. + * + * \param p_parent a vlc_object_t + * \param p_item an input item + * \return VLC_SUCCESS or an error + */ +int input_Preparse( vlc_object_t *p_parent, input_item_t *p_item ) +{ + input_thread_t *p_input; + + /* Allocate descriptor */ + p_input = Create( p_parent, p_item, NULL, true, NULL ); + if( !p_input ) + return VLC_EGENERIC; + + if( !Init( p_input ) ) + End( p_input ); + + vlc_object_release( p_input ); + + return VLC_SUCCESS; +} + +/** + * Start a input_thread_t created by input_Create. + * + * You must not start an already running input_thread_t. + * + * \param the input thread to start + */ +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 ) ) + { + input_ChangeState( p_input, ERROR_S ); + msg_Err( p_input, "cannot create input thread" ); + return VLC_EGENERIC; + } + return VLC_SUCCESS; +} + +/** + * Request a running input thread to stop and die + * + * b_abort must be true when a user stop is requested and not because you have + * detected an error or an eof. It will be used to properly send the + * INPUT_EVENT_ABORT event. + * + * \param p_input the input thread to stop + * \param b_abort true if the input has been aborted by a user request + */ +void input_Stop( input_thread_t *p_input, bool b_abort ) +{ + /* Set die for input and ALL of this childrens (even (grand-)grand-childrens) + * It is needed here even if it is done in INPUT_CONTROL_SET_DIE handler to + * unlock the control loop */ + ObjectKillChildrens( p_input, VLC_OBJECT(p_input) ); + + vlc_mutex_lock( &p_input->p->lock_control ); + p_input->p->b_abort |= b_abort; + vlc_mutex_unlock( &p_input->p->lock_control ); + + input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL ); +} + +/** + * Get the item from an input thread + * FIXME it does not increase ref count of the item. + * if it is used after p_input is destroyed nothing prevent it from + * being freed. + */ +input_item_t *input_GetItem( input_thread_t *p_input ) +{ + assert( p_input && p_input->p ); + return p_input->p->p_item; +} + +/***************************************************************************** + * ObjectKillChildrens + *****************************************************************************/ +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 ) + return; + + vlc_object_kill( p_obj ); + + p_list = vlc_list_children( p_obj ); + for( i = 0; i < p_list->i_count; i++ ) + ObjectKillChildrens( p_input, p_list->p_values[i].p_object ); + vlc_list_release( p_list ); +} + /***************************************************************************** * This function creates a new input, and returns a pointer * to its description. On error, it returns NULL. @@ -116,11 +288,10 @@ static void input_ChangeState( input_thread_t *p_input, int i_state ); /* TODO f *****************************************************************************/ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, const char *psz_header, bool b_quick, - sout_instance_t *p_sout ) + input_resource_t *p_resource ) { static const char input_name[] = "input"; input_thread_t *p_input = NULL; /* thread descriptor */ - vlc_value_t val; int i; /* Allocate descriptor */ @@ -129,6 +300,8 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, 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 ); @@ -148,48 +321,41 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, if( !p_input->p ) return NULL; - /* One "randomly" selected input thread is responsible for computing - * the global stats. Check if there is already someone doing this */ - if( p_input->p_libvlc->p_stats && !b_quick ) - { - libvlc_priv_t *p_private = libvlc_priv( p_input->p_libvlc ); - vlc_mutex_lock( &p_input->p_libvlc->p_stats->lock ); - if( p_private->p_stats_computer == NULL ) - p_private->p_stats_computer = p_input; - vlc_mutex_unlock( &p_input->p_libvlc->p_stats->lock ); - } + /* 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; - /* Init events */ - vlc_event_manager_t * p_em = &p_input->p->event_manager; - vlc_event_manager_init_with_vlc_object( p_em, p_input ); - vlc_event_manager_register_event_type( p_em, vlc_InputStateChanged ); - vlc_event_manager_register_event_type( p_em, vlc_InputSelectedStreamChanged ); - /* Init Common fields */ p_input->b_eof = false; - p_input->b_can_pace_control = true; + p_input->p->b_can_pace_control = true; p_input->p->i_start = 0; - p_input->i_time = 0; + p_input->p->i_time = 0; p_input->p->i_stop = 0; p_input->p->i_run = 0; p_input->p->i_title = 0; p_input->p->title = NULL; p_input->p->i_title_offset = p_input->p->i_seekpoint_offset = 0; - p_input->i_state = INIT_S; - p_input->p->i_rate = INPUT_RATE_DEFAULT; + p_input->p->i_state = INIT_S; + double f_rate = var_InheritFloat( p_input, "rate" ); + if( f_rate <= 0. ) + { + msg_Warn( p_input, "Negative or zero rate values are forbidden" ); + f_rate = 1.; + } + p_input->p->i_rate = INPUT_RATE_DEFAULT / f_rate; 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 ); TAB_INIT( p_input->p->i_attachment, p_input->p->attachment ); - p_input->p->p_es_out_display = NULL; - p_input->p->p_es_out = NULL; p_input->p->p_sout = NULL; p_input->p->b_out_pace_control = false; - p_input->i_pts_delay = 0; - p_input->p->i_cr_average = 0; vlc_gc_incref( p_item ); /* Released in Destructor() */ p_input->p->p_item = p_item; @@ -217,18 +383,24 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, p_input->p->i_slave = 0; p_input->p->slave = NULL; + /* */ + if( 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_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_mutex_init( &p_input->p->lock_control ); vlc_cond_init( &p_input->p->wait_control ); p_input->p->i_control = 0; - - /* 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->b_abort = false; /* Create Object Variables for private use only */ input_ConfigVarInit( p_input ); @@ -237,16 +409,14 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, input_ControlVarInit( p_input ); /* */ - p_input->p->i_cr_average = var_GetInteger( p_input, "cr-average" ); - if( !p_input->b_preparsing ) { - var_Get( p_input, "bookmarks", &val ); - if( val.psz_string ) + char *psz_bookmarks = var_GetNonEmptyString( p_input, "bookmarks" ); + if( psz_bookmarks ) { /* FIXME: have a common cfg parsing routine used by sout and others */ char *psz_parser, *psz_start, *psz_end; - psz_parser = val.psz_string; + psz_parser = psz_bookmarks; while( (psz_start = strchr( psz_parser, '{' ) ) ) { seekpoint_t *p_seekpoint; @@ -285,7 +455,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, vlc_seekpoint_Delete( p_seekpoint ); *psz_parser = backup; } - free( val.psz_string ); + free( psz_bookmarks ); } } @@ -297,19 +467,20 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, if( p_input->b_preparsing ) p_input->i_flags |= OBJECT_FLAGS_QUIET | OBJECT_FLAGS_NOINTERACT; - /* */ - if( p_sout ) - p_input->p->p_sout = p_sout; + /* Make sure the interaction option is honored */ + if( !var_InheritBool( p_input, "interact" ) ) + p_input->i_flags |= OBJECT_FLAGS_NOINTERACT; + /* */ memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) ); vlc_mutex_init( &p_input->p->counters.counters_lock ); + p_input->p->p_es_out_display = input_EsOutNew( p_input, p_input->p->i_rate ); + p_input->p->p_es_out = NULL; + /* Set the destructor when we are sure we are initialized */ vlc_object_set_destructor( p_input, (vlc_destructor_t)Destructor ); - /* Attach only once we are ready */ - vlc_object_attach( p_input, p_parent ); - return p_input; } @@ -324,180 +495,30 @@ static void Destructor( input_thread_t * p_input ) free( psz_name ); #endif - vlc_event_manager_fini( &p_input->p->event_manager ); - stats_TimerDump( p_input, STATS_TIMER_INPUT_LAUNCHING ); stats_TimerClean( p_input, STATS_TIMER_INPUT_LAUNCHING ); -#ifdef ENABLE_SOUT - if( p_input->p->p_sout ) - sout_DeleteInstance( p_input->p->p_sout ); -#endif - vlc_gc_decref( p_input->p->p_item ); - vlc_mutex_destroy( &p_input->p->counters.counters_lock ); - - vlc_cond_destroy( &p_input->p->wait_control ); - vlc_mutex_destroy( &p_input->p->lock_control ); - free( p_input->p ); -} - -/** - * Initialize an input thread and run it. You will need to monitor the - * thread to clean up after it is done - * - * \param p_parent a vlc_object - * \param p_item an input item - * \return a pointer to the spawned input thread - */ -input_thread_t *__input_CreateThread( vlc_object_t *p_parent, - input_item_t *p_item ) -{ - return __input_CreateThreadExtended( p_parent, p_item, NULL, NULL ); -} - -/* */ -input_thread_t *__input_CreateThreadExtended( vlc_object_t *p_parent, - input_item_t *p_item, - const char *psz_log, sout_instance_t *p_sout ) -{ - input_thread_t *p_input; - - p_input = Create( p_parent, p_item, psz_log, false, p_sout ); - if( !p_input ) - return NULL; - - /* Create thread and wait for its readiness. */ - if( vlc_thread_create( p_input, "input", Run, - VLC_THREAD_PRIORITY_INPUT, false ) ) - { - input_ChangeState( p_input, ERROR_S ); - msg_Err( p_input, "cannot create input thread" ); - vlc_object_detach( p_input ); - vlc_object_release( p_input ); - return NULL; - } + if( p_input->p->p_es_out_display ) + es_out_Delete( p_input->p->p_es_out_display ); - return p_input; -} + if( 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 ); -/** - * Initialize an input thread and run it. This thread will clean after itself, - * you can forget about it. It can work either in blocking or non-blocking mode - * - * \param p_parent a vlc_object - * \param p_item an input item - * \param b_block should we block until read is finished ? - * \return an error code, VLC_SUCCESS on success - */ -int __input_Read( vlc_object_t *p_parent, input_item_t *p_item, - bool b_block ) -{ - input_thread_t *p_input; + vlc_gc_decref( p_input->p->p_item ); - p_input = Create( p_parent, p_item, NULL, false, NULL ); - if( !p_input ) - return VLC_EGENERIC; + vlc_mutex_destroy( &p_input->p->counters.counters_lock ); - if( b_block ) + for( int i = 0; i < p_input->p->i_control; i++ ) { - RunAndDestroy( VLC_OBJECT(p_input) ); - return VLC_SUCCESS; + input_control_t *p_ctrl = &p_input->p->control[i]; + ControlRelease( p_ctrl->i_type, p_ctrl->val ); } - else - { - if( vlc_thread_create( p_input, "input", RunAndDestroy, - VLC_THREAD_PRIORITY_INPUT, false ) ) - { - input_ChangeState( p_input, ERROR_S ); - msg_Err( p_input, "cannot create input thread" ); - vlc_object_release( p_input ); - return VLC_EGENERIC; - } - } - return VLC_SUCCESS; -} -/** - * Initialize an input and initialize it to preparse the item - * This function is blocking. It will only accept to parse files - * - * \param p_parent a vlc_object_t - * \param p_item an input item - * \return VLC_SUCCESS or an error - */ -int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item ) -{ - input_thread_t *p_input; - - /* Allocate descriptor */ - p_input = Create( p_parent, p_item, NULL, true, NULL ); - if( !p_input ) - return VLC_EGENERIC; - - if( !Init( p_input ) ) - End( p_input ); - - vlc_object_detach( p_input ); - vlc_object_release( p_input ); - - return VLC_SUCCESS; -} - -/** - * Request a running input thread to stop and die - * - * \param the input thread to stop - */ -void input_StopThread( input_thread_t *p_input ) -{ - /* Set die for input and ALL of this childrens (even (grand-)grand-childrens) - * It is needed here even if it is done in INPUT_CONTROL_SET_DIE handler to - * unlock the control loop */ - ObjectKillChildrens( p_input, VLC_OBJECT(p_input) ); - - input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL ); -} - -sout_instance_t *input_DetachSout( input_thread_t *p_input ) -{ - assert( p_input->b_dead ); - sout_instance_t *p_sout = p_input->p->p_sout; - vlc_object_detach( p_sout ); - p_input->p->p_sout = NULL; - return p_sout; -} - -/** - * Get the item from an input thread - * FIXME it does not increase ref count of the item. - * if it is used after p_input is destroyed nothing prevent it from - * being freed. - */ -input_item_t *input_GetItem( input_thread_t *p_input ) -{ - assert( p_input && p_input->p ); - return p_input->p->p_item; -} - -/***************************************************************************** - * ObjectKillChildrens - *****************************************************************************/ -static void ObjectKillChildrens( input_thread_t *p_input, vlc_object_t *p_obj ) -{ - vlc_list_t *p_list; - int i; - - if( p_obj->i_object_type == VLC_OBJECT_VOUT || - p_obj->i_object_type == VLC_OBJECT_AOUT || - 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++ ) - ObjectKillChildrens( p_input, p_list->p_values[i].p_object ); - vlc_list_release( p_list ); + vlc_cond_destroy( &p_input->p->wait_control ); + vlc_mutex_destroy( &p_input->p->lock_control ); + free( p_input->p ); } /***************************************************************************** @@ -511,48 +532,23 @@ static void *Run( vlc_object_t *p_this ) const int canc = vlc_savecancel(); if( Init( p_input ) ) - { - /* If we failed, wait before we are killed, and exit */ - WaitDie( p_input ); goto exit; - } - - MainLoop( p_input ); - /* Wait until we are asked to die */ - if( !p_input->b_die ) - WaitDie( p_input ); + MainLoop( p_input, true ); /* FIXME it can be wrong (like with VLM) */ /* Clean up */ End( p_input ); exit: - p_input->b_dead = true; - vlc_restorecancel( canc ); - return NULL; -} - -/***************************************************************************** - * RunAndDestroy: main thread loop - * This is the "just forget me" thread that spawns the input processing chain, - * reads the stream, cleans up and releases memory - *****************************************************************************/ -static void *RunAndDestroy( vlc_object_t *p_this ) -{ - input_thread_t *p_input = (input_thread_t *)p_this; - const int canc = vlc_savecancel(); - - if( Init( p_input ) ) - goto exit; - - MainLoop( p_input ); + /* Tell we're dead */ + vlc_mutex_lock( &p_input->p->lock_control ); + const bool b_abort = p_input->p->b_abort; + vlc_mutex_unlock( &p_input->p->lock_control ); - /* Clean up */ - End( p_input ); + if( b_abort ) + input_SendEventAbort( p_input ); + input_SendEventDead( p_input ); -exit: - /* Release memory */ - vlc_object_release( p_input ); vlc_restorecancel( canc ); return NULL; } @@ -565,14 +561,15 @@ exit: * MainLoopDemux * It asks the demuxer to demux some data */ -static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed, mtime_t *pi_start_mdate ) +static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed, bool *pb_demux_polled, mtime_t i_start_mdate ) { int i_ret; *pb_changed = false; + *pb_demux_polled = p_input->p->input.p_demux->pf_demux != NULL; - if( ( p_input->p->i_stop > 0 && p_input->i_time >= p_input->p->i_stop ) || - ( p_input->p->i_run > 0 && *pi_start_mdate+p_input->p->i_run < mdate() ) ) + if( ( p_input->p->i_stop > 0 && p_input->p->i_time >= p_input->p->i_stop ) || + ( p_input->p->i_run > 0 && i_start_mdate+p_input->p->i_run < mdate() ) ) i_ret = 0; /* EOF */ else i_ret = demux_Demux( p_input->p->input.p_demux ); @@ -602,69 +599,67 @@ static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed, mtime_t *p if( i_ret == 0 ) /* EOF */ { - vlc_value_t repeat; - - var_Get( p_input, "input-repeat", &repeat ); - if( repeat.i_int == 0 ) - { - /* End of file - we do not set b_die because only the - * playlist is allowed to do so. */ - msg_Dbg( p_input, "EOF reached" ); - p_input->p->input.b_eof = true; - } - else - { - vlc_value_t val; + msg_Dbg( p_input, "EOF reached" ); + p_input->p->input.b_eof = true; + } + else if( i_ret < 0 ) + { + input_ChangeState( p_input, ERROR_S ); + } - msg_Dbg( p_input, "repeating the same input (%d)", - repeat.i_int ); - if( repeat.i_int > 0 ) - { - repeat.i_int--; - var_Set( p_input, "input-repeat", repeat ); - } + if( i_ret > 0 && p_input->p->i_slave > 0 ) + { + bool b_demux_polled; + SlaveDemux( p_input, &b_demux_polled ); - /* Seek to start title/seekpoint */ - val.i_int = p_input->p->input.i_title_start - - p_input->p->input.i_title_offset; - if( val.i_int < 0 || val.i_int >= p_input->p->input.i_title ) - val.i_int = 0; - input_ControlPush( p_input, - INPUT_CONTROL_SET_TITLE, &val ); + *pb_demux_polled |= b_demux_polled; + } +} - val.i_int = p_input->p->input.i_seekpoint_start - - p_input->p->input.i_seekpoint_offset; - if( val.i_int > 0 /* TODO: check upper boundary */ ) - input_ControlPush( p_input, - INPUT_CONTROL_SET_SEEKPOINT, &val ); +static int MainLoopTryRepeat( input_thread_t *p_input, mtime_t *pi_start_mdate ) +{ + int i_repeat = var_GetInteger( p_input, "input-repeat" ); + if( i_repeat == 0 ) + return VLC_EGENERIC; - /* Seek to start position */ - if( p_input->p->i_start > 0 ) - { - val.i_time = p_input->p->i_start; - input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, - &val ); - } - else - { - val.f_float = 0.0; - input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION, - &val ); - } + vlc_value_t val; - /* */ - *pi_start_mdate = mdate(); - } - } - else if( i_ret < 0 ) + msg_Dbg( p_input, "repeating the same input (%d)", i_repeat ); + if( i_repeat > 0 ) { - input_ChangeState( p_input, ERROR_S ); + i_repeat--; + var_SetInteger( p_input, "input-repeat", i_repeat ); } - if( i_ret > 0 && p_input->p->i_slave > 0 ) + /* Seek to start title/seekpoint */ + val.i_int = p_input->p->input.i_title_start - + p_input->p->input.i_title_offset; + if( val.i_int < 0 || val.i_int >= p_input->p->input.i_title ) + val.i_int = 0; + input_ControlPush( p_input, + INPUT_CONTROL_SET_TITLE, &val ); + + val.i_int = p_input->p->input.i_seekpoint_start - + p_input->p->input.i_seekpoint_offset; + if( val.i_int > 0 /* TODO: check upper boundary */ ) + input_ControlPush( p_input, + INPUT_CONTROL_SET_SEEKPOINT, &val ); + + /* Seek to start position */ + if( p_input->p->i_start > 0 ) + { + val.i_time = p_input->p->i_start; + input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &val ); + } + else { - SlaveDemux( p_input ); + val.f_float = 0.0; + input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION, &val ); } + + /* */ + *pi_start_mdate = mdate(); + return VLC_SUCCESS; } /** @@ -685,6 +680,7 @@ static void MainLoopInterface( input_thread_t *p_input ) if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) ) i_time = 0; + p_input->p->i_time = i_time; if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_LENGTH, &i_length ) ) @@ -707,12 +703,6 @@ static void MainLoopInterface( input_thread_t *p_input ) static void MainLoopStatistic( input_thread_t *p_input ) { stats_ComputeInputStats( p_input, p_input->p->p_item->p_stats ); - /* Are we the thread responsible for computing global stats ? */ - if( libvlc_priv( p_input->p_libvlc )->p_stats_computer == p_input ) - { - stats_ComputeGlobalStats( p_input->p_libvlc, - p_input->p_libvlc->p_stats ); - } input_SendEventStatistics( p_input ); } @@ -720,11 +710,14 @@ static void MainLoopStatistic( input_thread_t *p_input ) * MainLoop * The main input loop. */ -static void MainLoop( input_thread_t *p_input ) +static void MainLoop( input_thread_t *p_input, bool b_interactive ) { mtime_t i_start_mdate = mdate(); mtime_t i_intf_update = 0; mtime_t i_statistic_update = 0; + mtime_t i_last_seek_mdate = 0; + bool b_pause_after_eof = b_interactive && + var_CreateGetBool( p_input, "play-and-pause" ); /* Start the timer */ stats_TimerStop( p_input, STATS_TIMER_INPUT_LAUNCHING ); @@ -732,58 +725,95 @@ static void MainLoop( input_thread_t *p_input ) while( vlc_object_alive( p_input ) && !p_input->b_error ) { bool b_force_update; - int i_type; vlc_value_t val; mtime_t i_current; - mtime_t i_deadline; mtime_t i_wakeup; bool b_paused; + bool b_demux_polled; /* Demux data */ b_force_update = false; i_wakeup = 0; - /* FIXME if p_input->i_state == PAUSE_S the access/access_demux + /* FIXME if p_input->p->i_state == PAUSE_S the access/access_demux * is paused -> this may cause problem with some of them * The same problem can be seen when seeking while paused */ - b_paused = p_input->i_state == PAUSE_S && - !es_out_GetBuffering( p_input->p->p_es_out ); + b_paused = p_input->p->i_state == PAUSE_S && + ( !es_out_GetBuffering( p_input->p->p_es_out ) || p_input->p->input.b_eof ); + b_demux_polled = true; if( !b_paused ) { if( !p_input->p->input.b_eof ) { - MainLoopDemux( p_input, &b_force_update, &i_start_mdate ); + MainLoopDemux( p_input, &b_force_update, &b_demux_polled, i_start_mdate ); i_wakeup = es_out_GetWakeup( p_input->p->p_es_out ); } - else if( !p_input->b_eof && !es_out_GetEmpty( p_input->p->p_es_out ) ) + else if( !es_out_GetEmpty( p_input->p->p_es_out ) ) { msg_Dbg( p_input, "waiting decoder fifos to empty" ); i_wakeup = mdate() + INPUT_IDLE_SLEEP; } + /* Pause after eof only if the input is pausable. + * This way we won't trigger timeshifting for nothing */ + else if( b_pause_after_eof && p_input->p->b_can_pause ) + { + msg_Dbg( p_input, "pausing at EOF (pause after each)"); + val.i_int = PAUSE_S; + Control( p_input, INPUT_CONTROL_SET_STATE, val ); + + b_pause_after_eof = false; + b_paused = true; + } else { - break; + if( MainLoopTryRepeat( p_input, &i_start_mdate ) ) + break; + b_pause_after_eof = var_GetBool( p_input, "play-and-pause" ); } } /* */ do { - i_deadline = i_wakeup; - if( b_paused ) + mtime_t i_deadline = i_wakeup; + if( b_paused || !b_demux_polled ) i_deadline = __MIN( i_intf_update, i_statistic_update ); /* Handle control */ - vlc_mutex_lock( &p_input->p->lock_control ); - ControlReduce( p_input ); - while( !ControlPopNoLock( p_input, &i_type, &val, i_deadline ) ) + for( ;; ) { + mtime_t i_limit = i_deadline; + + /* We will postpone the execution of a seek until we have + * finished the ES bufferisation (postpone is limited to + * 125ms) */ + bool b_buffering = es_out_GetBuffering( p_input->p->p_es_out ) && + !p_input->p->input.b_eof; + if( b_buffering ) + { + /* When postpone is in order, check the ES level every 20ms */ + mtime_t i_current = mdate(); + if( i_last_seek_mdate + INT64_C(125000) >= i_current ) + i_limit = __MIN( i_deadline, i_current + INT64_C(20000) ); + } + + int i_type; + if( ControlPop( p_input, &i_type, &val, i_limit, b_buffering ) ) + { + if( b_buffering && i_limit < i_deadline ) + continue; + break; + } + msg_Dbg( p_input, "control type=%d", i_type ); if( Control( p_input, i_type, val ) ) + { + if( ControlIsSeekRequest( i_type ) ) + i_last_seek_mdate = mdate(); b_force_update = true; + } } - vlc_mutex_unlock( &p_input->p->lock_control ); /* Update interface and statistics */ i_current = mdate(); @@ -799,13 +829,9 @@ static void MainLoop( input_thread_t *p_input ) i_statistic_update = i_current + INT64_C(1000000); } - /* Check if i_wakeup is still valid */ + /* Update the wakeup time */ if( i_wakeup != 0 ) - { - mtime_t i_new_wakeup = es_out_GetWakeup( p_input->p->p_es_out ); - if( !i_new_wakeup ) - i_wakeup = 0; - } + i_wakeup = es_out_GetWakeup( p_input->p->p_es_out ); } while( i_current < i_wakeup ); } @@ -827,6 +853,8 @@ static void InitStatistics( input_thread_t * p_input ) INIT_COUNTER( demux_read, INTEGER, COUNTER ); INIT_COUNTER( input_bitrate, FLOAT, DERIVATIVE ); INIT_COUNTER( demux_bitrate, FLOAT, DERIVATIVE ); + INIT_COUNTER( demux_corrupted, INTEGER, COUNTER ); + INIT_COUNTER( demux_discontinuity, INTEGER, COUNTER ); INIT_COUNTER( played_abuffers, INTEGER, COUNTER ); INIT_COUNTER( lost_abuffers, INTEGER, COUNTER ); INIT_COUNTER( displayed_pictures, INTEGER, COUNTER ); @@ -847,46 +875,21 @@ static void InitStatistics( input_thread_t * p_input ) #ifdef ENABLE_SOUT static int InitSout( input_thread_t * p_input ) { - char *psz; - - if( p_input->b_preparsing ) return VLC_SUCCESS; + if( p_input->b_preparsing ) + return VLC_SUCCESS; /* Find a usable sout and attach it to p_input */ - psz = var_GetNonEmptyString( p_input, "sout" ); + char *psz = var_GetNonEmptyString( p_input, "sout" ); if( psz && strncasecmp( p_input->p->p_item->psz_uri, "vlc:", 4 ) ) { - /* Check the validity of the provided sout */ - if( p_input->p->p_sout ) - { - if( strcmp( p_input->p->p_sout->psz_sout, psz ) ) - { - msg_Dbg( p_input, "destroying unusable sout" ); - - sout_DeleteInstance( p_input->p->p_sout ); - p_input->p->p_sout = NULL; - } - } - - if( p_input->p->p_sout ) + p_input->p->p_sout = input_resource_RequestSout( p_input->p->p_resource, NULL, psz ); + if( !p_input->p->p_sout ) { - /* Reuse it */ - msg_Dbg( p_input, "sout keep: reusing sout" ); - msg_Dbg( p_input, "sout keep: you probably want to use " - "gather stream_out" ); - vlc_object_attach( p_input->p->p_sout, p_input ); - } - else - { - /* Create a new one */ - p_input->p->p_sout = sout_NewInstance( p_input, psz ); - if( !p_input->p->p_sout ) - { - input_ChangeState( p_input, ERROR_S ); - msg_Err( p_input, "cannot start stream output instance, " \ - "aborting" ); - free( psz ); - return VLC_EGENERIC; - } + input_ChangeState( p_input, ERROR_S ); + msg_Err( p_input, "cannot start stream output instance, " \ + "aborting" ); + free( psz ); + return VLC_EGENERIC; } if( libvlc_stats( p_input ) ) { @@ -898,12 +901,9 @@ static int InitSout( input_thread_t * p_input ) 1000000; } } - else if( p_input->p->p_sout ) + else { - msg_Dbg( p_input, "destroying useless sout" ); - - sout_DeleteInstance( p_input->p->p_sout ); - p_input->p->p_sout = NULL; + input_resource_RequestSout( p_input->p->p_resource, NULL, NULL ); } free( psz ); @@ -927,29 +927,13 @@ static void InitTitle( input_thread_t * p_input ) { /* Setup variables */ input_ControlVarNavigation( p_input ); - input_ControlVarTitle( p_input, 0 ); + input_SendEventTitle( p_input, 0 ); } /* Global flag */ - p_input->b_can_pace_control = p_master->b_can_pace_control; + 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; - - /* Fix pts delay */ - if( p_input->i_pts_delay < 0 ) - p_input->i_pts_delay = 0; - - /* If the desynchronisation requested by the user is < 0, we need to - * cache more data. */ - const int i_desynch = var_GetInteger( p_input, "audio-desync" ); - if( i_desynch < 0 ) - p_input->i_pts_delay -= i_desynch * 1000; - - /* Update cr_average depending on the caching */ - p_input->p->i_cr_average *= (10 * p_input->i_pts_delay / 200000); - p_input->p->i_cr_average /= 10; - if( p_input->p->i_cr_average < 10 ) - p_input->p->i_cr_average = 10; } static void StartTitle( input_thread_t * p_input ) @@ -968,38 +952,34 @@ static void StartTitle( input_thread_t * p_input ) input_ControlPush( p_input, INPUT_CONTROL_SET_SEEKPOINT, &val ); /* Start/stop/run time */ - p_input->p->i_start = INT64_C(1000000) * var_GetInteger( p_input, "start-time" ); - p_input->p->i_stop = INT64_C(1000000) * var_GetInteger( p_input, "stop-time" ); - p_input->p->i_run = INT64_C(1000000) * var_GetInteger( p_input, "run-time" ); + p_input->p->i_start = (int64_t)(1000000.0 + * var_GetFloat( p_input, "start-time" )); + p_input->p->i_stop = (int64_t)(1000000.0 + * var_GetFloat( p_input, "stop-time" )); + p_input->p->i_run = (int64_t)(1000000.0 + * var_GetFloat( p_input, "run-time" )); if( p_input->p->i_run < 0 ) { msg_Warn( p_input, "invalid run-time ignored" ); p_input->p->i_run = 0; } - const mtime_t i_length = var_GetTime( p_input, "length" ); if( p_input->p->i_start > 0 ) { - if( p_input->p->i_start >= i_length ) - { - msg_Warn( p_input, "invalid start-time ignored" ); - } - else - { - vlc_value_t s; + vlc_value_t s; - msg_Dbg( p_input, "starting at time: %ds", - (int)( p_input->p->i_start / INT64_C(1000000) ) ); + msg_Dbg( p_input, "starting at time: %ds", + (int)( p_input->p->i_start / INT64_C(1000000) ) ); - s.i_time = p_input->p->i_start; - input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s ); - } + s.i_time = p_input->p->i_start; + input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s ); } if( p_input->p->i_stop > 0 && p_input->p->i_stop <= p_input->p->i_start ) { msg_Warn( p_input, "invalid stop-time ignored" ); p_input->p->i_stop = 0; } + p_input->p->b_fast_seek = var_GetBool( p_input, "input-fast-seek" ); } static void LoadSubtitles( input_thread_t *p_input ) @@ -1028,11 +1008,14 @@ static void LoadSubtitles( 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; + 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, true ); + SubtitleAdd( p_input, psz_subtitle, b_forced ); + b_forced = false; } if( var_GetBool( p_input, "sub-autodetect-file" ) ) @@ -1044,18 +1027,56 @@ static void LoadSubtitles( input_thread_t *p_input ) for( int i = 0; ppsz_subs && ppsz_subs[i]; i++ ) { - /* Try to autoselect the first autodetected subtitles file - * if no subtitles file was specified */ - bool b_forced = i == 0 && !psz_subtitle; - if( !psz_subtitle || strcmp( psz_subtitle, ppsz_subs[i] ) ) + { SubtitleAdd( p_input, ppsz_subs[i], b_forced ); + b_forced = false; + } free( ppsz_subs[i] ); } free( ppsz_subs ); } free( psz_subtitle ); + + /* Load subtitles from attachments */ + int i_attachment = 0; + input_attachment_t **pp_attachment = NULL; + + vlc_mutex_lock( &p_input->p->p_item->lock ); + for( int i = 0; i < p_input->p->i_attachment; i++ ) + { + const input_attachment_t *a = p_input->p->attachment[i]; + if( !strcmp( a->psz_mime, "application/x-srt" ) ) + TAB_APPEND( i_attachment, pp_attachment, + vlc_input_attachment_New( a->psz_name, NULL, + a->psz_description, NULL, 0 ) ); + } + vlc_mutex_unlock( &p_input->p->p_item->lock ); + + if( i_attachment > 0 ) + var_Create( p_input, "sub-description", VLC_VAR_STRING ); + for( int i = 0; i < i_attachment; i++ ) + { + input_attachment_t *a = pp_attachment[i]; + if( !a ) + continue; + char *psz_mrl; + if( a->psz_name[i] && + asprintf( &psz_mrl, "attachment://%s", a->psz_name ) >= 0 ) + { + var_SetString( p_input, "sub-description", a->psz_description ? a->psz_description : ""); + + SubtitleAdd( p_input, psz_mrl, b_forced ); + + b_forced = false; + free( psz_mrl ); + } + vlc_input_attachment_Delete( a ); + } + free( pp_attachment ); + if( i_attachment > 0 ) + var_Destroy( p_input, "sub-description" ); } static void LoadSlaves( input_thread_t *p_input ) @@ -1090,39 +1111,74 @@ static void LoadSlaves( input_thread_t *p_input ) free( psz_org ); } +static void UpdatePtsDelay( input_thread_t *p_input ) +{ + input_thread_private_t *p_sys = p_input->p; + + /* Get max pts delay from input source */ + mtime_t i_pts_delay = p_sys->input.i_pts_delay; + for( int i = 0; i < p_sys->i_slave; i++ ) + i_pts_delay = __MAX( i_pts_delay, p_sys->slave[i]->i_pts_delay ); + + if( i_pts_delay < 0 ) + i_pts_delay = 0; + + /* Take care of audio/spu delay */ + const mtime_t i_audio_delay = var_GetTime( p_input, "audio-delay" ); + const mtime_t i_spu_delay = var_GetTime( p_input, "spu-delay" ); + const mtime_t i_extra_delay = __MIN( i_audio_delay, i_spu_delay ); + if( i_extra_delay < 0 ) + i_pts_delay -= i_extra_delay; + + /* Update cr_average depending on the caching */ + const int i_cr_average = var_GetInteger( p_input, "cr-average" ) * i_pts_delay / DEFAULT_PTS_DELAY; + + /* */ + 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 ); /* Set up es_out */ - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, true ); i_es_out_mode = ES_OUT_MODE_AUTO; - val.p_list = NULL; if( p_input->p->p_sout ) { - var_Get( p_input, "sout-all", &val ); - if( val.b_bool ) + char *prgms; + + if( var_GetBool( p_input, "sout-all" ) ) { i_es_out_mode = ES_OUT_MODE_ALL; - val.p_list = NULL; } 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_Change( p_input, "programs", VLC_VAR_FREELIST, &val, - NULL ); - } + + free( prgms ); } } - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, i_es_out_mode ); + es_out_SetMode( p_input->p->p_es_out, i_es_out_mode ); /* Inform the demuxer about waited group (needed only for DVB) */ if( i_es_out_mode == ES_OUT_MODE_ALL ) @@ -1132,19 +1188,20 @@ static void InitPrograms( input_thread_t * p_input ) 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 ); } } static int Init( input_thread_t * p_input ) { vlc_meta_t *p_meta; - int i, ret; + int i; for( i = 0; i < p_input->p->p_item->i_options; i++ ) { @@ -1162,19 +1219,12 @@ static int Init( input_thread_t * p_input ) InitStatistics( p_input ); #ifdef ENABLE_SOUT - ret = InitSout( p_input ); - if( ret != VLC_SUCCESS ) - return ret; /* FIXME: goto error; should be better here */ + if( InitSout( p_input ) ) + goto error; #endif /* Create es out */ - p_input->p->p_es_out_display = input_EsOutNew( p_input, p_input->p->i_rate ); - p_input->p->p_es_out = input_EsOutTimeshiftNew( p_input, p_input->p->p_es_out_display, p_input->p->i_rate ); - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, false ); - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE ); - - var_Create( p_input, "bit-rate", VLC_VAR_INTEGER ); - var_Create( p_input, "sample-rate", VLC_VAR_INTEGER ); + p_input->p->p_es_out = input_EsOutTimeshiftNew( p_input, p_input->p->p_es_out_display, p_input->p->i_rate ); /* */ input_ChangeState( p_input, OPENING_S ); @@ -1197,7 +1247,9 @@ static int Init( input_thread_t * p_input ) i_length = 0; if( i_length <= 0 ) i_length = input_item_GetDuration( p_input->p->p_item ); - input_SendEventTimes( p_input, 0.0, 0, i_length ); + input_SendEventLength( p_input, i_length ); + + input_SendEventPosition( p_input, 0.0, 0 ); if( !p_input->b_preparsing ) { @@ -1211,7 +1263,7 @@ static int Init( input_thread_t * p_input ) { p_input->p->b_out_pace_control = (p_input->p->p_sout->i_out_pace_nocontrol > 0); - if( p_input->b_can_pace_control && p_input->p->b_out_pace_control ) + if( p_input->p->b_can_pace_control && p_input->p->b_out_pace_control ) { /* We don't want a high input priority here or we'll * end-up sucking up all the CPU time */ @@ -1239,12 +1291,8 @@ static int Init( input_thread_t * p_input ) InputUpdateMeta( p_input, p_meta ); } - if( !p_input->b_preparsing ) - { - msg_Dbg( p_input, "`%s' successfully opened", - p_input->p->p_item->psz_uri ); - - } + msg_Dbg( p_input, "`%s' successfully opened", + p_input->p->p_item->psz_uri ); /* initialization is complete */ input_ChangeState( p_input, PLAYING_S ); @@ -1256,15 +1304,16 @@ error: if( p_input->p->p_es_out ) es_out_Delete( p_input->p->p_es_out ); - if( p_input->p->p_es_out_display ) - es_out_Delete( p_input->p->p_es_out_display ); -#ifdef ENABLE_SOUT - if( p_input->p->p_sout ) + es_out_SetMode( p_input->p->p_es_out_display, ES_OUT_MODE_END ); + if( p_input->p->p_resource ) { - vlc_object_detach( p_input->p->p_sout ); - sout_DeleteInstance( p_input->p->p_sout ); + if( p_input->p->p_sout ) + 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 ); } -#endif if( !p_input->b_preparsing && libvlc_stats( p_input ) ) { @@ -1276,6 +1325,8 @@ error: EXIT_COUNTER( demux_read ); EXIT_COUNTER( input_bitrate ); EXIT_COUNTER( demux_bitrate ); + EXIT_COUNTER( demux_corrupted ); + EXIT_COUNTER( demux_discontinuity ); EXIT_COUNTER( played_abuffers ); EXIT_COUNTER( lost_abuffers ); EXIT_COUNTER( displayed_pictures ); @@ -1294,30 +1345,13 @@ error: } /* Mark them deleted */ - p_input->p->input.p_demux = NULL; - p_input->p->input.p_stream = NULL; - p_input->p->input.p_access = NULL; - p_input->p->p_es_out = NULL; - p_input->p->p_es_out_display = NULL; - p_input->p->p_sout = NULL; - - return VLC_EGENERIC; -} - -/***************************************************************************** - * WaitDie: Wait until we are asked to die. - ***************************************************************************** - * This function is called when an error occurred during thread main's loop. - *****************************************************************************/ -static void WaitDie( input_thread_t *p_input ) -{ - input_ChangeState( p_input, p_input->b_error ? ERROR_S : END_S ); + p_input->p->input.p_demux = NULL; + p_input->p->input.p_stream = NULL; + p_input->p->input.p_access = NULL; + p_input->p->p_es_out = NULL; + p_input->p->p_sout = NULL; - /* Wait a die order */ - vlc_object_lock( p_input ); - while( vlc_object_alive( p_input ) ) - vlc_object_wait( p_input ); - vlc_object_unlock( p_input ); + return VLC_EGENERIC; } /***************************************************************************** @@ -1334,8 +1368,7 @@ static void End( input_thread_t * p_input ) input_ControlVarStop( p_input ); /* Stop es out activity */ - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, false ); - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE ); + es_out_SetMode( p_input->p->p_es_out, ES_OUT_MODE_NONE ); /* Clean up master */ InputSourceClean( &p_input->p->input ); @@ -1351,30 +1384,22 @@ static void End( input_thread_t * p_input ) /* Unload all modules */ if( p_input->p->p_es_out ) es_out_Delete( p_input->p->p_es_out ); - if( p_input->p->p_es_out_display ) - es_out_Delete( p_input->p->p_es_out_display ); + es_out_SetMode( p_input->p->p_es_out_display, ES_OUT_MODE_END ); if( !p_input->b_preparsing ) { #define CL_CO( c ) stats_CounterClean( p_input->p->counters.p_##c ); p_input->p->counters.p_##c = NULL; if( libvlc_stats( p_input ) ) { - libvlc_priv_t *p_private = libvlc_priv( p_input->p_libvlc ); - /* make sure we are up to date */ stats_ComputeInputStats( p_input, p_input->p->p_item->p_stats ); - if( p_private->p_stats_computer == p_input ) - { - stats_ComputeGlobalStats( p_input->p_libvlc, - p_input->p_libvlc->p_stats ); - /* FIXME how can it be thread safe ? */ - p_private->p_stats_computer = NULL; - } CL_CO( read_bytes ); CL_CO( read_packets ); CL_CO( demux_read ); CL_CO( input_bitrate ); CL_CO( demux_bitrate ); + CL_CO( demux_corrupted ); + CL_CO( demux_discontinuity ); CL_CO( played_abuffers ); CL_CO( lost_abuffers ); CL_CO( displayed_pictures ); @@ -1390,21 +1415,25 @@ static void End( input_thread_t * p_input ) CL_CO( sout_sent_packets ); CL_CO( sout_sent_bytes ); CL_CO( sout_send_bitrate ); - - vlc_object_detach( p_input->p->p_sout ); } #undef CL_CO } + vlc_mutex_lock( &p_input->p->p_item->lock ); if( p_input->p->i_attachment > 0 ) { for( i = 0; i < p_input->p->i_attachment; i++ ) vlc_input_attachment_Delete( p_input->p->attachment[i] ); TAB_CLEAN( p_input->p->i_attachment, p_input->p->attachment ); } + vlc_mutex_unlock( &p_input->p->p_item->lock ); - /* Tell we're dead */ - p_input->b_dead = true; + /* */ + 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 ); } /***************************************************************************** @@ -1417,81 +1446,44 @@ void input_ControlPush( input_thread_t *p_input, if( i_type == INPUT_CONTROL_SET_DIE ) { /* Special case, empty the control */ - p_input->p->i_control = 1; - p_input->p->control[0].i_type = i_type; - memset( &p_input->p->control[0].val, 0, sizeof( vlc_value_t ) ); + for( int i = 0; i < p_input->p->i_control; i++ ) + { + input_control_t *p_ctrl = &p_input->p->control[i]; + ControlRelease( p_ctrl->i_type, p_ctrl->val ); + } + p_input->p->i_control = 0; } - else if( p_input->p->i_control >= INPUT_CONTROL_FIFO_SIZE ) + + if( p_input->p->i_control >= INPUT_CONTROL_FIFO_SIZE ) { msg_Err( p_input, "input control fifo overflow, trashing type=%d", i_type ); + if( p_val ) + ControlRelease( i_type, *p_val ); } else { - p_input->p->control[p_input->p->i_control].i_type = i_type; + input_control_t c; + c.i_type = i_type; if( p_val ) - p_input->p->control[p_input->p->i_control].val = *p_val; + c.val = *p_val; else - memset( &p_input->p->control[p_input->p->i_control].val, 0, - sizeof( vlc_value_t ) ); + memset( &c.val, 0, sizeof(c.val) ); - p_input->p->i_control++; + p_input->p->control[p_input->p->i_control++] = c; } vlc_cond_signal( &p_input->p->wait_control ); vlc_mutex_unlock( &p_input->p->lock_control ); } -static inline int ControlPopNoLock( input_thread_t *p_input, - int *pi_type, vlc_value_t *p_val, - mtime_t i_deadline ) -{ - - while( p_input->p->i_control <= 0 ) - { - if( !vlc_object_alive( p_input ) ) - return VLC_EGENERIC; - - if( i_deadline < 0 ) - return VLC_EGENERIC; - - if( vlc_cond_timedwait( &p_input->p->wait_control, &p_input->p->lock_control, i_deadline ) ) - return VLC_EGENERIC; - } - - *pi_type = p_input->p->control[0].i_type; - *p_val = p_input->p->control[0].val; - - p_input->p->i_control--; - if( p_input->p->i_control > 0 ) - { - int i; - - for( i = 0; i < p_input->p->i_control; i++ ) - { - p_input->p->control[i].i_type = p_input->p->control[i+1].i_type; - p_input->p->control[i].val = p_input->p->control[i+1].val; - } - } - - return VLC_SUCCESS; -} - -static void ControlReduce( input_thread_t *p_input ) +static int ControlGetReducedIndexLocked( input_thread_t *p_input ) { + const int i_lt = p_input->p->control[0].i_type; int i; - - if( !p_input ) - return; - for( i = 1; i < p_input->p->i_control; i++ ) { - const int i_lt = p_input->p->control[i-1].i_type; const int i_ct = p_input->p->control[i].i_type; - /* XXX We can't merge INPUT_CONTROL_SET_ES */ -/* msg_Dbg( p_input, "[%d/%d] l=%d c=%d", i, p_input->p->i_control, - i_lt, i_ct ); -*/ if( i_lt == i_ct && ( i_ct == INPUT_CONTROL_SET_STATE || i_ct == INPUT_CONTROL_SET_RATE || @@ -1502,24 +1494,95 @@ static void ControlReduce( input_thread_t *p_input ) i_ct == INPUT_CONTROL_SET_SEEKPOINT || i_ct == INPUT_CONTROL_SET_BOOKMARK ) ) { - int j; -// msg_Dbg( p_input, "merged at %d", i ); - /* Remove the i-1 */ - for( j = i; j < p_input->p->i_control; j++ ) - p_input->p->control[j-1] = p_input->p->control[j]; - p_input->p->i_control--; + continue; } else { /* TODO but that's not that important - merge SET_X with SET_X_CMD - - remove SET_SEEKPOINT/SET_POSITION/SET_TIME before a SET_TITLE - - remove SET_SEEKPOINT/SET_POSITION/SET_TIME before another among them + - ignore SET_SEEKPOINT/SET_POSITION/SET_TIME before a SET_TITLE + - ignore SET_SEEKPOINT/SET_POSITION/SET_TIME before another among them - ? */ + break; + } + } + return i - 1; +} + + +static inline int ControlPop( input_thread_t *p_input, + int *pi_type, vlc_value_t *p_val, + mtime_t i_deadline, bool b_postpone_seek ) +{ + input_thread_private_t *p_sys = p_input->p; + + vlc_mutex_lock( &p_sys->lock_control ); + while( p_sys->i_control <= 0 || + ( b_postpone_seek && ControlIsSeekRequest( p_sys->control[0].i_type ) ) ) + { + if( !vlc_object_alive( p_input ) || i_deadline < 0 ) + { + vlc_mutex_unlock( &p_sys->lock_control ); + return VLC_EGENERIC; } + + if( vlc_cond_timedwait( &p_sys->wait_control, &p_sys->lock_control, + i_deadline ) ) + { + vlc_mutex_unlock( &p_sys->lock_control ); + return VLC_EGENERIC; + } + } + + /* */ + const int i_index = ControlGetReducedIndexLocked( p_input ); + + /* */ + *pi_type = p_sys->control[i_index].i_type; + *p_val = p_sys->control[i_index].val; + + p_sys->i_control -= i_index + 1; + if( p_sys->i_control > 0 ) + memmove( &p_sys->control[0], &p_sys->control[i_index+1], + sizeof(*p_sys->control) * p_sys->i_control ); + vlc_mutex_unlock( &p_sys->lock_control ); + + return VLC_SUCCESS; +} +static bool ControlIsSeekRequest( int i_type ) +{ + switch( i_type ) + { + case INPUT_CONTROL_SET_POSITION: + case INPUT_CONTROL_SET_TIME: + case INPUT_CONTROL_SET_TITLE: + case INPUT_CONTROL_SET_TITLE_NEXT: + case INPUT_CONTROL_SET_TITLE_PREV: + case INPUT_CONTROL_SET_SEEKPOINT: + case INPUT_CONTROL_SET_SEEKPOINT_NEXT: + case INPUT_CONTROL_SET_SEEKPOINT_PREV: + case INPUT_CONTROL_SET_BOOKMARK: + return true; + default: + return false; + } +} + +static void ControlRelease( int i_type, vlc_value_t val ) +{ + switch( i_type ) + { + case INPUT_CONTROL_ADD_SUBTITLE: + case INPUT_CONTROL_ADD_SLAVE: + free( val.psz_string ); + break; + + default: + break; } } + /* Pause input */ static void ControlPause( input_thread_t *p_input, mtime_t i_control_date ) { @@ -1538,24 +1601,22 @@ static void ControlPause( input_thread_t *p_input, mtime_t i_control_date ) if( i_ret ) { msg_Warn( p_input, "cannot set pause state" ); - i_state = p_input->i_state; + return; } } /* */ - if( !i_ret ) + i_ret = es_out_SetPauseState( p_input->p->p_es_out, + p_input->p->b_can_pause, true, + i_control_date ); + if( i_ret ) { - i_ret = es_out_SetPauseState( p_input->p->p_es_out, p_input->p->b_can_pause, true, i_control_date ); - if( i_ret ) - { - msg_Warn( p_input, "cannot set pause state at es_out level" ); - i_state = p_input->i_state; - } + msg_Warn( p_input, "cannot set pause state at es_out level" ); + return; } /* Switch to new state */ input_ChangeState( p_input, i_state ); - } static void ControlUnpause( input_thread_t *p_input, mtime_t i_control_date ) @@ -1574,9 +1635,7 @@ static void ControlUnpause( input_thread_t *p_input, mtime_t i_control_date ) { /* FIXME What to do ? */ msg_Warn( p_input, "cannot unset pause -> EOF" ); - vlc_mutex_unlock( &p_input->p->lock_control ); input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL ); - vlc_mutex_lock( &p_input->p->lock_control ); } } @@ -1588,8 +1647,8 @@ static void ControlUnpause( input_thread_t *p_input, mtime_t i_control_date ) es_out_SetPauseState( p_input->p->p_es_out, false, false, i_control_date ); } -static bool Control( input_thread_t *p_input, int i_type, - vlc_value_t val ) +static bool Control( input_thread_t *p_input, + int i_type, vlc_value_t val ) { const mtime_t i_control_date = mdate(); /* FIXME b_force_update is abused, it should be carefully checked */ @@ -1608,7 +1667,6 @@ static bool Control( input_thread_t *p_input, int i_type, break; case INPUT_CONTROL_SET_POSITION: - case INPUT_CONTROL_SET_POSITION_OFFSET: { double f_pos; @@ -1627,7 +1685,7 @@ static bool Control( input_thread_t *p_input, int i_type, /* Reset the decoders states and clock sync (before calling the demuxer */ es_out_SetTime( p_input->p->p_es_out, -1 ); if( demux_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION, - f_pos ) ) + f_pos, !p_input->p->b_fast_seek ) ) { msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) " "%2.1f%% failed", f_pos * 100 ); @@ -1644,7 +1702,6 @@ static bool Control( input_thread_t *p_input, int i_type, } case INPUT_CONTROL_SET_TIME: - case INPUT_CONTROL_SET_TIME_OFFSET: { int64_t i_time; int i_ret; @@ -1666,19 +1723,20 @@ static bool Control( input_thread_t *p_input, int i_type, es_out_SetTime( p_input->p->p_es_out, -1 ); i_ret = demux_Control( p_input->p->input.p_demux, - DEMUX_SET_TIME, i_time ); + DEMUX_SET_TIME, i_time, + !p_input->p->b_fast_seek ); if( i_ret ) { int64_t i_length; /* Emulate it with a SET_POS */ - demux_Control( p_input->p->input.p_demux, - DEMUX_GET_LENGTH, &i_length ); - if( i_length > 0 ) + if( !demux_Control( p_input->p->input.p_demux, + DEMUX_GET_LENGTH, &i_length ) && i_length > 0 ) { double f_pos = (double)i_time / (double)i_length; i_ret = demux_Control( p_input->p->input.p_demux, - DEMUX_SET_POSITION, f_pos ); + DEMUX_SET_POSITION, f_pos, + !p_input->p->b_fast_seek ); } } if( i_ret ) @@ -1698,14 +1756,15 @@ static bool Control( input_thread_t *p_input, int i_type, } case INPUT_CONTROL_SET_STATE: - if( ( val.i_int == PLAYING_S && p_input->i_state == PAUSE_S ) || - ( val.i_int == PAUSE_S && p_input->i_state == PAUSE_S ) ) + if( val.i_int != PLAYING_S && val.i_int != PAUSE_S ) + msg_Err( p_input, "invalid state in INPUT_CONTROL_SET_STATE" ); + else if( p_input->p->i_state == PAUSE_S ) { ControlUnpause( p_input, i_control_date ); b_force_update = true; } - else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S /* && + else if( val.i_int == PAUSE_S && p_input->p->i_state == PLAYING_S /* && p_input->p->b_can_pause */ ) { ControlPause( p_input, i_control_date ); @@ -1717,72 +1776,15 @@ static bool Control( input_thread_t *p_input, int i_type, b_force_update = true; /* Correct "state" value */ - input_ChangeState( p_input, p_input->i_state ); - } - else if( val.i_int != PLAYING_S && val.i_int != PAUSE_S ) - { - msg_Err( p_input, "invalid state in INPUT_CONTROL_SET_STATE" ); + input_ChangeState( p_input, p_input->p->i_state ); } 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 ) @@ -1819,7 +1821,7 @@ static bool Control( input_thread_t *p_input, int i_type, i_rate = INPUT_RATE_DEFAULT; } if( i_rate != p_input->p->i_rate && - !p_input->b_can_pace_control && p_input->p->b_can_rate_control ) + !p_input->p->b_can_pace_control && p_input->p->b_can_rate_control ) { int i_ret; if( p_input->p->input.p_access ) @@ -1849,7 +1851,7 @@ static bool Control( input_thread_t *p_input, int i_type, if( p_input->p->input.b_rescale_ts ) { - const int i_rate_source = (p_input->b_can_pace_control || p_input->p->b_can_rate_control ) ? i_rate : INPUT_RATE_DEFAULT; + const int i_rate_source = (p_input->p->b_can_pace_control || p_input->p->b_can_rate_control ) ? i_rate : INPUT_RATE_DEFAULT; es_out_SetRate( p_input->p->p_es_out, i_rate_source, i_rate ); } @@ -1877,13 +1879,13 @@ static bool Control( input_thread_t *p_input, int i_type, 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 ); + 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 ); + input_SendEventSubtitleDelay( p_input, val.i_time ); + UpdatePtsDelay( p_input ); break; case INPUT_CONTROL_SET_TITLE: @@ -1914,7 +1916,7 @@ static bool Control( input_thread_t *p_input, int i_type, es_out_SetTime( p_input->p->p_es_out, -1 ); demux_Control( p_demux, DEMUX_SET_TITLE, i_title ); - input_ControlVarTitle( p_input, i_title ); + input_SendEventTitle( p_input, i_title ); } } else if( p_input->p->input.i_title > 0 ) @@ -1935,6 +1937,7 @@ static bool Control( input_thread_t *p_input, int i_type, stream_Control( p_input->p->input.p_stream, STREAM_CONTROL_ACCESS, ACCESS_SET_TITLE, i_title ); + input_SendEventTitle( p_input, i_title ); } } break; @@ -1980,6 +1983,7 @@ static bool Control( input_thread_t *p_input, int i_type, es_out_SetTime( p_input->p->p_es_out, -1 ); demux_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint ); + input_SendEventSeekpoint( p_input, p_demux->info.i_title, i_seekpoint ); } } else if( p_input->p->input.i_title > 0 ) @@ -2014,16 +2018,14 @@ static bool Control( input_thread_t *p_input, int i_type, stream_Control( p_input->p->input.p_stream, STREAM_CONTROL_ACCESS, ACCESS_SET_SEEKPOINT, i_seekpoint ); + input_SendEventSeekpoint( p_input, p_access->info.i_title, i_seekpoint ); } } break; case INPUT_CONTROL_ADD_SUBTITLE: if( val.psz_string ) - { SubtitleAdd( p_input, val.psz_string, true ); - free( val.psz_string ); - } break; case INPUT_CONTROL_ADD_SLAVE: @@ -2050,7 +2052,7 @@ static bool Control( input_thread_t *p_input, int i_type, break; } if( demux_Control( slave->p_demux, - DEMUX_SET_TIME, i_time ) ) + DEMUX_SET_TIME, i_time, true ) ) { msg_Err( p_input, "seek failed for new slave" ); InputSourceClean( slave ); @@ -2075,8 +2077,6 @@ static bool Control( input_thread_t *p_input, int i_type, msg_Warn( p_input, "failed to add %s as slave", val.psz_string ); } - - free( val.psz_string ); } break; @@ -2103,11 +2103,11 @@ static bool Control( input_thread_t *p_input, int i_type, break; case INPUT_CONTROL_SET_FRAME_NEXT: - if( p_input->i_state == PAUSE_S ) + if( p_input->p->i_state == PAUSE_S ) { es_out_SetFrameNext( p_input->p->p_es_out ); } - else if( p_input->i_state == PLAYING_S ) + else if( p_input->p->i_state == PLAYING_S ) { ControlPause( p_input, i_control_date ); } @@ -2136,7 +2136,7 @@ static bool Control( input_thread_t *p_input, int i_type, 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; } @@ -2148,7 +2148,7 @@ static bool Control( input_thread_t *p_input, int i_type, else if( bookmark.i_byte_offset >= 0 && p_input->p->input.p_stream ) { - const int64_t i_size = stream_Size( 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 ) { val.f_float = (double)bookmark.i_byte_offset / i_size; @@ -2163,6 +2163,7 @@ static bool Control( input_thread_t *p_input, int i_type, break; } + ControlRelease( i_type, val ); return b_force_update; } @@ -2321,16 +2322,17 @@ static int InputSourceInit( input_thread_t *p_input, input_source_t *in, const char *psz_mrl, const char *psz_forced_demux ) { - char psz_dup[strlen(psz_mrl) + 1]; const char *psz_access; const char *psz_demux; char *psz_path; - char *psz_tmp; - char *psz; - vlc_value_t val; + char *psz_var_demux = NULL; double f_fps; - strcpy( psz_dup, psz_mrl ); + assert( psz_mrl ); + char *psz_dup = strdup( psz_mrl ); + + if( psz_dup == NULL ) + goto error; /* Split uri */ input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_dup ); @@ -2357,7 +2359,7 @@ static int InputSourceInit( input_thread_t *p_input, { /* special hack for forcing a demuxer with --demux=module * (and do nothing with a list) */ - char *psz_var_demux = var_GetNonEmptyString( p_input, "demux" ); + psz_var_demux = var_GetNonEmptyString( p_input, "demux" ); if( psz_var_demux != NULL && !strchr(psz_var_demux, ',' ) && @@ -2370,7 +2372,7 @@ static int InputSourceInit( input_thread_t *p_input, } /* Try access_demux first */ - in->p_demux = demux_New( p_input, psz_access, psz_demux, psz_path, + in->p_demux = demux_New( p_input, p_input, psz_access, psz_demux, psz_path, NULL, p_input->p->p_es_out, false ); } else @@ -2387,12 +2389,12 @@ static int InputSourceInit( input_thread_t *p_input, if( in->p_demux ) { - int64_t i_pts_delay; - /* Get infos from access_demux */ - demux_Control( in->p_demux, - DEMUX_GET_PTS_DELAY, &i_pts_delay ); - p_input->i_pts_delay = __MAX( p_input->i_pts_delay, i_pts_delay ); + 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, @@ -2405,6 +2407,8 @@ static int InputSourceInit( input_thread_t *p_input, &in->b_can_pace_control ) ) in->b_can_pace_control = false; + assert( in->p_demux->pf_demux != NULL || !in->b_can_pace_control ); + if( !in->b_can_pace_control ) { if( demux_Control( in->p_demux, DEMUX_CAN_CONTROL_RATE, @@ -2424,49 +2428,37 @@ static int InputSourceInit( input_thread_t *p_input, in->b_can_pause = false; var_SetBool( p_input, "can-pause", in->b_can_pause || !in->b_can_pace_control ); /* XXX temporary because of es_out_timeshift*/ var_SetBool( p_input, "can-rate", !in->b_can_pace_control || in->b_can_rate_control ); /* XXX temporary because of es_out_timeshift*/ - var_SetBool( p_input, "can-rewind", !in->b_rescale_ts && !in->b_can_pace_control ); + var_SetBool( p_input, "can-rewind", !in->b_rescale_ts && !in->b_can_pace_control && in->b_can_rate_control ); - int ret = demux_Control( in->p_demux, DEMUX_CAN_SEEK, - &val.b_bool ); - if( ret != VLC_SUCCESS ) - val.b_bool = false; - var_Set( p_input, "can-seek", val ); + bool b_can_seek; + if( demux_Control( in->p_demux, DEMUX_CAN_SEEK, &b_can_seek ) ) + b_can_seek = false; + var_SetBool( p_input, "can-seek", b_can_seek ); } else { - int64_t i_pts_delay; - /* Now try a real access */ - in->p_access = access_New( p_input, psz_access, psz_demux, psz_path ); - - /* Access failed, URL encoded ? */ - if( in->p_access == NULL && strchr( psz_path, '%' ) ) - { - decode_URI( psz_path ); - - msg_Dbg( p_input, "retrying with access `%s' demux `%s' path `%s'", - psz_access, psz_demux, psz_path ); - - in->p_access = access_New( p_input, - psz_access, psz_demux, psz_path ); - } + in->p_access = access_New( p_input, p_input, psz_access, psz_demux, psz_path ); if( in->p_access == NULL ) { - msg_Err( p_input, "open of `%s' failed: %s", psz_mrl, - msg_StackMsg() ); - intf_UserFatal( VLC_OBJECT( p_input), false, - _("Your input can't be opened"), - _("VLC is unable to open the MRL '%s'." - " Check the log for details."), psz_mrl ); + 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 ); + } goto error; } /* Get infos from access */ if( !p_input->b_preparsing ) { + bool b_can_seek; access_Control( in->p_access, - ACCESS_GET_PTS_DELAY, &i_pts_delay ); - p_input->i_pts_delay = __MAX( p_input->i_pts_delay, i_pts_delay ); + 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, @@ -2481,125 +2473,105 @@ static int InputSourceInit( input_thread_t *p_input, in->b_can_rate_control = in->b_can_pace_control; in->b_rescale_ts = true; - access_Control( in->p_access, ACCESS_CAN_PAUSE, - &in->b_can_pause ); + access_Control( in->p_access, ACCESS_CAN_PAUSE, &in->b_can_pause ); var_SetBool( p_input, "can-pause", in->b_can_pause || !in->b_can_pace_control ); /* XXX temporary because of es_out_timeshift*/ var_SetBool( p_input, "can-rate", !in->b_can_pace_control || in->b_can_rate_control ); /* XXX temporary because of es_out_timeshift*/ var_SetBool( p_input, "can-rewind", !in->b_rescale_ts && !in->b_can_pace_control ); - access_Control( in->p_access, ACCESS_CAN_SEEK, - &val.b_bool ); - var_Set( p_input, "can-seek", val ); + access_Control( in->p_access, ACCESS_CAN_SEEK, &b_can_seek ); + var_SetBool( p_input, "can-seek", b_can_seek ); } - /* TODO (maybe) - * do not let stream_AccessNew access input-list - * but give it a list of access ? */ + /* */ + int i_input_list; + char **ppsz_input_list; + + TAB_INIT( i_input_list, ppsz_input_list ); - /* Autodetect extra files if none specified */ - char *psz_input_list = var_CreateGetNonEmptyString( p_input, "input-list" ); - if( !psz_input_list ) + /* On master stream only, use input-list */ + if( &p_input->p->input == in ) { - char *psz_extra_files = InputGetExtraFiles( p_input, psz_access, psz_path ); - if( psz_extra_files ) - var_SetString( p_input, "input-list", psz_extra_files ); - free( psz_extra_files ); - } + char *psz_list; + char *psz_parser; - /* Create the stream_t */ - in->p_stream = stream_AccessNew( in->p_access, p_input->b_preparsing ); + psz_list = + psz_parser = var_CreateGetNonEmptyString( p_input, "input-list" ); - /* Restore old value */ - if( !psz_input_list ) - var_SetString( p_input, "input-list", "" ); - free( psz_input_list ); + while( psz_parser && *psz_parser ) + { + char *p = strchr( psz_parser, ',' ); + if( p ) + *p++ = '\0'; - if( in->p_stream == NULL ) - { - msg_Warn( p_input, "cannot create a stream_t from access" ); - goto error; - } + if( *psz_parser ) + { + char *psz_name = strdup( psz_parser ); + if( psz_name ) + TAB_APPEND( i_input_list, ppsz_input_list, psz_name ); + } - /* Add auto stream filter */ - for( ;; ) + psz_parser = p; + } + free( psz_list ); + } + /* Autodetect extra files if none specified */ + if( i_input_list <= 0 ) { - stream_t *p_filter = stream_FilterNew( in->p_stream, NULL ); - if( !p_filter ) - break; - - msg_Dbg( p_input, "Inserted a stream filter" ); - in->p_stream = p_filter; + InputGetExtraFiles( p_input, &i_input_list, &ppsz_input_list, + psz_access, psz_path ); } + if( i_input_list > 0 ) + TAB_APPEND( i_input_list, ppsz_input_list, NULL ); - /* Add user stream filter */ - psz_tmp = psz = var_GetNonEmptyString( p_input, "stream-filter" ); - while( psz && *psz ) + /* Create the stream_t */ + in->p_stream = stream_AccessNew( in->p_access, ppsz_input_list ); + if( ppsz_input_list ) { - stream_t *p_filter; - char *psz_end = strchr( psz, ':' ); - - if( psz_end ) - *psz_end++ = '\0'; - - p_filter = stream_FilterNew( in->p_stream, psz ); - if( p_filter ) - in->p_stream = p_filter; - else - msg_Warn( p_input, "failed to insert stream filter %s", psz ); - - psz = psz_end; + for( int i = 0; ppsz_input_list[i] != NULL; i++ ) + free( ppsz_input_list[i] ); + TAB_CLEAN( i_input_list, ppsz_input_list ); } - free( psz_tmp ); - /* Add record filter if usefull */ - if( var_GetBool( p_input, "input-record-native" ) ) + if( in->p_stream == NULL ) { - stream_t *p_filter; - - p_filter = stream_FilterNew( in->p_stream, "stream_filter_record" ); - if( p_filter ) - in->p_stream = p_filter; - else - var_SetBool( p_input, "input-record-native", false ); + msg_Warn( p_input, "cannot create a stream_t from access" ); + goto error; } + /* Add stream filters */ + char *psz_stream_filter = var_GetNonEmptyString( p_input, + "stream-filter" ); + in->p_stream = stream_FilterChainNew( in->p_stream, + psz_stream_filter, + var_GetBool( p_input, "input-record-native" ) ); + free( psz_stream_filter ); + /* Open a demuxer */ if( *psz_demux == '\0' && *in->p_access->psz_demux ) { psz_demux = in->p_access->psz_demux; } - { - /* Take access redirections into account */ - char *psz_real_path; - char *psz_buf = NULL; - if( in->p_access->psz_path ) - { - const char *psz_a, *psz_d; - psz_buf = strdup( in->p_access->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, 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 ); - intf_UserFatal( VLC_OBJECT( p_input ), false, - _("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( vlc_object_alive( p_input ) ) + { + 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 ); + } goto error; } + assert( in->p_demux->pf_demux != NULL ); /* Get title from demux */ if( !p_input->b_preparsing && in->i_title <= 0 ) @@ -2617,6 +2589,9 @@ static int InputSourceInit( input_thread_t *p_input, } } + free( psz_var_demux ); + free( psz_dup ); + /* Set record capabilities */ if( demux_Control( in->p_demux, DEMUX_CAN_RECORD, &in->b_can_stream_record ) ) in->b_can_stream_record = false; @@ -2665,6 +2640,9 @@ error: if( in->p_access ) access_Delete( in->p_access ); + free( psz_var_demux ); + free( psz_dup ); + return VLC_EGENERIC; } @@ -2704,25 +2682,33 @@ static void InputSourceMeta( input_thread_t *p_input, /* XXX Remember that checking against p_item->p_meta->i_status & ITEM_PREPARSED * is a bad idea */ + bool has_meta; + /* Read access meta */ - if( p_access ) - access_Control( p_access, ACCESS_GET_META, p_meta ); + has_meta = p_access && !access_Control( p_access, ACCESS_GET_META, p_meta ); /* Read demux meta */ - demux_Control( p_demux, DEMUX_GET_META, p_meta ); + has_meta |= !demux_Control( p_demux, DEMUX_GET_META, p_meta ); - /* If the demux report unsupported meta data, try an external "meta reader" */ - bool b_bool; - if( demux_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) ) - return; - if( !b_bool ) + bool has_unsupported; + if( demux_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &has_unsupported ) ) + has_unsupported = true; + + /* If the demux report unsupported meta data, or if we don't have meta data + * try an external "meta reader" */ + if( has_meta && !has_unsupported ) return; - demux_meta_t *p_demux_meta = p_demux->p_private = calloc( 1, sizeof(*p_demux_meta) ); + demux_meta_t *p_demux_meta = + vlc_custom_create( p_demux, sizeof( *p_demux_meta ), + VLC_OBJECT_GENERIC, "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; - module_t *p_id3 = module_need( p_demux, "meta reader", NULL, 0 ); + module_t *p_id3 = module_need( p_demux_meta, "meta reader", NULL, false ); if( p_id3 ) { if( p_demux_meta->p_meta ) @@ -2740,31 +2726,38 @@ static void InputSourceMeta( input_thread_t *p_input, } module_unneed( p_demux, p_id3 ); } - free( p_demux_meta ); + vlc_object_release( p_demux_meta ); } -static void SlaveDemux( input_thread_t *p_input ) +static void SlaveDemux( input_thread_t *p_input, bool *pb_demux_polled ) { int64_t i_time; int i; - bool b_set_time = true; + *pb_demux_polled = false; if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) ) { - /* msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" ); */ - b_set_time = false; + msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" ); + return; } for( i = 0; i < p_input->p->i_slave; i++ ) { input_source_t *in = p_input->p->slave[i]; - int i_ret = 1; + int i_ret; if( in->b_eof ) continue; - if( b_set_time && demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) ) + const bool b_demux_polled = in->p_demux->pf_demux != NULL; + if( !b_demux_polled ) + continue; + + *pb_demux_polled = true; + + /* Call demux_Demux until we have read enough data */ + if( demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) ) { for( ;; ) { @@ -2778,7 +2771,10 @@ static void SlaveDemux( input_thread_t *p_input ) } if( i_stime >= i_time ) + { + i_ret = 1; break; + } if( ( i_ret = demux_Demux( in->p_demux ) ) <= 0 ) break; @@ -2812,7 +2808,7 @@ static void SlaveSeek( input_thread_t *p_input ) { input_source_t *in = p_input->p->slave[i]; - if( demux_Control( in->p_demux, DEMUX_SET_TIME, i_time ) ) + if( demux_Control( in->p_demux, DEMUX_SET_TIME, i_time, true ) ) { if( !in->b_eof ) msg_Err( p_input, "seek failed for slave %d -> EOF", i ); @@ -2830,23 +2826,28 @@ static void SlaveSeek( input_thread_t *p_input ) *****************************************************************************/ static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta ) { - vlc_value_t val; + static const struct { int i_meta; const char *psz_name; } p_list[] = { + { vlc_meta_Title, "meta-title" }, + { vlc_meta_Artist, "meta-artist" }, + { vlc_meta_Genre, "meta-genre" }, + { vlc_meta_Copyright, "meta-copyright" }, + { vlc_meta_Description, "meta-description" }, + { vlc_meta_Date, "meta-date" }, + { vlc_meta_URL, "meta-url" }, + { 0, NULL } + }; /* Get meta information from user */ -#define GET_META( field, s ) do { \ - var_Get( p_input, (s), &val ); \ - if( val.psz_string && *val.psz_string ) \ - vlc_meta_Set( p_meta, vlc_meta_ ## field, val.psz_string ); \ - free( val.psz_string ); } while(0) - - GET_META( Title, "meta-title" ); - GET_META( Artist, "meta-artist" ); - GET_META( Genre, "meta-genre" ); - GET_META( Copyright, "meta-copyright" ); - GET_META( Description, "meta-description" ); - GET_META( Date, "meta-date" ); - GET_META( URL, "meta-url" ); -#undef GET_META + for( int i = 0; p_list[i].psz_name; i++ ) + { + char *psz_string = var_GetNonEmptyString( p_input, p_list[i].psz_name ); + if( !psz_string ) + continue; + + EnsureUTF8( psz_string ); + vlc_meta_Set( p_meta, p_list[i].i_meta, psz_string ); + free( psz_string ); + } } /***************************************************************************** @@ -2855,48 +2856,8 @@ static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta ) *****************************************************************************/ static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta ) { - input_item_t *p_item = p_input->p->p_item; - - char *psz_title = NULL; - char *psz_arturl = input_item_GetArtURL( p_item ); - - vlc_mutex_lock( &p_item->lock ); - - if( vlc_meta_Get( p_meta, vlc_meta_Title ) && !p_item->b_fixed_name ) - psz_title = strdup( vlc_meta_Get( p_meta, vlc_meta_Title ) ); - - vlc_meta_Merge( p_item->p_meta, p_meta ); - + es_out_ControlSetMeta( p_input->p->p_es_out, p_meta ); vlc_meta_Delete( p_meta ); - - if( psz_arturl && *psz_arturl ) - { - vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, psz_arturl ); - - if( !strncmp( psz_arturl, "attachment://", strlen("attachment") ) ) - { - /* Don't look for art cover if sout - * XXX It can change when sout has meta data support */ - if( p_input->p->p_sout && !p_input->b_preparsing ) - vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, "" ); - else - input_ExtractAttachmentAndCacheArt( p_input ); - } - } - free( psz_arturl ); - - vlc_mutex_unlock( &p_item->lock ); - - if( psz_title ) - { - input_item_SetName( p_item, psz_title ); - free( psz_title ); - } - input_item_SetPreparsed( p_item, true ); - - input_SendEventMeta( p_input ); - - /** \todo handle sout meta */ } static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment, @@ -2906,8 +2867,8 @@ static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_atta input_attachment_t **attachment = *ppp_attachment; int i; - attachment = realloc( attachment, - sizeof(input_attachment_t**) * ( i_attachment + i_new ) ); + attachment = xrealloc( attachment, + sizeof(input_attachment_t**) * ( i_attachment + i_new ) ); for( i = 0; i < i_new; i++ ) attachment[i_attachment++] = pp_new[i]; free( pp_new ); @@ -2920,64 +2881,101 @@ static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_atta * InputGetExtraFiles * Autodetect extra input list *****************************************************************************/ -static char *InputGetExtraFiles( input_thread_t *p_input, - const char *psz_access, const char *psz_path ) +static void InputGetExtraFilesPattern( input_thread_t *p_input, + int *pi_list, char ***pppsz_list, + const char *psz_path, + const char *psz_match, + const char *psz_format, + int i_start, int i_stop ) { - char *psz_list = NULL; + int i_list; + char **ppsz_list; - if( ( psz_access && *psz_access && strcmp( psz_access, "file" ) ) || !psz_path ) - return NULL; + TAB_INIT( i_list, ppsz_list ); + char *psz_base = strdup( psz_path ); + if( !psz_base ) + goto exit; - const char *psz_ext = strrchr( psz_path, '.' ); - if( !psz_ext || strcmp( psz_ext, ".001" ) ) - return NULL; - - char *psz_file = strdup( psz_path ); - if( !psz_file ) - return NULL; + /* Remove the extension */ + char *psz_end = &psz_base[strlen(psz_base)-strlen(psz_match)]; + assert( psz_end >= psz_base); + *psz_end = '\0'; - /* Try to list .xyz files */ - for( int i = 2; i < 999; i++ ) + /* Try to list files */ + for( int i = i_start; i <= i_stop; i++ ) { - char *psz_ext = strrchr( psz_file, '.' ); struct stat st; + char *psz_file; - snprintf( psz_ext, 5, ".%.3d", i ); + if( asprintf( &psz_file, psz_format, psz_base, i ) < 0 ) + break; - if( utf8_stat( psz_file, &st ) - || !S_ISREG( st.st_mode ) || !st.st_size ) - continue; + if( vlc_stat( psz_file, &st ) || !S_ISREG( st.st_mode ) || !st.st_size ) + { + free( psz_file ); + break; + } msg_Dbg( p_input, "Detected extra file `%s'", psz_file ); + TAB_APPEND( i_list, ppsz_list, psz_file ); + } + free( psz_base ); +exit: + *pi_list = i_list; + *pppsz_list = ppsz_list; +} - if( psz_list ) - { - char *psz_old = psz_list; - /* FIXME how to handle file with ',' ?*/ - if( asprintf( &psz_list, "%s,%s", psz_old, psz_file ) < 0 ) - { - psz_list = psz_old; - break; - } - } - else +static void InputGetExtraFiles( input_thread_t *p_input, + int *pi_list, char ***pppsz_list, + const char *psz_access, const char *psz_path ) +{ + static const struct + { + const char *psz_match; + const char *psz_format; + int i_start; + int i_stop; + } p_pattern[] = { + /* XXX the order is important */ + { ".001", "%s.%.3d", 2, 999 }, + { ".part1.rar", "%s.part%.1d.rar",2, 9 }, + { ".part01.rar", "%s.part%.2d.rar",2, 99, }, + { ".part001.rar", "%s.part%.3d.rar",2, 999 }, + { ".rar", "%s.r%.2d", 0, 99 }, + { NULL, NULL, 0, 0 } + }; + + TAB_INIT( *pi_list, *pppsz_list ); + + if( ( psz_access && *psz_access && strcmp( psz_access, "file" ) ) || !psz_path ) + return; + + const size_t i_path = strlen(psz_path); + + for( int i = 0; p_pattern[i].psz_match != NULL; i++ ) + { + const size_t i_ext = strlen(p_pattern[i].psz_match ); + + if( i_path < i_ext ) + continue; + if( !strcmp( &psz_path[i_path-i_ext], p_pattern[i].psz_match ) ) { - psz_list = strdup( psz_file ); + InputGetExtraFilesPattern( p_input, pi_list, pppsz_list, + psz_path, + p_pattern[i].psz_match, p_pattern[i].psz_format, + p_pattern[i].i_start, p_pattern[i].i_stop ); + return; } } - free( psz_file ); - - return psz_list; } - /* */ static void input_ChangeState( input_thread_t *p_input, int i_state ) { - const bool b_changed = p_input->i_state != i_state; + const bool b_changed = p_input->p->i_state != i_state; - p_input->i_state = i_state; + p_input->p->i_state = i_state; if( i_state == ERROR_S ) p_input->b_error = true; else if( i_state == END_S ) @@ -2995,11 +2993,11 @@ static void input_ChangeState( input_thread_t *p_input, int i_state ) * 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 **ppsz_access, const char **ppsz_demux, + char **ppsz_path, char *psz_dup ) { - char *psz_access = NULL; - char *psz_demux = NULL; + const char *psz_access; + const char *psz_demux = ""; char *psz_path; /* Either there is an access/demux specification before :// @@ -3010,24 +3008,39 @@ void input_SplitMRL( const char **ppsz_access, const char **ppsz_demux, char **p *psz_path = '\0'; psz_path += 3; /* skips "://" */ - /* Separate access from demux (/://) */ 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++; + + /* Separate access from demux (/://) */ + char *p = strchr( psz_access, '/' ); + if( p ) + { + *p = '\0'; + psz_demux = p + 1; + if( psz_demux[0] == '$' ) + psz_demux++; + } + + /* Remove HTML anchor if present (not supported). + * The hash symbol itself should be URI-encoded. */ + p = strchr( psz_path, '#' ); + if( p ) + *p = '\0'; } else { +#ifndef NDEBUG + fprintf( stderr, "%s(\"%s\"): not a valid URI!\n", __func__, + psz_dup ); +#endif psz_path = psz_dup; + psz_access = ""; } - *ppsz_access = psz_access ? psz_access : (char*)""; - *ppsz_demux = psz_demux ? psz_demux : (char*)""; + + *ppsz_access = psz_access; + *ppsz_demux = psz_demux; *ppsz_path = psz_path; } @@ -3145,7 +3158,7 @@ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_for strcpy( psz_extension, ".idx" ); - if( !utf8_stat( psz_path, &st ) && S_ISREG( st.st_mode ) ) + if( !vlc_stat( psz_path, &st ) && S_ISREG( st.st_mode ) ) { msg_Dbg( p_input, "using %s subtitles file instead of %s", psz_path, psz_subtitle ); @@ -3155,14 +3168,19 @@ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_for 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" ) ) { free( sub ); + free( url ); return; } + free( url ); TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub ); /* Select the ES */ @@ -3179,7 +3197,7 @@ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_for es_out_Control( p_input->p->p_es_out_display, ES_OUT_SET_ES_DEFAULT_BY_ID, i_id ); es_out_Control( p_input->p->p_es_out_display, ES_OUT_SET_ES_BY_ID, i_id ); } - var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, NULL ); + var_FreeList( &list, NULL ); } } @@ -3189,7 +3207,7 @@ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_for void input_UpdateStatistic( input_thread_t *p_input, input_statistic_t i_type, int i_delta ) { - assert( p_input->i_state != INIT_S ); + assert( p_input->p->i_state != INIT_S ); vlc_mutex_lock( &p_input->p->counters.counters_lock); switch( i_type ) @@ -3222,13 +3240,6 @@ void input_UpdateStatistic( input_thread_t *p_input, } vlc_mutex_unlock( &p_input->p->counters.counters_lock); } -/***************************************************************************** - * input_GetEventManager - *****************************************************************************/ -vlc_event_manager_t *input_GetEventManager( input_thread_t *p_input ) -{ - return &p_input->p->event_manager; -} /**/ /* TODO FIXME nearly the same logic that snapshot code */ @@ -3237,7 +3248,7 @@ char *input_CreateFilename( vlc_object_t *p_obj, const char *psz_path, const cha char *psz_file; DIR *path; - path = utf8_opendir( psz_path ); + path = vlc_opendir( psz_path ); if( path ) { closedir( path ); @@ -3247,6 +3258,7 @@ char *input_CreateFilename( vlc_object_t *p_obj, const char *psz_path, const cha return NULL; filename_sanitize( psz_tmp ); + if( asprintf( &psz_file, "%s"DIR_SEP"%s%s%s", psz_path, psz_tmp, psz_extension ? "." : "",