X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=9e39fee535edb846b647248ea2ff9ce8a92d8bbb;hb=252ae28d9c7dcf276989e861e64768f5f99c705e;hp=6f1554f29a4f2ae7b32e1b4591d34de3d907e50d;hpb=4050212fa63e65e9084376cba8c2afc9d3bde489;p=vlc diff --git a/src/input/input.c b/src/input/input.c index 6f1554f29a..9e39fee535 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -29,7 +29,7 @@ # include "config.h" #endif -#include +#include #include #include @@ -43,7 +43,7 @@ #include #include #include -#include +#include #ifdef HAVE_SYS_STAT_H # include @@ -54,19 +54,19 @@ *****************************************************************************/ static void Destructor( input_thread_t * p_input ); -static int Run ( input_thread_t *p_input ); -static int RunAndDestroy ( 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 *, vlc_bool_t, sout_instance_t * ); + const char *, bool, sout_instance_t * ); static int Init ( input_thread_t *p_input ); -static void Error ( 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 inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t * ); +static inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t *, mtime_t i_deadline ); static void ControlReduce( input_thread_t * ); -static vlc_bool_t Control( input_thread_t *, int, vlc_value_t ); +static bool Control( input_thread_t *, int, vlc_value_t ); static int UpdateFromAccess( input_thread_t * ); static int UpdateFromDemux( input_thread_t * ); @@ -86,14 +86,16 @@ 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 sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, vlc_bool_t * ); -static void SoutKeep( sout_instance_t * ); +static char *InputGetExtraFiles( input_thread_t *p_input, + const char *psz_access, const char *psz_path ); static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_demux ); +static void AccessMeta( input_thread_t * p_input, vlc_meta_t *p_meta ); static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment, int i_new, input_attachment_t **pp_new ); +static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_forced ); + /***************************************************************************** * This function creates a new input, and returns a pointer * to its description. On error, it returns NULL. @@ -115,14 +117,17 @@ static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_atta * - seekable (if you can seek, it doesn't say if 'bar display' has be shown * or not, for that check position != 0.0) * - can-pause - * * For intf callback upon changes + * - can-record (if a stream can be recorded while playing) + * - teletext-es to get the index of spu track that is teletext --1 if no teletext) + * * For intf callback upon changes: * - intf-change + * - intf-change-vout for when a vout is created or destroyed * - rate-change for when playback rate changes * TODO explain when Callback is called * TODO complete this list (?) *****************************************************************************/ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, - const char *psz_header, vlc_bool_t b_quick, + const char *psz_header, bool b_quick, sout_instance_t *p_sout ) { static const char input_name[] = "input"; @@ -134,30 +139,49 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, p_input = vlc_custom_create( p_parent, sizeof( *p_input ), VLC_OBJECT_INPUT, input_name ); if( p_input == NULL ) - { - msg_Err( p_parent, "out of memory" ); return NULL; - } + + /* Construct a nice name for the input timer */ + char psz_timer_name[255]; + char * psz_name = input_item_GetName( p_item ); + snprintf( psz_timer_name, sizeof(psz_timer_name), + "input launching for '%s'", psz_name ); + + msg_Dbg( p_input, "Creating an input for '%s'", psz_name); + + free( psz_name ); + + /* Start a timer to mesure how long it takes + * to launch an input */ + stats_TimerStart( p_input, psz_timer_name, + STATS_TIMER_INPUT_LAUNCHING ); + MALLOC_NULL( p_input->p, input_thread_private_t ); + memset( p_input->p, 0, sizeof( input_thread_private_t ) ); /* 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_input->p_libvlc->p_stats_computer == NULL ) - { - p_input->p_libvlc->p_stats_computer = p_input; - } + if( p_private->p_stats_computer == NULL ) + p_private->p_stats_computer = p_input; vlc_mutex_unlock( &p_input->p_libvlc->p_stats->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 = VLC_FALSE; - p_input->b_can_pace_control = VLC_TRUE; + p_input->b_eof = false; + p_input->b_can_pace_control = true; p_input->p->i_start = 0; p_input->i_time = 0; p_input->p->i_stop = 0; @@ -167,13 +191,12 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, 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->b_recording = false; TAB_INIT( p_input->p->i_bookmark, p_input->p->bookmark ); TAB_INIT( p_input->p->i_attachment, p_input->p->attachment ); p_input->p->p_es_out = NULL; p_input->p->p_sout = NULL; - p_input->p->b_owns_its_sout = VLC_TRUE; - p_input->p->b_sout_keep = VLC_FALSE; - p_input->p->b_out_pace_control = VLC_FALSE; + p_input->p->b_out_pace_control = false; p_input->i_pts_delay = 0; /* Init Input fields */ @@ -182,14 +205,14 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, p_input->p->input.p_access = NULL; p_input->p->input.p_stream = NULL; p_input->p->input.p_demux = NULL; - p_input->p->input.b_title_demux = VLC_FALSE; + p_input->p->input.b_title_demux = false; p_input->p->input.i_title = 0; p_input->p->input.title = NULL; p_input->p->input.i_title_offset = p_input->p->input.i_seekpoint_offset = 0; - p_input->p->input.b_can_pace_control = VLC_TRUE; - p_input->p->input.b_can_rate_control = VLC_TRUE; - p_input->p->input.b_rescale_ts = VLC_TRUE; - p_input->p->input.b_eof = VLC_FALSE; + p_input->p->input.b_can_pace_control = true; + p_input->p->input.b_can_rate_control = true; + p_input->p->input.b_rescale_ts = true; + p_input->p->input.b_eof = false; p_input->p->input.i_cr_average = 0; vlc_mutex_lock( &p_item->lock ); @@ -203,12 +226,13 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, p_input->p->slave = NULL; /* Init control buffer */ - vlc_mutex_init( p_input, &p_input->p->lock_control ); + 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( p_item->optflagc == p_item->i_options ); + 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) ); @@ -220,6 +244,8 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, /* Create Objects variables for public Get and Set */ input_ControlVarInit( p_input ); + /* */ + p_input->p->pts_adjust.b_auto_adjust = var_GetBool( p_input, "auto-adjust-pts-delay" ); p_input->p->input.i_cr_average = var_GetInteger( p_input, "cr-average" ); if( !p_input->b_preparsing ) @@ -259,7 +285,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, } psz_start = psz_end + 1; } - msg_Dbg( p_input, "adding bookmark: %s, bytes="I64Fd", time="I64Fd, + msg_Dbg( p_input, "adding bookmark: %s, bytes=%"PRId64", time=%"PRId64, p_seekpoint->psz_name, p_seekpoint->i_byte_offset, p_seekpoint->i_time_offset ); input_Control( p_input, INPUT_ADD_BOOKMARK, p_seekpoint ); @@ -271,9 +297,6 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, } /* Remove 'Now playing' info as it is probably outdated */ - input_Control( p_input, INPUT_DEL_INFO, - _(VLC_META_INFO_CAT), - _(VLC_META_NOW_PLAYING) ); input_item_SetNowPlaying( p_item, NULL ); /* */ @@ -282,20 +305,17 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, /* */ if( p_sout ) - { p_input->p->p_sout = p_sout; - p_input->p->b_owns_its_sout = VLC_FALSE; - } memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) ); - vlc_mutex_init( p_input, &p_input->p->counters.counters_lock ); - - /* Attach only once we are ready */ - vlc_object_attach( p_input, p_parent ); + vlc_mutex_init( &p_input->p->counters.counters_lock ); /* 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; } @@ -304,22 +324,27 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, */ static void Destructor( input_thread_t * p_input ) { - input_thread_private_t *priv = p_input->p; +#ifndef NDEBUG + char * psz_name = input_item_GetName( p_input->p->input.p_item ); + msg_Dbg( p_input, "Destroying the input for '%s'", psz_name); + free( psz_name ); +#endif - if( priv->b_owns_its_sout && priv->p_sout ) - { - if( priv->b_sout_keep ) - SoutKeep( priv->p_sout ); - else - sout_DeleteInstance( priv->p_sout ); - } + 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->input.p_item ); vlc_mutex_destroy( &p_input->p->counters.counters_lock ); - vlc_mutex_destroy( &priv->lock_control ); - free( priv ); + vlc_cond_destroy( &p_input->p->wait_control ); + vlc_mutex_destroy( &p_input->p->lock_control ); + free( p_input->p ); } /** @@ -333,15 +358,7 @@ static void Destructor( input_thread_t * p_input ) input_thread_t *__input_CreateThread( vlc_object_t *p_parent, input_item_t *p_item ) { - vlc_bool_t b_sout_keep; - sout_instance_t *p_sout = SoutFind( p_parent, p_item, &b_sout_keep ); - input_thread_t *p_input = __input_CreateThreadExtended( p_parent, p_item, NULL, p_sout ); - - if( !p_input && p_sout ) - SoutKeep( p_sout ); - - p_input->p->b_sout_keep = b_sout_keep; - return p_input; + return __input_CreateThreadExtended( p_parent, p_item, NULL, NULL ); } /* */ @@ -351,13 +368,13 @@ input_thread_t *__input_CreateThreadExtended( vlc_object_t *p_parent, { input_thread_t *p_input; - p_input = Create( p_parent, p_item, psz_log, VLC_FALSE, p_sout ); + 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, VLC_TRUE ) ) + VLC_THREAD_PRIORITY_INPUT, false ) ) { input_ChangeState( p_input, ERROR_S ); msg_Err( p_input, "cannot create input thread" ); @@ -370,38 +387,32 @@ input_thread_t *__input_CreateThreadExtended( vlc_object_t *p_parent, } /** - * Initialize an input thread and run it. This thread will clean after himself, + * 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 the input object id if non blocking, an error code else + * \return an error code, VLC_SUCCESS on success */ int __input_Read( vlc_object_t *p_parent, input_item_t *p_item, - vlc_bool_t b_block ) + bool b_block ) { - vlc_bool_t b_sout_keep; - sout_instance_t *p_sout = SoutFind( p_parent, p_item, &b_sout_keep ); input_thread_t *p_input; - p_input = Create( p_parent, p_item, NULL, VLC_FALSE, p_sout ); - if( !p_input && p_sout ) - { - SoutKeep( p_sout ); + p_input = Create( p_parent, p_item, NULL, false, NULL ); + if( !p_input ) return VLC_EGENERIC; - } - p_input->p->b_sout_keep = b_sout_keep; if( b_block ) { - RunAndDestroy( p_input ); + RunAndDestroy( VLC_OBJECT(p_input) ); return VLC_SUCCESS; } else { if( vlc_thread_create( p_input, "input", RunAndDestroy, - VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) ) + VLC_THREAD_PRIORITY_INPUT, false ) ) { input_ChangeState( p_input, ERROR_S ); msg_Err( p_input, "cannot create input thread" ); @@ -409,7 +420,7 @@ int __input_Read( vlc_object_t *p_parent, input_item_t *p_item, return VLC_EGENERIC; } } - return p_input->i_object_id; + return VLC_SUCCESS; } /** @@ -425,7 +436,7 @@ 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, VLC_TRUE, NULL ); + p_input = Create( p_parent, p_item, NULL, true, NULL ); if( !p_input ) return VLC_EGENERIC; @@ -443,49 +454,39 @@ int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item ) * * \param the input thread to stop */ -void input_StopThread( input_thread_t *p_input ) +static void ObjectKillChildrens( input_thread_t *p_input, vlc_object_t *p_obj ) { vlc_list_t *p_list; int i; - /* Set die for input */ - vlc_object_kill( p_input ); - /* FIXME: seems to be duplicated in ControlPush(INPUT_CONTROL_SET_DIE) */ - - /* We cannot touch p_input fields directly (we come from another thread), - * so use the vlc_object_find way, it's perfectly safe */ - - /* Set die for all access */ - p_list = vlc_list_find( p_input, VLC_OBJECT_ACCESS, FIND_CHILD ); - for( i = 0; i < p_list->i_count; i++ ) - { - vlc_object_kill( p_list->p_values[i].p_object ); - } - vlc_list_release( p_list ); + 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; - /* Set die for all stream */ - p_list = vlc_list_find( p_input, VLC_OBJECT_STREAM, FIND_CHILD ); - for( i = 0; i < p_list->i_count; i++ ) - { - vlc_object_kill( p_list->p_values[i].p_object ); - } - vlc_list_release( p_list ); + vlc_object_kill( p_obj ); - /* Set die for all demux */ - p_list = vlc_list_find( p_input, VLC_OBJECT_DEMUX, FIND_CHILD ); + p_list = vlc_list_children( p_obj ); for( i = 0; i < p_list->i_count; i++ ) - { - vlc_object_kill( p_list->p_values[i].p_object ); - } + ObjectKillChildrens( p_input, p_list->p_values[i].p_object ); vlc_list_release( p_list ); +} +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 ) { - p_input->p->b_owns_its_sout = VLC_FALSE; - return p_input->p->p_sout; + sout_instance_t *p_sout = p_input->p->p_sout; + vlc_object_detach( p_sout ); + p_input->p->p_sout = NULL; + return p_sout; } /***************************************************************************** @@ -493,63 +494,31 @@ sout_instance_t * input_DetachSout( input_thread_t *p_input ) * This is the "normal" thread that spawns the input processing chain, * reads the stream, cleans up and waits *****************************************************************************/ -static int Run( input_thread_t *p_input ) +static void* Run( vlc_object_t *p_this ) { - /* Signal that the thread is launched */ - vlc_thread_ready( p_input ); + input_thread_t *p_input = (input_thread_t *)p_this; + const int canc = vlc_savecancel(); if( Init( p_input ) ) { /* If we failed, wait before we are killed, and exit */ - p_input->b_error = VLC_TRUE; - - /* FIXME: we don't want to depend on the playlist */ - playlist_t * p_playlist = vlc_object_find( p_input, - VLC_OBJECT_PLAYLIST, FIND_PARENT ); - if( p_playlist ) - { - playlist_Signal( p_playlist ); - vlc_object_release( p_playlist ); - } - - Error( p_input ); - - /* Tell we're dead */ - p_input->b_dead = VLC_TRUE; - - return 0; + WaitDie( p_input ); + goto exit; } MainLoop( p_input ); - if( !p_input->b_eof && !p_input->b_error && p_input->p->input.b_eof ) - { - /* We have finish to demux data but not to play them */ - while( !p_input->b_die ) - { - if( input_EsOutDecodersEmpty( p_input->p->p_es_out ) ) - break; - - msg_Dbg( p_input, "waiting decoder fifos to empty" ); - - msleep( INPUT_IDLE_SLEEP ); - } - - /* We have finished */ - p_input->b_eof = VLC_TRUE; - playlist_Signal( pl_Get( p_input ) ); - } - /* Wait until we are asked to die */ if( !p_input->b_die ) - { - Error( p_input ); - } + WaitDie( p_input ); /* Clean up */ End( p_input ); - return 0; +exit: + p_input->b_dead = true; + vlc_restorecancel( canc ); + return NULL; } /***************************************************************************** @@ -557,619 +526,700 @@ static int Run( input_thread_t *p_input ) * This is the "just forget me" thread that spawns the input processing chain, * reads the stream, cleans up and releases memory *****************************************************************************/ -static int RunAndDestroy( input_thread_t *p_input ) +static void* RunAndDestroy( vlc_object_t *p_this ) { - /* Signal that the thread is launched */ - vlc_thread_ready( p_input ); + input_thread_t *p_input = (input_thread_t *)p_this; + const int canc = vlc_savecancel(); if( Init( p_input ) ) goto exit; MainLoop( p_input ); - if( !p_input->b_eof && !p_input->b_error && p_input->p->input.b_eof ) - { - /* We have finished demuxing data but not playing it */ - while( !p_input->b_die ) - { - if( input_EsOutDecodersEmpty( p_input->p->p_es_out ) ) - break; - - msg_Dbg( p_input, "waiting decoder fifos to empty" ); - - msleep( INPUT_IDLE_SLEEP ); - } - - /* We have finished */ - p_input->b_eof = VLC_TRUE; - } - /* Clean up */ End( p_input ); exit: /* Release memory */ vlc_object_release( p_input ); - return 0; + vlc_restorecancel( canc ); + return NULL; } /***************************************************************************** * Main loop: Fill buffers from access, and demux *****************************************************************************/ -static void MainLoop( input_thread_t *p_input ) + +/** + * 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 ) { - int64_t i_start_mdate = mdate(); - int64_t i_intf_update = 0; - int i_updates = 0; + int i_ret; - while( !p_input->b_die && !p_input->b_error && !p_input->p->input.b_eof ) + *pb_changed = false; + + 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() ) ) + i_ret = 0; /* EOF */ + else + i_ret = p_input->p->input.p_demux->pf_demux(p_input->p->input.p_demux); + + if( i_ret > 0 ) { - vlc_bool_t b_force_update = VLC_FALSE; - int i_ret; - int i_type; - vlc_value_t val; + /* TODO */ + if( p_input->p->input.b_title_demux && + p_input->p->input.p_demux->info.i_update ) + { + i_ret = UpdateFromDemux( p_input ); + *pb_changed = true; + } + else if( !p_input->p->input.b_title_demux && + p_input->p->input.p_access && + p_input->p->input.p_access->info.i_update ) + { + i_ret = UpdateFromAccess( p_input ); + *pb_changed = true; + } + } + + if( i_ret == 0 ) /* EOF */ + { + vlc_value_t repeat; - /* Do the read */ - if( p_input->i_state != PAUSE_S ) + var_Get( p_input, "input-repeat", &repeat ); + if( repeat.i_int == 0 ) { - if( ( p_input->p->i_stop > 0 && p_input->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 = p_input->p->input.p_demux->pf_demux(p_input->p->input.p_demux); + /* 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; - if( i_ret > 0 ) + msg_Dbg( p_input, "repeating the same input (%d)", + repeat.i_int ); + if( repeat.i_int > 0 ) { - /* TODO */ - if( p_input->p->input.b_title_demux && - p_input->p->input.p_demux->info.i_update ) - { - i_ret = UpdateFromDemux( p_input ); - b_force_update = VLC_TRUE; - } - else if( !p_input->p->input.b_title_demux && - p_input->p->input.p_access && - p_input->p->input.p_access->info.i_update ) - { - i_ret = UpdateFromAccess( p_input ); - b_force_update = VLC_TRUE; - } + repeat.i_int--; + var_Set( p_input, "input-repeat", repeat ); } - if( i_ret == 0 ) /* EOF */ + /* 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 ) { - 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. */ - input_ChangeState( p_input, END_S ); - msg_Dbg( p_input, "EOF reached" ); - p_input->p->input.b_eof = VLC_TRUE; - } - else - { - 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 ); - } - - /* 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 - { - val.f_float = 0.0; - input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION, - &val ); - } - - /* */ - i_start_mdate = mdate(); - } + val.i_time = p_input->p->i_start; + input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, + &val ); } - else if( i_ret < 0 ) + else { - p_input->b_error = VLC_TRUE; + val.f_float = 0.0; + input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION, + &val ); } - if( i_ret > 0 && p_input->p->i_slave > 0 ) - { - SlaveDemux( p_input ); - } + /* */ + *pi_start_mdate = mdate(); } - else + } + else if( i_ret < 0 ) + { + input_ChangeState( p_input, ERROR_S ); + } + + if( i_ret > 0 && p_input->p->i_slave > 0 ) + { + SlaveDemux( p_input ); + } +} + +/** + * MainLoopInterface + * It update the variables used by the interfaces + */ +static void MainLoopInterface( input_thread_t *p_input ) +{ + vlc_value_t val; + double f_pos; + int64_t i_time, i_length; + + /* update input status variables */ + if( !demux_Control( p_input->p->input.p_demux, + DEMUX_GET_POSITION, &f_pos ) ) + { + val.f_float = (float)f_pos; + var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL ); + } + if( !demux_Control( p_input->p->input.p_demux, + DEMUX_GET_TIME, &i_time ) ) + { + p_input->i_time = i_time; + val.i_time = i_time; + var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL ); + } + if( !demux_Control( p_input->p->input.p_demux, + DEMUX_GET_LENGTH, &i_length ) ) + { + vlc_value_t old_val; + var_Get( p_input, "length", &old_val ); + val.i_time = i_length; + var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL ); + + if( old_val.i_time != val.i_time ) { - /* Small wait */ - msleep( 10*1000 ); + UpdateItemLength( p_input, i_length ); } + } + + var_SetBool( p_input, "intf-change", true ); +} + +/** + * MainLoopStatistic + * It updates the globals statics + */ +static void MainLoopStatistic( input_thread_t *p_input ) +{ + stats_ComputeInputStats( p_input, p_input->p->input.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 ); + } +} - /* Handle control */ - vlc_mutex_lock( &p_input->p->lock_control ); - ControlReduce( p_input ); - while( !ControlPopNoLock( p_input, &i_type, &val ) ) +/** + * MainLoop + * The main input loop. + */ +static void MainLoop( input_thread_t *p_input ) +{ + mtime_t i_start_mdate = mdate(); + mtime_t i_intf_update = 0; + mtime_t i_statistic_update = 0; + + /* Start the timer */ + stats_TimerStop( p_input, STATS_TIMER_INPUT_LAUNCHING ); + + while( !p_input->b_die && !p_input->b_error && !p_input->p->input.b_eof ) + { + bool b_force_update; + int i_type; + vlc_value_t val; + mtime_t i_current; + mtime_t i_deadline; + mtime_t i_wakeup; + + /* Demux data */ + b_force_update = false; + i_wakeup = 0; + if( p_input->i_state != PAUSE_S ) { - msg_Dbg( p_input, "control type=%d", i_type ); - if( Control( p_input, i_type, val ) ) - b_force_update = VLC_TRUE; + MainLoopDemux( p_input, &b_force_update, &i_start_mdate ); + i_wakeup = input_EsOutGetWakeup( p_input->p->p_es_out ); } - vlc_mutex_unlock( &p_input->p->lock_control ); - if( b_force_update || i_intf_update < mdate() ) - { - vlc_value_t val; - double f_pos; - int64_t i_time, i_length; - /* update input status variables */ - if( !demux2_Control( p_input->p->input.p_demux, - DEMUX_GET_POSITION, &f_pos ) ) + /* */ + do { + i_deadline = i_wakeup; + if( p_input->i_state == PAUSE_S ) + 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 ) ) { - val.f_float = (float)f_pos; - var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL ); + msg_Dbg( p_input, "control type=%d", i_type ); + if( Control( p_input, i_type, val ) ) + b_force_update = true; } - if( !demux2_Control( p_input->p->input.p_demux, - DEMUX_GET_TIME, &i_time ) ) + vlc_mutex_unlock( &p_input->p->lock_control ); + + /* Update interface and statistics */ + i_current = mdate(); + if( i_intf_update < i_current || b_force_update ) { - p_input->i_time = i_time; - val.i_time = i_time; - var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL ); + MainLoopInterface( p_input ); + i_intf_update = i_current + INT64_C(250000); + b_force_update = false; } - if( !demux2_Control( p_input->p->input.p_demux, - DEMUX_GET_LENGTH, &i_length ) ) + if( i_statistic_update < i_current ) { - vlc_value_t old_val; - var_Get( p_input, "length", &old_val ); - val.i_time = i_length; - var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL ); - - if( old_val.i_time != val.i_time ) - { - UpdateItemLength( p_input, i_length ); - } + MainLoopStatistic( p_input ); + i_statistic_update = i_current + INT64_C(1000000); } - var_SetBool( p_input, "intf-change", VLC_TRUE ); - i_intf_update = mdate() + I64C(150000); - } - /* 150ms * 8 = ~ 1 second */ - if( ++i_updates % 8 == 0 ) - { - stats_ComputeInputStats( p_input, p_input->p->input.p_item->p_stats ); - /* Are we the thread responsible for computing global stats ? */ - if( p_input->p_libvlc->p_stats_computer == p_input ) + /* Check if i_wakeup is still valid */ + if( i_wakeup != 0 ) { - stats_ComputeGlobalStats( p_input->p_libvlc, - p_input->p_libvlc->p_stats ); + mtime_t i_new_wakeup = input_EsOutGetWakeup( p_input->p->p_es_out ); + if( !i_new_wakeup ) + i_wakeup = 0; } - } + } while( i_current < i_wakeup ); } -} -static int Init( input_thread_t * p_input ) -{ - char *psz; - char *psz_subtitle; - vlc_value_t val; - double f_fps; - vlc_meta_t *p_meta; - int i_es_out_mode; - int i, i_delay; - - for( i = 0; i < p_input->p->input.p_item->i_options; i++ ) + if( !p_input->b_eof && !p_input->b_error && p_input->p->input.b_eof ) { - if( !strncmp( p_input->p->input.p_item->ppsz_options[i], "meta-file", 9 ) ) + /* We have finish to demux data but not to play them */ + while( !p_input->b_die ) { - msg_Dbg( p_input, "Input is a meta file: disabling unneeded options" ); - var_SetString( p_input, "sout", "" ); - var_SetBool( p_input, "sout-all", VLC_FALSE ); - var_SetString( p_input, "input-slave", "" ); - var_SetInteger( p_input, "input-repeat", 0 ); - var_SetString( p_input, "sub-file", "" ); - var_SetBool( p_input, "sub-autodetect-file", VLC_FALSE ); + if( input_EsOutDecodersEmpty( p_input->p->p_es_out ) ) + break; + + msg_Dbg( p_input, "waiting decoder fifos to empty" ); + + msleep( INPUT_IDLE_SLEEP ); } + + /* We have finished */ + input_ChangeState( p_input, END_S ); } +} - if( !p_input->b_preparsing ) - { - /* Prepare statistics */ +static void InitStatistics( input_thread_t * p_input ) +{ + if( p_input->b_preparsing ) return; + + /* Prepare statistics */ #define INIT_COUNTER( c, type, compute ) p_input->p->counters.p_##c = \ - stats_CounterCreate( p_input, VLC_VAR_##type, STATS_##compute); - if( p_input->p_libvlc->b_stats ) - { - INIT_COUNTER( read_bytes, INTEGER, COUNTER ); - INIT_COUNTER( read_packets, INTEGER, COUNTER ); - INIT_COUNTER( demux_read, INTEGER, COUNTER ); - INIT_COUNTER( input_bitrate, FLOAT, DERIVATIVE ); - INIT_COUNTER( demux_bitrate, FLOAT, DERIVATIVE ); - INIT_COUNTER( played_abuffers, INTEGER, COUNTER ); - INIT_COUNTER( lost_abuffers, INTEGER, COUNTER ); - INIT_COUNTER( displayed_pictures, INTEGER, COUNTER ); - INIT_COUNTER( lost_pictures, INTEGER, COUNTER ); - INIT_COUNTER( decoded_audio, INTEGER, COUNTER ); - INIT_COUNTER( decoded_video, INTEGER, COUNTER ); - INIT_COUNTER( decoded_sub, INTEGER, COUNTER ); - p_input->p->counters.p_sout_send_bitrate = NULL; - p_input->p->counters.p_sout_sent_packets = NULL; - p_input->p->counters.p_sout_sent_bytes = NULL; - if( p_input->p->counters.p_demux_bitrate ) - p_input->p->counters.p_demux_bitrate->update_interval = 1000000; - if( p_input->p->counters.p_input_bitrate ) - p_input->p->counters.p_input_bitrate->update_interval = 1000000; - } - - /* Find a usable sout and attach it to p_input */ - psz = var_GetNonEmptyString( p_input, "sout" ); - if( psz && strncasecmp( p_input->p->input.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" ); + stats_CounterCreate( p_input, VLC_VAR_##type, STATS_##compute); + if( libvlc_stats( p_input ) ) + { + INIT_COUNTER( read_bytes, INTEGER, COUNTER ); + INIT_COUNTER( read_packets, INTEGER, COUNTER ); + INIT_COUNTER( demux_read, INTEGER, COUNTER ); + INIT_COUNTER( input_bitrate, FLOAT, DERIVATIVE ); + INIT_COUNTER( demux_bitrate, FLOAT, DERIVATIVE ); + INIT_COUNTER( played_abuffers, INTEGER, COUNTER ); + INIT_COUNTER( lost_abuffers, INTEGER, COUNTER ); + INIT_COUNTER( displayed_pictures, INTEGER, COUNTER ); + INIT_COUNTER( lost_pictures, INTEGER, COUNTER ); + INIT_COUNTER( decoded_audio, INTEGER, COUNTER ); + INIT_COUNTER( decoded_video, INTEGER, COUNTER ); + INIT_COUNTER( decoded_sub, INTEGER, COUNTER ); + p_input->p->counters.p_sout_send_bitrate = NULL; + p_input->p->counters.p_sout_sent_packets = NULL; + p_input->p->counters.p_sout_sent_bytes = NULL; + if( p_input->p->counters.p_demux_bitrate ) + p_input->p->counters.p_demux_bitrate->update_interval = 1000000; + if( p_input->p->counters.p_input_bitrate ) + p_input->p->counters.p_input_bitrate->update_interval = 1000000; + } +} - sout_DeleteInstance( p_input->p->p_sout ); - p_input->p->p_sout = NULL; - } - } +#ifdef ENABLE_SOUT +static int InitSout( input_thread_t * p_input ) +{ + char *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 + if( p_input->b_preparsing ) return VLC_SUCCESS; + + /* Find a usable sout and attach it to p_input */ + psz = var_GetNonEmptyString( p_input, "sout" ); + if( psz && strncasecmp( p_input->p->input.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 ) ) { - /* 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; - } + msg_Dbg( p_input, "destroying unusable sout" ); + + sout_DeleteInstance( p_input->p->p_sout ); + p_input->p->p_sout = NULL; } + } - if( p_input->p_libvlc->b_stats ) + 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 ) { - INIT_COUNTER( sout_sent_packets, INTEGER, COUNTER ); - INIT_COUNTER (sout_sent_bytes, INTEGER, COUNTER ); - INIT_COUNTER( sout_send_bitrate, FLOAT, DERIVATIVE ); - if( p_input->p->counters.p_sout_send_bitrate ) - p_input->p->counters.p_sout_send_bitrate->update_interval = - 1000000; + input_ChangeState( p_input, ERROR_S ); + msg_Err( p_input, "cannot start stream output instance, " \ + "aborting" ); + free( psz ); + return VLC_EGENERIC; } } - else if( p_input->p->p_sout ) + if( libvlc_stats( p_input ) ) { - msg_Dbg( p_input, "destroying useless sout" ); - - sout_DeleteInstance( p_input->p->p_sout ); - p_input->p->p_sout = NULL; + INIT_COUNTER( sout_sent_packets, INTEGER, COUNTER ); + INIT_COUNTER( sout_sent_bytes, INTEGER, COUNTER ); + INIT_COUNTER( sout_send_bitrate, FLOAT, DERIVATIVE ); + if( p_input->p->counters.p_sout_send_bitrate ) + p_input->p->counters.p_sout_send_bitrate->update_interval = + 1000000; } - free( psz ); } + else if( p_input->p->p_sout ) + { + msg_Dbg( p_input, "destroying useless sout" ); - /* Create es out */ - p_input->p->p_es_out = input_EsOutNew( p_input, p_input->p->i_rate ); - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, VLC_FALSE ); - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE ); + sout_DeleteInstance( p_input->p->p_sout ); + p_input->p->p_sout = NULL; + } + free( psz ); - var_Create( p_input, "bit-rate", VLC_VAR_INTEGER ); - var_Create( p_input, "sample-rate", VLC_VAR_INTEGER ); + return VLC_SUCCESS; +} +#endif - if( InputSourceInit( p_input, &p_input->p->input, - p_input->p->input.p_item->psz_uri, NULL ) ) +static void InitTitle( input_thread_t * p_input ) +{ + vlc_value_t val; + + if( p_input->b_preparsing ) return; + + /* Create global title (from master) */ + p_input->p->i_title = p_input->p->input.i_title; + p_input->p->title = p_input->p->input.title; + p_input->p->i_title_offset = p_input->p->input.i_title_offset; + p_input->p->i_seekpoint_offset = p_input->p->input.i_seekpoint_offset; + if( p_input->p->i_title > 0 ) + { + /* Setup variables */ + input_ControlVarNavigation( p_input ); + input_ControlVarTitle( p_input, 0 ); + } + + /* Global flag */ + p_input->b_can_pace_control = p_input->p->input.b_can_pace_control; + p_input->p->b_can_pause = p_input->p->input.b_can_pause; + p_input->p->b_can_rate_control = p_input->p->input.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. */ + var_Get( p_input, "audio-desync", &val ); + if( val.i_int < 0 ) + p_input->i_pts_delay -= (val.i_int * 1000); + + /* Update cr_average depending on the caching */ + p_input->p->input.i_cr_average *= (10 * p_input->i_pts_delay / 200000); + p_input->p->input.i_cr_average /= 10; + if( p_input->p->input.i_cr_average < 10 ) p_input->p->input.i_cr_average = 10; +} + +static void StartTitle( input_thread_t * p_input ) +{ + double f_fps; + vlc_value_t val; + int i_delay; + char *psz; + char *psz_subtitle; + int64_t i_length; + + /* Start title/chapter */ + + if( p_input->b_preparsing ) { - goto error; + p_input->p->i_start = 0; + return; } - /* Create global title (from master) */ - if( !p_input->b_preparsing ) + 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 ) + 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 ); + + /* Start time*/ + /* Set start 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" ); + i_length = var_GetTime( p_input, "length" ); + if( p_input->p->i_run < 0 ) { - p_input->p->i_title = p_input->p->input.i_title; - p_input->p->title = p_input->p->input.title; - p_input->p->i_title_offset = p_input->p->input.i_title_offset; - p_input->p->i_seekpoint_offset = p_input->p->input.i_seekpoint_offset; - if( p_input->p->i_title > 0 ) + msg_Warn( p_input, "invalid run-time ignored" ); + p_input->p->i_run = 0; + } + + if( p_input->p->i_start > 0 ) + { + if( p_input->p->i_start >= i_length ) { - /* Setup variables */ - input_ControlVarNavigation( p_input ); - input_ControlVarTitle( p_input, 0 ); + msg_Warn( p_input, "invalid start-time ignored" ); } + else + { + vlc_value_t s; + + msg_Dbg( p_input, "starting at time: %ds", + (int)( p_input->p->i_start / INT64_C(1000000) ) ); - /* Global flag */ - p_input->b_can_pace_control = p_input->p->input.b_can_pace_control; - p_input->p->b_can_pause = p_input->p->input.b_can_pause; - p_input->p->b_can_rate_control = p_input->p->input.b_can_rate_control; + 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; + } - /* Fix pts delay */ - if( p_input->i_pts_delay < 0 ) - p_input->i_pts_delay = 0; + /* Load subtitles */ + /* Get fps and set it if not already set */ + if( !demux_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) && + f_fps > 1.0 ) + { + float f_requested_fps; - /* If the desynchronisation requested by the user is < 0, we need to - * cache more data. */ - var_Get( p_input, "audio-desync", &val ); - if( val.i_int < 0 ) p_input->i_pts_delay -= (val.i_int * 1000); + var_Create( p_input, "sub-original-fps", VLC_VAR_FLOAT ); + var_SetFloat( p_input, "sub-original-fps", f_fps ); - /* Update cr_average depending on the caching */ - p_input->p->input.i_cr_average *= (10 * p_input->i_pts_delay / 200000); - p_input->p->input.i_cr_average /= 10; - if( p_input->p->input.i_cr_average < 10 ) p_input->p->input.i_cr_average = 10; + f_requested_fps = var_CreateGetFloat( p_input, "sub-fps" ); + if( f_requested_fps != f_fps ) + { + var_Create( p_input, "sub-fps", VLC_VAR_FLOAT| + VLC_VAR_DOINHERIT ); + var_SetFloat( p_input, "sub-fps", f_requested_fps ); + } } - /* Load master infos */ - /* Init length */ - if( !demux2_Control( p_input->p->input.p_demux, DEMUX_GET_LENGTH, - &val.i_time ) && val.i_time > 0 ) + i_delay = var_CreateGetInteger( p_input, "sub-delay" ); + if( i_delay != 0 ) { - var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL ); - UpdateItemLength( p_input, val.i_time ); + var_SetTime( p_input, "spu-delay", (mtime_t)i_delay * 100000 ); } - else + + /* Look for and add subtitle files */ + psz_subtitle = var_GetNonEmptyString( p_input, "sub-file" ); + if( psz_subtitle != NULL ) { - val.i_time = input_item_GetDuration( p_input->p->input.p_item ); - if( val.i_time > 0 ) - { /* fallback: gets length from metadata */ - var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL ); - UpdateItemLength( p_input, val.i_time ); - } + msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle ); + SubtitleAdd( p_input, psz_subtitle, true ); } - /* Start title/chapter */ - if( !p_input->b_preparsing ) + var_Get( p_input, "sub-autodetect-file", &val ); + if( val.b_bool ) { - 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 ) - 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 ); + char *psz_autopath = var_GetNonEmptyString( p_input, "sub-autodetect-path" ); + char **ppsz_subs = subtitles_Detect( p_input, psz_autopath, + p_input->p->input.p_item->psz_uri ); + free( psz_autopath ); - /* Start time*/ - /* Set start time */ - p_input->p->i_start = I64C(1000000) * var_GetInteger( p_input, "start-time" ); - p_input->p->i_stop = I64C(1000000) * var_GetInteger( p_input, "stop-time" ); - p_input->p->i_run = I64C(1000000) * var_GetInteger( p_input, "run-time" ); - if( p_input->p->i_run < 0 ) + for( int i = 0; ppsz_subs && ppsz_subs[i]; i++ ) { - msg_Warn( p_input, "invalid run-time ignored" ); - p_input->p->i_run = 0; + /* 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 ); + + free( ppsz_subs[i] ); } + free( ppsz_subs ); + } + free( psz_subtitle ); - if( p_input->p->i_start > 0 ) + /* Look for slave */ + psz = var_GetNonEmptyString( p_input, "input-slave" ); + if( psz != NULL ) + { + char *psz_delim; + input_source_t *slave; + while( psz && *psz ) { - if( p_input->p->i_start >= val.i_time ) + while( *psz == ' ' || *psz == '#' ) { - msg_Warn( p_input, "invalid start-time ignored" ); + psz++; } - else + if( ( psz_delim = strchr( psz, '#' ) ) ) { - vlc_value_t s; - - msg_Dbg( p_input, "starting at time: %ds", - (int)( p_input->p->i_start / I64C(1000000) ) ); - - s.i_time = p_input->p->i_start; - input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s ); + *psz_delim++ = '\0'; + } + if( *psz == 0 ) + { + break; } - } - 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; - } - - /* Load subtitles */ - /* Get fps and set it if not already set */ - if( !demux2_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) && - f_fps > 1.0 ) - { - float f_requested_fps; - - var_Create( p_input, "sub-original-fps", VLC_VAR_FLOAT ); - var_SetFloat( p_input, "sub-original-fps", f_fps ); - f_requested_fps = var_CreateGetFloat( p_input, "sub-fps" ); - if( f_requested_fps != f_fps ) + msg_Dbg( p_input, "adding slave input '%s'", psz ); + slave = InputSourceNew( p_input ); + if( !InputSourceInit( p_input, slave, psz, NULL ) ) { - var_Create( p_input, "sub-fps", VLC_VAR_FLOAT| - VLC_VAR_DOINHERIT ); - var_SetFloat( p_input, "sub-fps", f_requested_fps ); + TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave ); } + else free( slave ); + psz = psz_delim; } + free( psz ); + } +} - i_delay = var_CreateGetInteger( p_input, "sub-delay" ); - if( i_delay != 0 ) - { - var_SetTime( p_input, "spu-delay", (mtime_t)i_delay * 100000 ); - } +static void InitPrograms( input_thread_t * p_input ) +{ + int i_es_out_mode; + vlc_value_t val; - /* Look for and add subtitle files */ - psz_subtitle = var_GetNonEmptyString( p_input, "sub-file" ); - if( psz_subtitle != NULL ) - { - msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle ); - input_AddSubtitles( p_input, psz_subtitle, VLC_FALSE ); - } + if( p_input->b_preparsing ) return; - var_Get( p_input, "sub-autodetect-file", &val ); + /* 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 *psz_autopath = var_GetNonEmptyString( p_input, "sub-autodetect-path" ); - char **subs = subtitles_Detect( p_input, psz_autopath, - p_input->p->input.p_item->psz_uri ); - input_source_t *sub; - i = 0; - if( psz_autopath == NULL ) - psz_autopath = strdup(""); - - /* Try to autoselect the first autodetected subtitles file - * if no subtitles file was specified */ - if( ( psz_subtitle == NULL ) && subs && subs[0] ) + i_es_out_mode = ES_OUT_MODE_ALL; + val.p_list = NULL; + } + else + { + var_Get( p_input, "programs", &val ); + if( val.p_list && val.p_list->i_count ) { - input_AddSubtitles( p_input, subs[0], VLC_FALSE ); - free( subs[0] ); - i = 1; + i_es_out_mode = ES_OUT_MODE_PARTIAL; + /* Note : we should remove the "program" callback. */ } - - /* Then, just add the following subtitles files */ - for( ; subs && subs[i]; i++ ) + else { - if( !psz_subtitle || strcmp( psz_subtitle, subs[i] ) ) - { - sub = InputSourceNew( p_input ); - if( !InputSourceInit( p_input, sub, subs[i], "subtitle" ) ) - { - TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub ); - } - else free( sub ); - } - free( subs[i] ); + var_Change( p_input, "programs", VLC_VAR_FREELIST, &val, + NULL ); } - free( subs ); - free( psz_autopath ); } - free( psz_subtitle ); - - /* Look for slave */ - psz = var_GetNonEmptyString( p_input, "input-slave" ); - if( psz != NULL ) - { - char *psz_delim; - input_source_t *slave; - while( psz && *psz ) - { - while( *psz == ' ' || *psz == '#' ) - { - psz++; - } - if( ( psz_delim = strchr( psz, '#' ) ) ) - { - *psz_delim++ = '\0'; - } - if( *psz == 0 ) - { - break; - } + } + es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, i_es_out_mode ); - msg_Dbg( p_input, "adding slave input '%s'", psz ); - slave = InputSourceNew( p_input ); - if( !InputSourceInit( p_input, slave, psz, NULL ) ) - { - TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave ); - } - else free( slave ); - psz = psz_delim; - } - free( psz ); - } + /* Inform the demuxer about waited group (needed only for DVB) */ + if( i_es_out_mode == ES_OUT_MODE_ALL ) + { + demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1, NULL ); + } + 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 ); } else { - p_input->p->i_start = 0; - p_input->p->i_start = 0; + demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, + (int) var_GetInteger( p_input, "program" ), NULL ); } +} - /* Set up es_out */ - if( !p_input->b_preparsing ) +static int Init( input_thread_t * p_input ) +{ + vlc_meta_t *p_meta; + vlc_value_t val; + int i, ret; + + for( i = 0; i < p_input->p->input.p_item->i_options; i++ ) { - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, VLC_TRUE ); - i_es_out_mode = ES_OUT_MODE_AUTO; - val.p_list = NULL; - if( p_input->p->p_sout ) + if( !strncmp( p_input->p->input.p_item->ppsz_options[i], "meta-file", 9 ) ) { - var_Get( p_input, "sout-all", &val ); - if ( val.b_bool ) - { - i_es_out_mode = ES_OUT_MODE_ALL; - val.p_list = NULL; - } - else - { - var_Get( p_input, "programs", &val ); - if ( val.p_list && val.p_list->i_count ) - { - 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 ); - } + msg_Dbg( p_input, "Input is a meta file: disabling unneeded options" ); + var_SetString( p_input, "sout", "" ); + var_SetBool( p_input, "sout-all", false ); + var_SetString( p_input, "input-slave", "" ); + var_SetInteger( p_input, "input-repeat", 0 ); + var_SetString( p_input, "sub-file", "" ); + var_SetBool( p_input, "sub-autodetect-file", false ); + } + } + + InitStatistics( p_input ); +#ifdef ENABLE_SOUT + ret = InitSout( p_input ); + if( ret != VLC_SUCCESS ) + return ret; /* FIXME: goto error; should be better here */ +#endif + + /* Create es out */ + p_input->p->p_es_out = input_EsOutNew( p_input, 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 ); + + if( InputSourceInit( p_input, &p_input->p->input, + p_input->p->input.p_item->psz_uri, NULL ) ) + { + goto error; + } + + InitTitle( p_input ); + + /* Load master infos */ + /* Init length */ + if( !demux_Control( p_input->p->input.p_demux, DEMUX_GET_LENGTH, + &val.i_time ) && val.i_time > 0 ) + { + var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL ); + UpdateItemLength( p_input, val.i_time ); + } + else + { + val.i_time = input_item_GetDuration( p_input->p->input.p_item ); + if( val.i_time > 0 ) + { /* fallback: gets length from metadata */ + var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL ); + UpdateItemLength( p_input, val.i_time ); } - es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, i_es_out_mode ); + } - /* Inform the demuxer about waited group (needed only for DVB) */ - if( i_es_out_mode == ES_OUT_MODE_ALL ) - { - demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1, NULL ); - } - else if( i_es_out_mode == ES_OUT_MODE_PARTIAL ) - { - demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1, - val.p_list ); - } - else - { - demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, - (int) var_GetInteger( p_input, "program" ), NULL ); - } + StartTitle( p_input ); - if( p_input->p->p_sout ) - { - if( p_input->p->p_sout->i_out_pace_nocontrol > 0 ) - { - p_input->p->b_out_pace_control = VLC_FALSE; - } - else - { - p_input->p->b_out_pace_control = VLC_TRUE; - } + InitPrograms( p_input ); - if( p_input->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 */ - vlc_thread_set_priority( p_input, VLC_THREAD_PRIORITY_LOW ); - } + if( !p_input->b_preparsing && p_input->p->p_sout ) + { + p_input->p->b_out_pace_control = (p_input->p->p_sout->i_out_pace_nocontrol > 0); - msg_Dbg( p_input, "starting in %s mode", - p_input->p->b_out_pace_control ? "async" : "sync" ); + if( p_input->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 */ + vlc_thread_set_priority( p_input, VLC_THREAD_PRIORITY_LOW ); } + + msg_Dbg( p_input, "starting in %s mode", + p_input->p->b_out_pace_control ? "async" : "sync" ); } p_meta = vlc_meta_New(); + /* Get meta data from users */ InputMetaUser( p_input, p_meta ); @@ -1177,23 +1227,7 @@ static int Init( input_thread_t * p_input ) DemuxMeta( p_input, p_meta, p_input->p->input.p_demux ); /* Access_file does not give any meta, and there are no slave */ - if( !p_input->b_preparsing ) - { - if( p_input->p->input.p_access ) - access2_Control( p_input->p->input.p_access, ACCESS_GET_META, - p_meta ); - - /* Get meta data from slave input */ - for( i = 0; i < p_input->p->i_slave; i++ ) - { - DemuxMeta( p_input, p_meta, p_input->p->slave[i]->p_demux ); - if( p_input->p->slave[i]->p_access ) - { - access2_Control( p_input->p->slave[i]->p_access, - ACCESS_GET_META, p_meta ); - } - } - } + AccessMeta( p_input, p_meta ); InputUpdateMeta( p_input, p_meta ); @@ -1214,15 +1248,15 @@ error: if( p_input->p->p_es_out ) input_EsOutDelete( p_input->p->p_es_out ); - +#ifdef ENABLE_SOUT if( p_input->p->p_sout ) { vlc_object_detach( p_input->p->p_sout ); sout_DeleteInstance( p_input->p->p_sout ); } +#endif - - if( !p_input->b_preparsing && p_input->p_libvlc->b_stats ) + if( !p_input->b_preparsing && libvlc_stats( p_input ) ) { #define EXIT_COUNTER( c ) do { if( p_input->p->counters.p_##c ) \ stats_CounterClean( p_input->p->counters.p_##c );\ @@ -1243,7 +1277,7 @@ error: if( p_input->p->p_sout ) { EXIT_COUNTER( sout_sent_packets ); - EXIT_COUNTER (sout_sent_bytes ); + EXIT_COUNTER( sout_sent_bytes ); EXIT_COUNTER( sout_send_bitrate ); } #undef EXIT_COUNTER @@ -1260,18 +1294,19 @@ error: } /***************************************************************************** - * Error: RunThread() error loop + * WaitDie: Wait until we are asked to die. ***************************************************************************** * This function is called when an error occurred during thread main's loop. *****************************************************************************/ -static void Error( input_thread_t *p_input ) +static void WaitDie( input_thread_t *p_input ) { - input_ChangeState( p_input, ERROR_S ); - while( !p_input->b_die ) - { - /* Sleep a while */ - msleep( INPUT_IDLE_SLEEP ); - } + input_ChangeState( p_input, p_input->b_error ? ERROR_S : END_S ); + + /* 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 ); } /***************************************************************************** @@ -1285,7 +1320,7 @@ static void End( input_thread_t * p_input ) input_ChangeState( p_input, END_S ); /* Clean control variables */ - input_ControlVarClean( p_input ); + input_ControlVarStop( p_input ); /* Clean up master */ InputSourceClean( &p_input->p->input ); @@ -1305,15 +1340,17 @@ static void End( input_thread_t * p_input ) 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( p_input->p_libvlc->b_stats ) + 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->input.p_item->p_stats ); - if( p_input->p_libvlc->p_stats_computer == p_input ) + if( p_private->p_stats_computer == p_input ) { stats_ComputeGlobalStats( p_input->p_libvlc, p_input->p_libvlc->p_stats ); - p_input->p_libvlc->p_stats_computer = NULL; + p_private->p_stats_computer = NULL; } CL_CO( read_bytes ); CL_CO( read_packets ); @@ -1349,95 +1386,27 @@ static void End( input_thread_t * p_input ) } /* Tell we're dead */ - p_input->b_dead = VLC_TRUE; -} - -static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, vlc_bool_t *pb_sout_keep ) -{ - vlc_bool_t b_keep_sout = var_CreateGetBool( p_parent, "sout-keep" ); - sout_instance_t *p_sout = NULL; - int i; - - /* Search sout-keep options - * XXX it has to be done here, but it is duplicated work :( */ - vlc_mutex_lock( &p_item->lock ); - for( i = 0; i < p_item->i_options; i++ ) - { - const char *psz_option = p_item->ppsz_options[i]; - if( !psz_option ) - continue; - if( *psz_option == ':' ) - psz_option++; - - if( !strcmp( psz_option, "sout-keep" ) ) - b_keep_sout = VLC_TRUE; - else if( !strcmp( psz_option, "no-sout-keep" ) || !strcmp( psz_option, "nosout-keep" ) ) - b_keep_sout = VLC_FALSE; - } - vlc_mutex_unlock( &p_item->lock ); - - /* Find a potential sout to reuse - * XXX it might be unusable but this will be checked later */ - if( b_keep_sout ) - { - /* Remove the sout from the playlist garbage collector */ - /* FIXME: we don't want to depend on the playlist, sout - * should be attached to libvlc */ - playlist_t * p_playlist = vlc_object_find( p_parent, - VLC_OBJECT_PLAYLIST, FIND_PARENT ); - if( p_playlist ) - { - vlc_mutex_lock( &p_playlist->gc_lock ); - p_sout = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, FIND_CHILD ); - if( p_sout ) - { - if( p_sout->p_parent != VLC_OBJECT(p_playlist) ) - { - vlc_object_release( p_sout ); - p_sout = NULL; - } - else - { - vlc_object_detach( p_sout ); /* Remove it from the GC */ - - vlc_object_release( p_sout ); - } - } - vlc_mutex_unlock( &p_playlist->gc_lock ); - - vlc_object_release( p_playlist ); - } - } - - if( pb_sout_keep ) - *pb_sout_keep = b_keep_sout; - - return p_sout; -} - -static void SoutKeep( sout_instance_t *p_sout ) -{ - /* FIXME: we don't want to depend on the playlist, sout - * should be attached to libvlc */ - playlist_t * p_playlist = vlc_object_find( p_sout, VLC_OBJECT_PLAYLIST, - FIND_PARENT ); - if( !p_playlist ) return; - - msg_Dbg( p_sout, "sout has been kept" ); - vlc_object_attach( p_sout, p_playlist ); - - pl_Release( p_sout ); + p_input->b_dead = true; } /***************************************************************************** * Control *****************************************************************************/ static inline int ControlPopNoLock( input_thread_t *p_input, - int *pi_type, vlc_value_t *p_val ) + int *pi_type, vlc_value_t *p_val, + mtime_t i_deadline ) { - if( p_input->p->i_control <= 0 ) + + while( p_input->p->i_control <= 0 ) { - return VLC_EGENERIC; + 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; @@ -1503,31 +1472,34 @@ static void ControlReduce( input_thread_t *p_input ) } } -static vlc_bool_t Control( input_thread_t *p_input, int i_type, +static bool Control( input_thread_t *p_input, int i_type, vlc_value_t val ) { - vlc_bool_t b_force_update = VLC_FALSE; + const mtime_t i_control_date = mdate(); + bool b_force_update = false; - if( !p_input ) return b_force_update; + if( !p_input ) + return b_force_update; switch( i_type ) { case INPUT_CONTROL_SET_DIE: msg_Dbg( p_input, "control: stopping input" ); - /* Mark all submodules to die */ - if( p_input->p->input.p_access ) - vlc_object_kill( p_input->p->input.p_access ); - if( p_input->p->input.p_stream ) - vlc_object_kill( p_input->p->input.p_stream ); - vlc_object_kill( p_input->p->input.p_demux ); - vlc_object_kill( p_input ); + /* Mark all submodules to die */ + ObjectKillChildrens( p_input, VLC_OBJECT(p_input) ); break; case INPUT_CONTROL_SET_POSITION: case INPUT_CONTROL_SET_POSITION_OFFSET: { double f_pos; + + if( p_input->p->b_recording ) + { + msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) ignored while recording" ); + break; + } if( i_type == INPUT_CONTROL_SET_POSITION ) { f_pos = val.f_float; @@ -1535,7 +1507,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, else { /* Should not fail */ - demux2_Control( p_input->p->input.p_demux, + demux_Control( p_input->p->input.p_demux, DEMUX_GET_POSITION, &f_pos ); f_pos += val.f_float; } @@ -1543,7 +1515,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( f_pos > 1.0 ) f_pos = 1.0; /* Reset the decoders states and clock sync (before calling the demuxer */ input_EsOutChangePosition( p_input->p->p_es_out ); - if( demux2_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION, + if( demux_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION, f_pos ) ) { msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) " @@ -1554,7 +1526,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( p_input->p->i_slave > 0 ) SlaveSeek( p_input ); - b_force_update = VLC_TRUE; + b_force_update = true; } break; } @@ -1565,6 +1537,12 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, int64_t i_time; int i_ret; + if( p_input->p->b_recording ) + { + msg_Err( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) ignored while recording" ); + break; + } + if( i_type == INPUT_CONTROL_SET_TIME ) { i_time = val.i_time; @@ -1572,7 +1550,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, else { /* Should not fail */ - demux2_Control( p_input->p->input.p_demux, + demux_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ); i_time += val.i_time; } @@ -1581,25 +1559,25 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, /* Reset the decoders states and clock sync (before calling the demuxer */ input_EsOutChangePosition( p_input->p->p_es_out ); - i_ret = demux2_Control( p_input->p->input.p_demux, + i_ret = demux_Control( p_input->p->input.p_demux, DEMUX_SET_TIME, i_time ); if( i_ret ) { int64_t i_length; /* Emulate it with a SET_POS */ - demux2_Control( p_input->p->input.p_demux, + demux_Control( p_input->p->input.p_demux, DEMUX_GET_LENGTH, &i_length ); if( i_length > 0 ) { double f_pos = (double)i_time / (double)i_length; - i_ret = demux2_Control( p_input->p->input.p_demux, + i_ret = demux_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION, f_pos ); } } if( i_ret ) { - msg_Warn( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) "I64Fd + msg_Warn( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) %"PRId64 " failed or not possible", i_time ); } else @@ -1607,7 +1585,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( p_input->p->i_slave > 0 ) SlaveSeek( p_input ); - b_force_update = VLC_TRUE; + b_force_update = true; } break; } @@ -1618,11 +1596,11 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, { int i_ret; if( p_input->p->input.p_access ) - i_ret = access2_Control( p_input->p->input.p_access, - ACCESS_SET_PAUSE_STATE, VLC_FALSE ); + i_ret = access_Control( p_input->p->input.p_access, + ACCESS_SET_PAUSE_STATE, false ); else - i_ret = demux2_Control( p_input->p->input.p_demux, - DEMUX_SET_PAUSE_STATE, VLC_FALSE ); + i_ret = demux_Control( p_input->p->input.p_demux, + DEMUX_SET_PAUSE_STATE, false ); if( i_ret ) { @@ -1633,55 +1611,51 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, vlc_mutex_lock( &p_input->p->lock_control ); } - b_force_update = VLC_TRUE; + b_force_update = true; /* Switch to play */ - p_input->i_state = PLAYING_S; - val.i_int = PLAYING_S; - var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); + input_ChangeStateWithVarCallback( p_input, PLAYING_S, false ); /* */ if( !i_ret ) - input_EsOutChangeState( p_input->p->p_es_out ); + input_EsOutChangePause( p_input->p->p_es_out, false, i_control_date ); } else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S && p_input->p->b_can_pause ) { - int i_ret; + int i_ret, state; if( p_input->p->input.p_access ) - i_ret = access2_Control( p_input->p->input.p_access, - ACCESS_SET_PAUSE_STATE, VLC_TRUE ); + i_ret = access_Control( p_input->p->input.p_access, + ACCESS_SET_PAUSE_STATE, true ); else - i_ret = demux2_Control( p_input->p->input.p_demux, - DEMUX_SET_PAUSE_STATE, VLC_TRUE ); + i_ret = demux_Control( p_input->p->input.p_demux, + DEMUX_SET_PAUSE_STATE, true ); - b_force_update = VLC_TRUE; + b_force_update = true; if( i_ret ) { msg_Warn( p_input, "cannot set pause state" ); - val.i_int = p_input->i_state; + state = p_input->i_state; } else { - val.i_int = PAUSE_S; + state = PAUSE_S; } /* Switch to new state */ - p_input->i_state = val.i_int; - var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); + input_ChangeStateWithVarCallback( p_input, state, false ); /* */ if( !i_ret ) - input_EsOutChangeState( p_input->p->p_es_out ); + input_EsOutChangePause( p_input->p->p_es_out, true, i_control_date ); } else if( val.i_int == PAUSE_S && !p_input->p->b_can_pause ) { - b_force_update = VLC_TRUE; + b_force_update = true; /* Correct "state" value */ - val.i_int = p_input->i_state; - var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); + input_ChangeStateWithVarCallback( p_input, p_input->i_state, false ); } else if( val.i_int != PLAYING_S && val.i_int != PAUSE_S ) { @@ -1766,7 +1740,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( p_input->p->input.p_access ) i_ret = VLC_EGENERIC; else - i_ret = demux2_Control( p_input->p->input.p_demux, + i_ret = demux_Control( p_input->p->input.p_demux, DEMUX_SET_RATE, &i_rate ); if( i_ret ) { @@ -1780,7 +1754,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, { val.i_int = i_rate; var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL ); - var_SetBool( p_input, "rate-change", VLC_TRUE ); + var_SetBool( p_input, "rate-change", true ); p_input->p->i_rate = i_rate; @@ -1788,7 +1762,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( p_input->p->input.b_rescale_ts ) input_EsOutChangeRate( p_input->p->p_es_out, i_rate ); - b_force_update = VLC_TRUE; + b_force_update = true; } break; } @@ -1798,15 +1772,19 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, es_out_Control( p_input->p->p_es_out, ES_OUT_SET_GROUP, val.i_int ); - demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, val.i_int, + demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, val.i_int, NULL ); break; case INPUT_CONTROL_SET_ES: /* No need to force update, es_out does it if needed */ es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ES, - input_EsOutGetFromID( p_input->p->p_es_out, - val.i_int ) ); + input_EsOutGetFromID( p_input->p->p_es_out, val.i_int ) ); + break; + + case INPUT_CONTROL_RESTART_ES: + es_out_Control( p_input->p->p_es_out, ES_OUT_RESTART_ES, + input_EsOutGetFromID( p_input->p->p_es_out, val.i_int ) ); break; case INPUT_CONTROL_SET_AUDIO_DELAY: @@ -1824,6 +1802,11 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, case INPUT_CONTROL_SET_TITLE: case INPUT_CONTROL_SET_TITLE_NEXT: case INPUT_CONTROL_SET_TITLE_PREV: + if( p_input->p->b_recording ) + { + msg_Err( p_input, "INPUT_CONTROL_SET_TITLE(*) ignored while recording" ); + break; + } if( p_input->p->input.b_title_demux && p_input->p->input.i_title > 0 ) { @@ -1843,7 +1826,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, { input_EsOutChangePosition( p_input->p->p_es_out ); - demux2_Control( p_demux, DEMUX_SET_TITLE, i_title ); + demux_Control( p_demux, DEMUX_SET_TITLE, i_title ); input_ControlVarTitle( p_input, i_title ); } } @@ -1863,7 +1846,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, { input_EsOutChangePosition( p_input->p->p_es_out ); - access2_Control( p_access, ACCESS_SET_TITLE, i_title ); + access_Control( p_access, ACCESS_SET_TITLE, i_title ); stream_AccessReset( p_input->p->input.p_stream ); } } @@ -1871,6 +1854,12 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, case INPUT_CONTROL_SET_SEEKPOINT: case INPUT_CONTROL_SET_SEEKPOINT_NEXT: case INPUT_CONTROL_SET_SEEKPOINT_PREV: + if( p_input->p->b_recording ) + { + msg_Err( p_input, "INPUT_CONTROL_SET_SEEKPOINT(*) ignored while recording" ); + break; + } + if( p_input->p->input.b_title_demux && p_input->p->input.i_title > 0 ) { @@ -1884,10 +1873,10 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, i_seekpoint = p_demux->info.i_seekpoint; i_seekpoint_time = p_input->p->input.title[p_demux->info.i_title]->seekpoint[i_seekpoint]->i_time_offset; if( i_seekpoint_time >= 0 && - !demux2_Control( p_demux, + !demux_Control( p_demux, DEMUX_GET_TIME, &i_input_time ) ) { - if ( i_input_time < i_seekpoint_time + 3000000 ) + if( i_input_time < i_seekpoint_time + 3000000 ) i_seekpoint--; } else @@ -1904,7 +1893,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, input_EsOutChangePosition( p_input->p->p_es_out ); - demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint ); + demux_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint ); } } else if( p_input->p->input.i_title > 0 ) @@ -1920,10 +1909,10 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, i_seekpoint = p_access->info.i_seekpoint; i_seekpoint_time = p_input->p->input.title[p_access->info.i_title]->seekpoint[i_seekpoint]->i_time_offset; if( i_seekpoint_time >= 0 && - demux2_Control( p_demux, + demux_Control( p_demux, DEMUX_GET_TIME, &i_input_time ) ) { - if ( i_input_time < i_seekpoint_time + 3000000 ) + if( i_input_time < i_seekpoint_time + 3000000 ) i_seekpoint--; } else @@ -1939,13 +1928,21 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, { input_EsOutChangePosition( p_input->p->p_es_out ); - access2_Control( p_access, ACCESS_SET_SEEKPOINT, + access_Control( p_access, ACCESS_SET_SEEKPOINT, i_seekpoint ); stream_AccessReset( p_input->p->input.p_stream ); } } 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: if( val.psz_string ) { @@ -1961,7 +1958,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, val.psz_string ); /* Set position */ - if( demux2_Control( p_input->p->input.p_demux, + 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" ); @@ -1969,8 +1966,8 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, free( slave ); break; } - if( demux2_Control( slave->p_demux, - DEMUX_SET_TIME, i_time ) ) + if( demux_Control( slave->p_demux, + DEMUX_SET_TIME, i_time ) ) { msg_Err( p_input, "seek failed for new slave" ); InputSourceClean( slave ); @@ -1980,9 +1977,9 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, /* Get meta (access and demux) */ p_meta = vlc_meta_New(); - access2_Control( slave->p_access, ACCESS_GET_META, + access_Control( slave->p_access, ACCESS_GET_META, p_meta ); - demux2_Control( slave->p_demux, DEMUX_GET_META, p_meta ); + demux_Control( slave->p_demux, DEMUX_GET_META, p_meta ); InputUpdateMeta( p_input, p_meta ); TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave ); @@ -1998,6 +1995,28 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, } break; + case INPUT_CONTROL_SET_RECORD_STATE: + if( !!p_input->p->b_recording != !!val.b_bool ) + { + if( p_input->p->input.b_can_stream_record ) + { + if( demux_Control( p_input->p->input.p_demux, + DEMUX_SET_RECORD_STATE, val.b_bool ) ) + val.b_bool = false; + } + else + { + if( input_EsOutSetRecord( p_input->p->p_es_out, val.b_bool ) ) + val.b_bool = false; + } + p_input->p->b_recording = val.b_bool; + + var_Change( p_input, "record", VLC_VAR_SETVALUE, &val, NULL ); + + b_force_update = true; + } + break; + case INPUT_CONTROL_SET_BOOKMARK: default: msg_Err( p_input, "not yet implemented" ); @@ -2089,11 +2108,23 @@ static int UpdateFromAccess( input_thread_t *p_input ) { /* TODO maybe multi - access ? */ vlc_meta_t *p_meta = vlc_meta_New(); - access2_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta ); + access_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta ); InputUpdateMeta( p_input, p_meta ); - var_SetInteger( pl_Get( p_input ), "item-change", p_input->p->input.p_item->i_id ); p_access->info.i_update &= ~INPUT_UPDATE_META; } + if( p_access->info.i_update & INPUT_UPDATE_SIGNAL ) + { + double f_quality; + double f_strength; + + if( access_Control( p_access, ACCESS_GET_SIGNAL, &f_quality, &f_strength ) ) + f_quality = f_strength = -1; + + var_SetFloat( p_input, "signal-quality", f_quality ); + var_SetFloat( p_input, "signal-strength", f_strength ); + + p_access->info.i_update &= ~INPUT_UPDATE_SIGNAL; + } p_access->info.i_update &= ~INPUT_UPDATE_SIZE; @@ -2130,14 +2161,6 @@ static int UpdateFromAccess( input_thread_t *p_input ) static void UpdateItemLength( input_thread_t *p_input, int64_t i_length ) { input_item_SetDuration( p_input->p->input.p_item, (mtime_t) i_length ); - - if( !p_input->b_preparsing ) - { - pl_Yield( p_input ); - var_SetInteger( pl_Get( p_input ), "item-change", - p_input->p->input.p_item->i_id ); - pl_Release( p_input ); - } } /***************************************************************************** @@ -2145,28 +2168,10 @@ static void UpdateItemLength( input_thread_t *p_input, int64_t i_length ) *****************************************************************************/ static input_source_t *InputSourceNew( input_thread_t *p_input ) { - input_source_t *in = (input_source_t*) malloc( sizeof( input_source_t ) ); - - if( !in ) - { - msg_Err( p_input, "out of memory for new input source" ); - return NULL; - } - - in->p_item = NULL; - in->p_access = NULL; - in->p_stream = NULL; - in->p_demux = NULL; - in->b_title_demux = VLC_FALSE; - TAB_INIT( in->i_title, in->title ); - in->b_can_pause = VLC_TRUE; - in->b_can_pace_control = VLC_TRUE; - in->b_can_rate_control = VLC_TRUE; - in->b_rescale_ts = VLC_TRUE; - in->b_eof = VLC_FALSE; - in->f_fps = 0.0; - in->i_cr_average = 0; - + VLC_UNUSED(p_input); + input_source_t *in = malloc( sizeof( input_source_t ) ); + if( in ) + memset( in, 0, sizeof( input_source_t ) ); return in; } @@ -2177,7 +2182,9 @@ 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 bool b_master = in == &p_input->p->input; + + char psz_dup[strlen(psz_mrl) + 1]; const char *psz_access; const char *psz_demux; char *psz_path; @@ -2192,7 +2199,7 @@ static int InputSourceInit( input_thread_t *p_input, if( !p_input ) return VLC_EGENERIC; /* Split uri */ - MRLSplit( psz_dup, &psz_access, &psz_demux, &psz_path ); + input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_dup ); msg_Dbg( p_input, "`%s' gives access `%s' demux `%s' path `%s'", psz_mrl, psz_access, psz_demux, psz_path ); @@ -2228,12 +2235,9 @@ static int InputSourceInit( input_thread_t *p_input, } } - /* Try access_demux if no demux given */ - if( *psz_demux == '\0' ) - { - in->p_demux = demux2_New( p_input, psz_access, psz_demux, psz_path, - NULL, p_input->p->p_es_out, VLC_FALSE ); - } + /* Try access_demux first */ + in->p_demux = demux_New( p_input, psz_access, psz_demux, psz_path, + NULL, p_input->p->p_es_out, false ); } else { @@ -2252,55 +2256,55 @@ static int InputSourceInit( input_thread_t *p_input, int64_t i_pts_delay; /* Get infos from access_demux */ - demux2_Control( in->p_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 ); - in->b_title_demux = VLC_TRUE; - if( demux2_Control( in->p_demux, DEMUX_GET_TITLE_INFO, + in->b_title_demux = true; + if( demux_Control( in->p_demux, DEMUX_GET_TITLE_INFO, &in->title, &in->i_title, &in->i_title_offset, &in->i_seekpoint_offset ) ) { - in->i_title = 0; - in->title = NULL; + TAB_INIT( in->i_title, in->title ); } - if( demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE, + if( demux_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE, &in->b_can_pace_control ) ) - in->b_can_pace_control = VLC_FALSE; + in->b_can_pace_control = false; if( !in->b_can_pace_control ) { - if( demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_RATE, + if( demux_Control( in->p_demux, DEMUX_CAN_CONTROL_RATE, &in->b_can_rate_control, &in->b_rescale_ts ) ) { - in->b_can_rate_control = VLC_FALSE; - in->b_rescale_ts = VLC_TRUE; /* not used */ + in->b_can_rate_control = false; + in->b_rescale_ts = true; /* not used */ } } else { - in->b_can_rate_control = VLC_TRUE; - in->b_rescale_ts = VLC_TRUE; + in->b_can_rate_control = true; + in->b_rescale_ts = true; } - if( demux2_Control( in->p_demux, DEMUX_CAN_PAUSE, + if( demux_Control( in->p_demux, DEMUX_CAN_PAUSE, &in->b_can_pause ) ) - in->b_can_pause = VLC_FALSE; + in->b_can_pause = false; var_SetBool( p_input, "can-pause", in->b_can_pause ); - int ret = demux2_Control( in->p_demux, DEMUX_CAN_SEEK, + int ret = demux_Control( in->p_demux, DEMUX_CAN_SEEK, &val.b_bool ); if( ret != VLC_SUCCESS ) - val.b_bool = VLC_FALSE; + val.b_bool = false; var_Set( p_input, "seekable", val ); } else { int64_t i_pts_delay; - input_ChangeState( p_input, OPENING_S ); + if( b_master ) + input_ChangeState( p_input, OPENING_S ); /* Now try a real access */ - in->p_access = access2_New( p_input, psz_access, psz_demux, psz_path ); + 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, '%' ) ) @@ -2310,14 +2314,14 @@ static int InputSourceInit( input_thread_t *p_input, msg_Dbg( p_input, "retrying with access `%s' demux `%s' path `%s'", psz_access, psz_demux, psz_path ); - in->p_access = access2_New( p_input, + 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() ); - intf_UserFatal( VLC_OBJECT( p_input), VLC_FALSE, + 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 ); @@ -2334,7 +2338,7 @@ static int InputSourceInit( input_thread_t *p_input, if( end ) *end++ = '\0'; - in->p_access = access2_FilterNew( in->p_access, psz ); + in->p_access = access_FilterNew( in->p_access, psz ); if( in->p_access == NULL ) { in->p_access = p_access; @@ -2349,36 +2353,52 @@ static int InputSourceInit( input_thread_t *p_input, /* Get infos from access */ if( !p_input->b_preparsing ) { - access2_Control( in->p_access, + 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 ); - in->b_title_demux = VLC_FALSE; - if( access2_Control( in->p_access, ACCESS_GET_TITLE_INFO, + in->b_title_demux = false; + if( access_Control( in->p_access, ACCESS_GET_TITLE_INFO, &in->title, &in->i_title, &in->i_title_offset, &in->i_seekpoint_offset ) ) { - in->i_title = 0; - in->title = NULL; + TAB_INIT( in->i_title, in->title ); } - access2_Control( in->p_access, ACCESS_CAN_CONTROL_PACE, + access_Control( in->p_access, ACCESS_CAN_CONTROL_PACE, &in->b_can_pace_control ); in->b_can_rate_control = in->b_can_pace_control; - in->b_rescale_ts = VLC_TRUE; + in->b_rescale_ts = true; - access2_Control( in->p_access, ACCESS_CAN_PAUSE, + access_Control( in->p_access, ACCESS_CAN_PAUSE, &in->b_can_pause ); var_SetBool( p_input, "can-pause", in->b_can_pause ); - access2_Control( in->p_access, ACCESS_CAN_SEEK, + access_Control( in->p_access, ACCESS_CAN_SEEK, &val.b_bool ); var_Set( p_input, "seekable", val ); } - input_ChangeState( p_input, BUFFERING_S ); + if( b_master ) + input_ChangeState( p_input, BUFFERING_S ); + + /* Autodetect extra files if none specified */ + char *psz_input_list = var_CreateGetNonEmptyString( p_input, "input-list" ); + if( !psz_input_list ) + { + 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 ); + } /* Create the stream_t */ in->p_stream = stream_AccessNew( in->p_access, p_input->b_preparsing ); + + /* Restor old value */ + if( !psz_input_list ) + var_SetString( p_input, "input-list", "" ); + free( psz_input_list ); + if( in->p_stream == NULL ) { msg_Warn( p_input, "cannot create a stream_t from access" ); @@ -2399,13 +2419,13 @@ static int InputSourceInit( input_thread_t *p_input, { const char *psz_a, *psz_d; psz_buf = strdup( in->p_access->psz_path ); - MRLSplit( psz_buf, &psz_a, &psz_d, &psz_real_path ); + input_SplitMRL( &psz_a, &psz_d, &psz_real_path, psz_buf ); } else { psz_real_path = psz_path; } - in->p_demux = demux2_New( p_input, psz_access, psz_demux, + 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 ); @@ -2416,17 +2436,17 @@ static int InputSourceInit( input_thread_t *p_input, { msg_Err( p_input, "no suitable demux module for `%s/%s://%s'", psz_access, psz_demux, psz_path ); - intf_UserFatal( VLC_OBJECT( p_input ), VLC_FALSE, + 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 the log for details."), psz_mrl ); + "Have a look at the log for details."), psz_mrl ); goto error; } /* Get title from demux */ if( !p_input->b_preparsing && in->i_title <= 0 ) { - if( demux2_Control( in->p_demux, DEMUX_GET_TITLE_INFO, + if( demux_Control( in->p_demux, DEMUX_GET_TITLE_INFO, &in->title, &in->i_title, &in->i_title_offset, &in->i_seekpoint_offset )) { @@ -2434,18 +2454,29 @@ static int InputSourceInit( input_thread_t *p_input, } else { - in->b_title_demux = VLC_TRUE; + in->b_title_demux = true; } } } + /* Set record capabilities */ + if( demux_Control( in->p_demux, DEMUX_CAN_RECORD, &in->b_can_stream_record ) ) + in->b_can_stream_record = false; +#ifdef ENABLE_SOUT + if( !var_CreateGetBool( p_input, "input-record-native" ) ) + in->b_can_stream_record = false; + var_SetBool( p_input, "can-record", true ); +#else + var_SetBool( p_input, "can-record", in->b_can_stream_record ); +#endif + /* get attachment * FIXME improve for b_preparsing: move it after GET_META and check psz_arturl */ if( 1 || !p_input->b_preparsing ) { int i_attachment; input_attachment_t **attachment; - if( !demux2_Control( in->p_demux, DEMUX_GET_ATTACHMENTS, + if( !demux_Control( in->p_demux, DEMUX_GET_ATTACHMENTS, &attachment, &i_attachment ) ) { vlc_mutex_lock( &p_input->p->input.p_item->lock ); @@ -2454,7 +2485,7 @@ static int InputSourceInit( input_thread_t *p_input, vlc_mutex_unlock( &p_input->p->input.p_item->lock ); } } - if( !demux2_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) ) + if( !demux_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) ) { vlc_mutex_lock( &p_input->p->input.p_item->lock ); in->f_fps = f_fps; @@ -2467,16 +2498,17 @@ static int InputSourceInit( input_thread_t *p_input, return VLC_SUCCESS; error: - input_ChangeState( p_input, ERROR_S ); + if( b_master ) + input_ChangeState( p_input, ERROR_S ); if( in->p_demux ) - demux2_Delete( in->p_demux ); + demux_Delete( in->p_demux ); if( in->p_stream ) stream_Delete( in->p_stream ); if( in->p_access ) - access2_Delete( in->p_access ); + access_Delete( in->p_access ); return VLC_EGENERIC; } @@ -2489,13 +2521,13 @@ static void InputSourceClean( input_source_t *in ) int i; if( in->p_demux ) - demux2_Delete( in->p_demux ); + demux_Delete( in->p_demux ); if( in->p_stream ) stream_Delete( in->p_stream ); if( in->p_access ) - access2_Delete( in->p_access ); + access_Delete( in->p_access ); if( in->i_title > 0 ) { @@ -2509,11 +2541,12 @@ static void SlaveDemux( input_thread_t *p_input ) { int64_t i_time; int i; + bool b_set_time = true; - if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) ) + 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" ); - return; + /* msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" ); */ + b_set_time = false; } for( i = 0; i < p_input->p->i_slave; i++ ) @@ -2524,12 +2557,12 @@ static void SlaveDemux( input_thread_t *p_input ) if( in->b_eof ) continue; - if( demux2_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) ) + if( b_set_time && demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) ) { for( ;; ) { int64_t i_stime; - if( demux2_Control( in->p_demux, DEMUX_GET_TIME, &i_stime ) ) + if( demux_Control( in->p_demux, DEMUX_GET_TIME, &i_stime ) ) { msg_Err( p_input, "slave[%d] doesn't like " "DEMUX_GET_TIME -> EOF", i ); @@ -2552,7 +2585,7 @@ static void SlaveDemux( input_thread_t *p_input ) if( i_ret <= 0 ) { msg_Dbg( p_input, "slave %d EOF", i ); - in->b_eof = VLC_TRUE; + in->b_eof = true; } } } @@ -2564,7 +2597,7 @@ static void SlaveSeek( input_thread_t *p_input ) if( !p_input ) return; - if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) ) + 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" ); return; @@ -2574,10 +2607,15 @@ static void SlaveSeek( input_thread_t *p_input ) { input_source_t *in = p_input->p->slave[i]; - if( demux2_Control( in->p_demux, DEMUX_SET_TIME, i_time ) ) + if( demux_Control( in->p_demux, DEMUX_SET_TIME, i_time ) ) { - msg_Err( p_input, "seek failed for slave %d -> EOF", i ); - in->b_eof = VLC_TRUE; + if( !in->b_eof ) + msg_Err( p_input, "seek failed for slave %d -> EOF", i ); + in->b_eof = true; + } + else + { + in->b_eof = false; } } } @@ -2608,6 +2646,61 @@ static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta ) #undef GET_META } +/***************************************************************************** + * InputGetExtraFiles + * Autodetect extra input list + *****************************************************************************/ +static char *InputGetExtraFiles( input_thread_t *p_input, + const char *psz_access, const char *psz_path ) +{ + char *psz_list = NULL; + + if( ( psz_access && *psz_access && strcmp( psz_access, "file" ) ) || !psz_path ) + return NULL; + + + 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; + + /* Try to list .xyz files */ + for( int i = 2; i < 999; i++ ) + { + char *psz_ext = strrchr( psz_file, '.' ); + struct stat st; + + snprintf( psz_ext, 5, ".%.3d", i ); + + if( utf8_stat( psz_file, &st ) + || !S_ISREG( st.st_mode ) || !st.st_size ) + continue; + + msg_Dbg( p_input, "Detected extra file `%s'", psz_file ); + + 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 + { + psz_list = strdup( psz_file ); + } + } + free( psz_file ); + + return psz_list; +} + /***************************************************************************** * InputUpdateMeta: merge p_item meta data with p_meta taking care of * arturl and locking issue. @@ -2617,8 +2710,7 @@ static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta ) input_item_t *p_item = p_input->p->input.p_item; char * psz_arturl = NULL; char *psz_title = NULL; - int i; - int i_arturl_event = VLC_FALSE; + int i_arturl_event = false; if( !p_meta ) return; @@ -2634,7 +2726,7 @@ static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta ) if( psz_arturl && *psz_arturl ) { vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, psz_arturl ); - i_arturl_event = VLC_TRUE; + i_arturl_event = true; } vlc_meta_Delete( p_meta ); @@ -2646,7 +2738,7 @@ static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta ) if( p_input->p->p_sout && !p_input->b_preparsing ) { vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, "" ); - i_arturl_event = VLC_TRUE; + i_arturl_event = true; } else @@ -2663,9 +2755,9 @@ static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta ) } vlc_mutex_unlock( &p_item->lock ); - input_item_SetPreparsed( p_item, VLC_TRUE ); + input_item_SetPreparsed( p_item, true ); - if( i_arturl_event == VLC_TRUE ) + if( i_arturl_event == true ) { vlc_event_t event; @@ -2681,19 +2773,6 @@ static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta ) free( psz_title ); } - if( p_meta ) - { - char ** ppsz_all_keys = vlc_dictionary_all_keys( &p_meta->extra_tags ); - for( i = 0; ppsz_all_keys[i]; i++ ) - { - input_Control( p_input, INPUT_ADD_INFO, _(VLC_META_INFO_CAT), _(ppsz_all_keys[i]), - vlc_dictionary_value_for_key( &p_meta->extra_tags, ppsz_all_keys[i] ) ); - free( ppsz_all_keys[i] ); - } - free( ppsz_all_keys ); - vlc_meta_Delete( p_meta ); - } - /** \todo handle sout meta */ } @@ -2716,9 +2795,32 @@ static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_atta *ppp_attachment = attachment; } +static void AccessMeta( input_thread_t * p_input, vlc_meta_t *p_meta ) +{ + int i; + + if( p_input->b_preparsing ) + return; + + if( p_input->p->input.p_access ) + access_Control( p_input->p->input.p_access, ACCESS_GET_META, + p_meta ); + + /* Get meta data from slave input */ + for( i = 0; i < p_input->p->i_slave; i++ ) + { + DemuxMeta( p_input, p_meta, p_input->p->slave[i]->p_demux ); + if( p_input->p->slave[i]->p_access ) + { + access_Control( p_input->p->slave[i]->p_access, + ACCESS_GET_META, p_meta ); + } + } +} + static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_demux ) { - vlc_bool_t b_bool; + bool b_bool; module_t *p_id3; @@ -2734,8 +2836,8 @@ static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_d vlc_mutex_unlock( &p_item->lock ); #endif - demux2_Control( p_demux, DEMUX_GET_META, p_meta ); - if( demux2_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) ) + demux_Control( p_demux, DEMUX_GET_META, p_meta ); + if( demux_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) ) return; if( !b_bool ) return; @@ -2744,7 +2846,7 @@ static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_d if(! p_demux->p_private ) return; - p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ); + p_id3 = module_need( p_demux, "meta reader", NULL, 0 ); if( p_id3 ) { demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private; @@ -2762,7 +2864,7 @@ static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_d p_demux_meta->i_attachments, p_demux_meta->attachments ); vlc_mutex_unlock( &p_input->p->input.p_item->lock ); } - module_Unneed( p_demux, p_id3 ); + module_unneed( p_demux, p_id3 ); } free( p_demux->p_private ); } @@ -2772,8 +2874,8 @@ static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_d * MRLSplit: parse the access, demux and url part of the * Media Resource Locator. *****************************************************************************/ -void MRLSplit( char *psz_dup, const char **ppsz_access, const char **ppsz_demux, - char **ppsz_path ) +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; @@ -2792,15 +2894,34 @@ void MRLSplit( char *psz_dup, const char **ppsz_access, const char **ppsz_demux, 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++; } else { psz_path = psz_dup; } + *ppsz_access = psz_access ? psz_access : (char*)""; + *ppsz_demux = psz_demux ? psz_demux : (char*)""; + *ppsz_path = psz_path; +} - *ppsz_access = psz_access ? psz_access : ""; - *ppsz_demux = psz_demux ? psz_demux : ""; - *ppsz_path = psz_path ? psz_path : ""; +static inline bool next(char ** src) +{ + char *end; + errno = 0; + long result = strtol( *src, &end, 0 ); + if( errno != 0 || result >= LONG_MAX || result <= LONG_MIN || + end == *src ) + { + return false; + } + *src = end; + return true; } /***************************************************************************** @@ -2821,19 +2942,30 @@ static void MRLSections( input_thread_t *p_input, char *psz_source, /* Start by parsing titles and chapters */ if( !psz_source || !( psz = strrchr( psz_source, '@' ) ) ) return; + /* Check we are really dealing with a title/chapter section */ psz_check = psz + 1; if( !*psz_check ) return; - if( isdigit(*psz_check) ) strtol( psz_check, &psz_check, 0 ); + if( isdigit(*psz_check) ) + if(!next(&psz_check)) return; if( *psz_check != ':' && *psz_check != '-' && *psz_check ) return; if( *psz_check == ':' && ++psz_check ) - if( isdigit(*psz_check) ) strtol( psz_check, &psz_check, 0 ); + { + if( isdigit(*psz_check) ) + if(!next(&psz_check)) return; + } if( *psz_check != '-' && *psz_check ) return; if( *psz_check == '-' && ++psz_check ) - if( isdigit(*psz_check) ) strtol( psz_check, &psz_check, 0 ); + { + if( isdigit(*psz_check) ) + if(!next(&psz_check)) return; + } if( *psz_check != ':' && *psz_check ) return; if( *psz_check == ':' && ++psz_check ) - if( isdigit(*psz_check) ) strtol( psz_check, &psz_check, 0 ); + { + if( isdigit(*psz_check) ) + if(!next(&psz_check)) return; + } if( *psz_check ) return; /* Separate start and end */ @@ -2873,19 +3005,13 @@ static void MRLSections( input_thread_t *p_input, char *psz_source, /***************************************************************************** * input_AddSubtitles: add a subtitles file and enable it *****************************************************************************/ -vlc_bool_t input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle, - vlc_bool_t b_check_extension ) +static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_forced ) { input_source_t *sub; vlc_value_t count; vlc_value_t list; char *psz_path, *psz_extension; - if( b_check_extension && !subtitles_Filter( psz_subtitle ) ) - { - return VLC_FALSE; - } - /* if we are provided a subtitle.sub file, * see if we don't have a subtitle.idx and use it instead */ psz_path = strdup( psz_subtitle ); @@ -2894,13 +3020,12 @@ vlc_bool_t input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle, psz_extension = strrchr( psz_path, '.'); if( psz_extension && strcmp( psz_extension, ".sub" ) == 0 ) { - FILE *f; + struct stat st; strcpy( psz_extension, ".idx" ); - /* FIXME: a portable wrapper for stat() or access() would be more suited */ - if( ( f = utf8_fopen( psz_path, "rt" ) ) ) + + if( !utf8_stat( psz_path, &st ) && S_ISREG( st.st_mode ) ) { - fclose( f ); msg_Dbg( p_input, "using %s subtitles file instead of %s", psz_path, psz_subtitle ); strcpy( psz_subtitle, psz_path ); @@ -2912,26 +3037,86 @@ vlc_bool_t input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle, var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL ); sub = InputSourceNew( p_input ); - if( !InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) ) + if( InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) ) + { + free( sub ); + return; + } + TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub ); + + /* Select the ES */ + if( b_forced && !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) ) { - TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub ); + if( count.i_int == 0 ) + count.i_int++; + /* if it was first one, there is disable too */ - /* Select the ES */ - if( !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) ) + if( count.i_int < list.p_list->i_count ) { - if( count.i_int == 0 ) - count.i_int++; - /* if it was first one, there is disable too */ + int i_id = list.p_list->p_values[count.i_int].i_int; + es_out_id_t *p_es = input_EsOutGetFromID( p_input->p->p_es_out, i_id ); - if( count.i_int < list.p_list->i_count ) - { - input_ControlPush( p_input, INPUT_CONTROL_SET_ES, - &list.p_list->p_values[count.i_int] ); - } - var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, NULL ); + es_out_Control( p_input->p->p_es_out, ES_OUT_SET_DEFAULT, p_es ); + es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ES, p_es ); } + var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, NULL ); } - else free( sub ); +} + +bool input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle, + bool b_check_extension ) +{ + vlc_value_t val; + + if( b_check_extension && !subtitles_Filter( psz_subtitle ) ) + return false; + + assert( psz_subtitle != NULL ); + + val.psz_string = strdup( psz_subtitle ); + if( val.psz_string ) + input_ControlPush( p_input, INPUT_CONTROL_ADD_SUBTITLE, &val ); + return true; +} - return VLC_TRUE; +/***************************************************************************** + * input_get_event_manager + *****************************************************************************/ +vlc_event_manager_t *input_get_event_manager( input_thread_t *p_input ) +{ + return &p_input->p->event_manager; +} + +/**/ +/* TODO FIXME nearly the same logic that snapshot code */ +char *input_CreateFilename( vlc_object_t *p_obj, const char *psz_path, const char *psz_prefix, const char *psz_extension ) +{ + char *psz_file; + DIR *path; + + path = utf8_opendir( psz_path ); + if( path ) + { + closedir( path ); + + char *psz_tmp = str_format( p_obj, psz_prefix ); + if( !psz_tmp ) + return NULL; + + filename_sanitize( psz_tmp ); + if( asprintf( &psz_file, "%s"DIR_SEP"%s%s%s", + psz_path, psz_tmp, + psz_extension ? "." : "", + psz_extension ? psz_extension : "" ) < 0 ) + psz_file = NULL; + free( psz_tmp ); + return psz_file; + } + else + { + psz_file = str_format( p_obj, psz_path ); + path_sanitize( psz_file ); + return psz_file; + } } +