X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=7afbd52f8f2342f6fdebaf773795b0e7b71e4b5a;hb=ae780fe9874757c9c06c443e04ce613d875ab5ca;hp=9c6db1be75bb913683831b5e898a2b2a09a23309;hpb=25de145c19d5f470662420cffe0d3faf06c6bcd9;p=vlc diff --git a/src/input/input.c b/src/input/input.c index 9c6db1be75..7afbd52f8f 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -75,7 +75,8 @@ static void ObjectKillChildrens( input_thread_t *, vlc_object_t * ); static inline int ControlPop( 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 void ControlRelease( int i_type, vlc_value_t val ); +static bool Control( input_thread_t *, int, vlc_value_t ); static int UpdateTitleSeekpointFromAccess( input_thread_t * ); static void UpdateGenericFromAccess( input_thread_t * ); @@ -93,7 +94,7 @@ 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 ); @@ -109,6 +110,203 @@ 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 */ +/* Do not let a pts_delay from access/demux go beyong 60s */ +#define INPUT_PTS_DELAY_MAX INT64_C(60000000) + +/** + * 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 ); +} + +/** + * 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; +} + +/** + * 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; + + p_input = Create( p_parent, p_item, NULL, false, NULL ); + if( !p_input ) + return VLC_EGENERIC; + + if( b_block ) + { + RunAndDestroy( VLC_OBJECT(p_input) ); + return VLC_SUCCESS; + } + else + { + if( vlc_thread_create( p_input, "input", RunAndDestroy, + VLC_THREAD_PRIORITY_INPUT ) ) + { + 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 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 ); +} + +input_resource_t *input_DetachResource( input_thread_t *p_input ) +{ + assert( p_input->b_dead ); + + input_resource_SetInput( p_input->p->p_resource, NULL ); + + input_resource_t *p_resource = input_resource_Detach( p_input->p->p_resource ); + p_input->p->p_sout = NULL; + + return p_resource; +} + +/** + * 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. @@ -318,177 +516,15 @@ static void Destructor( input_thread_t * p_input ) 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, input_resource_t *p_resource ) -{ - input_thread_t *p_input; - - p_input = Create( p_parent, p_item, psz_log, false, p_resource ); - if( !p_input ) - return NULL; - - /* Create thread and wait for its readiness. */ - if( vlc_thread_create( p_input, "input", Run, - VLC_THREAD_PRIORITY_INPUT ) ) + for( int i = 0; i < p_input->p->i_control; i++ ) { - 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; - } - - return p_input; -} - -/** - * 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; - - p_input = Create( p_parent, p_item, NULL, false, NULL ); - if( !p_input ) - return VLC_EGENERIC; - - if( b_block ) - { - RunAndDestroy( VLC_OBJECT(p_input) ); - return VLC_SUCCESS; - } - else - { - if( vlc_thread_create( p_input, "input", RunAndDestroy, - VLC_THREAD_PRIORITY_INPUT ) ) - { - input_ChangeState( p_input, ERROR_S ); - msg_Err( p_input, "cannot create input thread" ); - vlc_object_release( p_input ); - return VLC_EGENERIC; - } + input_control_t *p_ctrl = &p_input->p->control[i]; + ControlRelease( p_ctrl->i_type, p_ctrl->val ); } - 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_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, 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 ); -} - -input_resource_t *input_DetachResource( input_thread_t *p_input ) -{ - assert( p_input->b_dead ); - - input_resource_SetInput( p_input->p->p_resource, NULL ); - - input_resource_t *p_resource = input_resource_Detach( p_input->p->p_resource ); - p_input->p->p_sout = NULL; - - return p_resource; -} -/** - * 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 || i == VLC_OBJECT_PACKETIZER ) - 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 ); } /***************************************************************************** @@ -556,14 +592,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->p->i_time >= p_input->p->i_stop ) || - ( p_input->p->i_run > 0 && *pi_start_mdate+p_input->p->i_run < mdate() ) ) + ( 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 ); @@ -593,66 +630,67 @@ static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed, mtime_t *p if( i_ret == 0 ) /* EOF */ { - int i_repeat = var_GetInteger( p_input, "input-repeat" ); - if( i_repeat == 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)", i_repeat ); - if( i_repeat > 0 ) - { - i_repeat--; - var_SetInteger( p_input, "input-repeat", i_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; } /** @@ -721,6 +759,7 @@ static void MainLoop( input_thread_t *p_input ) mtime_t i_deadline; mtime_t i_wakeup; bool b_paused; + bool b_demux_polled; /* Demux data */ b_force_update = false; @@ -731,11 +770,12 @@ static void MainLoop( input_thread_t *p_input ) b_paused = p_input->p->i_state == PAUSE_S && !es_out_GetBuffering( p_input->p->p_es_out ); + 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 ); } @@ -746,14 +786,15 @@ static void MainLoop( input_thread_t *p_input ) } else { - break; + if( MainLoopTryRepeat( p_input, &i_start_mdate ) ) + break; } } /* */ do { i_deadline = i_wakeup; - if( b_paused ) + if( b_paused || !b_demux_polled ) i_deadline = __MIN( i_intf_update, i_statistic_update ); /* Handle control */ @@ -781,13 +822,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 ); } @@ -908,9 +945,12 @@ 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" ); @@ -1068,13 +1108,11 @@ static void InitPrograms( input_thread_t * 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 ) { if( var_GetBool( p_input, "sout-all" ) ) { i_es_out_mode = ES_OUT_MODE_ALL; - val.p_list = NULL; } else { @@ -1086,8 +1124,7 @@ static void InitPrograms( input_thread_t * p_input ) } else { - var_Change( p_input, "programs", VLC_VAR_FREELIST, &val, - NULL ); + var_FreeList( &val, NULL ); } } } @@ -1166,7 +1203,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 ) { @@ -1244,6 +1283,8 @@ error_stats: 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 ); @@ -1318,6 +1359,8 @@ static void End( input_thread_t * p_input ) 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 ); @@ -1337,12 +1380,14 @@ static void End( input_thread_t * p_input ) #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 ); /* */ input_resource_RequestSout( p_input->p->p_resource, @@ -1360,25 +1405,31 @@ 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 ); @@ -1462,6 +1513,21 @@ static void ControlReduce( input_thread_t *p_input ) } vlc_mutex_unlock( &p_input->p->lock_control ); } + +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 ) { @@ -1528,8 +1594,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 */ @@ -1971,10 +2037,7 @@ static bool Control( input_thread_t *p_input, int i_type, 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: @@ -2026,8 +2089,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; @@ -2114,6 +2175,7 @@ static bool Control( input_thread_t *p_input, int i_type, break; } + ControlRelease( i_type, val ); return b_force_update; } @@ -2272,17 +2334,61 @@ 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_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 ); + /* FIXME: file:// handling plugins do not support URIs properly... + * So we pre-decoded 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 + } + 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 ) @@ -2305,7 +2411,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, ',' ) && @@ -2338,6 +2444,8 @@ static int InputSourceInit( input_thread_t *p_input, /* Get infos from access_demux */ demux_Control( in->p_demux, DEMUX_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 = true; if( demux_Control( in->p_demux, DEMUX_GET_TITLE_INFO, @@ -2350,6 +2458,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, @@ -2369,7 +2479,7 @@ 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 ); bool b_can_seek; if( demux_Control( in->p_demux, DEMUX_CAN_SEEK, &b_can_seek ) ) @@ -2380,25 +2490,16 @@ static int InputSourceInit( input_thread_t *p_input, { /* 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 ); - } if( in->p_access == NULL ) { - 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 ); + 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; } @@ -2408,6 +2509,7 @@ static int InputSourceInit( input_thread_t *p_input, 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, @@ -2524,14 +2626,18 @@ static int InputSourceInit( input_thread_t *p_input, 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( 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 ) @@ -2549,6 +2655,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; @@ -2597,6 +2706,9 @@ error: if( in->p_access ) access_Delete( in->p_access ); + free( psz_var_demux ); + free( psz_dup ); + return VLC_EGENERIC; } @@ -2676,11 +2788,12 @@ static void InputSourceMeta( input_thread_t *p_input, } -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; + *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" ); @@ -2690,11 +2803,18 @@ static void SlaveDemux( input_thread_t *p_input ) 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; + 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( ;; ) @@ -2709,7 +2829,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; @@ -2761,21 +2884,28 @@ static void SlaveSeek( input_thread_t *p_input ) *****************************************************************************/ static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta ) { + 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 { \ - char *psz_string = var_GetNonEmptyString( p_input, (s) ); \ - if( psz_string ) \ - vlc_meta_Set( p_meta, vlc_meta_ ## field, psz_string ); \ - free( 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 ); + } } /***************************************************************************** @@ -2784,54 +2914,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 == '\0' ) - { - const char *psz_tmp = vlc_meta_Get( p_item->p_meta, vlc_meta_ArtworkURL ); - if( psz_tmp ) - psz_arturl = strdup( psz_tmp ); - } - vlc_mutex_unlock( &p_item->lock ); - - if( psz_arturl && *psz_arturl ) - { - input_item_SetArtURL( p_item, 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 ) - input_item_SetArtURL( p_item, "" ); - else - input_ExtractAttachmentAndCacheArt( p_input ); - } - } - free( psz_arturl ); - - 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, @@ -2916,7 +3000,7 @@ static void InputGetExtraFiles( input_thread_t *p_input, { ".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", 1, 99 }, + { ".rar", "%s.r%.2d", 0, 99 }, { NULL, NULL, 0, 0 } }; @@ -3151,7 +3235,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 ); } } @@ -3211,13 +3295,16 @@ char *input_CreateFilename( vlc_object_t *p_obj, const char *psz_path, const cha if( !psz_tmp ) return NULL; - filename_sanitize( psz_tmp ); - if( asprintf( &psz_file, "%s"DIR_SEP"%s%s%s", - psz_path, psz_tmp, + char *psz_tmp2 = filename_sanitize( psz_tmp ); + free( psz_tmp ); + + if( !psz_tmp2 || + asprintf( &psz_file, "%s"DIR_SEP"%s%s%s", + psz_path, psz_tmp2, psz_extension ? "." : "", psz_extension ? psz_extension : "" ) < 0 ) psz_file = NULL; - free( psz_tmp ); + free( psz_tmp2 ); return psz_file; } else