X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=46b5759e71615da8553ca453256a4f70f234a39d;hb=5c47e1504ebede6bda22b1ac721021ea4e341bd0;hp=66a6d22166d5c2865286906f0fb41ecd4c5b1e54;hpb=dae08eab4dcc758007b0b89bca7ce750d0a102f3;p=vlc diff --git a/src/input/input.c b/src/input/input.c index 66a6d22166..46b5759e71 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -1,7 +1,7 @@ /***************************************************************************** * input.c: input thread ***************************************************************************** - * Copyright (C) 1998-2004 VideoLAN + * Copyright (C) 1998-2007 the VideoLAN team * $Id$ * * Authors: Christophe Massiot @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -29,55 +29,64 @@ #include #include -#include -#include -#include #include "input_internal.h" -#include "stream_output.h" +#include +#include "../stream_output/stream_output.h" -#include "vlc_interface.h" -#include "vlc_meta.h" +#include +#include +#include +#include +#include + +#ifdef HAVE_SYS_STAT_H +# include +#endif /***************************************************************************** * Local prototypes *****************************************************************************/ static int Run ( input_thread_t *p_input ); +static int RunAndDestroy ( input_thread_t *p_input ); -static int Init ( input_thread_t *p_input ); -static void Error( input_thread_t *p_input ); -static void End ( input_thread_t *p_input ); +static input_thread_t * Create ( vlc_object_t *, input_item_t *, + const char *, vlc_bool_t, sout_instance_t * ); +static int Init ( input_thread_t *p_input ); +static void Error ( input_thread_t *p_input ); +static void End ( input_thread_t *p_input ); +static void MainLoop( input_thread_t *p_input ); +static void Destroy( input_thread_t *p_input, sout_instance_t **pp_sout ); static inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t * ); static void ControlReduce( input_thread_t * ); static vlc_bool_t Control( input_thread_t *, int, vlc_value_t ); - static int UpdateFromAccess( input_thread_t * ); static int UpdateFromDemux( input_thread_t * ); static void UpdateItemLength( input_thread_t *, int64_t i_length ); -static void ParseOption( input_thread_t *p_input, const char *psz_option ); - -static void DecodeUrl ( char * ); -static void MRLSplit( input_thread_t *, char *, char **, char **, char ** ); static void MRLSections( input_thread_t *, char *, int *, int *, int *, int *); static input_source_t *InputSourceNew( input_thread_t *); static int InputSourceInit( input_thread_t *, input_source_t *, - char *, char *psz_forced_demux ); -static void InputSourceClean( input_thread_t *, input_source_t * ); + const char *, const char *psz_forced_demux ); +static void InputSourceClean( input_source_t * ); +/* TODO */ +//static void InputGetAttachments( input_thread_t *, input_source_t * ); static void SlaveDemux( input_thread_t *p_input ); static void SlaveSeek( input_thread_t *p_input ); -static vlc_meta_t *InputMetaUser( 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 * ); /***************************************************************************** - * input_CreateThread: creates a new input thread - ***************************************************************************** * This function creates a new input, and returns a pointer * to its description. On error, it returns NULL. * @@ -101,11 +110,10 @@ static vlc_meta_t *InputMetaUser( input_thread_t *p_input ); * TODO explain when Callback is called * TODO complete this list (?) *****************************************************************************/ -input_thread_t *__input_CreateThread( vlc_object_t *p_parent, - input_item_t *p_item ) - +static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, + const char *psz_header, vlc_bool_t b_quick, sout_instance_t *p_sout ) { - input_thread_t *p_input; /* thread descriptor */ + input_thread_t *p_input = NULL; /* thread descriptor */ vlc_value_t val; int i; @@ -116,53 +124,76 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, msg_Err( p_parent, "out of memory" ); return NULL; } + MALLOC_NULL( p_input->p, 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_playlist->p_stats && !b_quick ) + { + vlc_mutex_lock( &p_input->p_libvlc->p_playlist->p_stats->lock ); + if( p_input->p_libvlc->p_playlist->p_stats_computer == NULL ) + { + p_input->p_libvlc->p_playlist->p_stats_computer = p_input; + } + vlc_mutex_unlock( &p_input->p_libvlc->p_playlist->p_stats->lock ); + } + + p_input->b_preparsing = b_quick; + p_input->psz_header = psz_header ? strdup( psz_header ) : NULL; /* Init Common fields */ p_input->b_eof = VLC_FALSE; p_input->b_can_pace_control = VLC_TRUE; - p_input->i_start = 0; + p_input->p->i_start = 0; p_input->i_time = 0; - p_input->i_stop = 0; - p_input->i_title = 0; - p_input->title = NULL; - p_input->i_title_offset = p_input->i_seekpoint_offset = 0; + p_input->p->i_stop = 0; + p_input->p->i_run = 0; + p_input->p->i_title = 0; + p_input->p->title = NULL; + p_input->p->i_title_offset = p_input->p->i_seekpoint_offset = 0; p_input->i_state = INIT_S; - p_input->i_rate = INPUT_RATE_DEFAULT; - p_input->i_bookmark = 0; - p_input->bookmark = NULL; - p_input->p_es_out = NULL; - p_input->p_sout = NULL; - p_input->b_out_pace_control = VLC_FALSE; + p_input->p->i_rate = INPUT_RATE_DEFAULT; + 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_sout_keep = VLC_FALSE; + p_input->p->b_out_pace_control = VLC_FALSE; p_input->i_pts_delay = 0; /* Init Input fields */ - p_input->input.p_item = p_item; - p_input->input.p_access = NULL; - p_input->input.p_stream = NULL; - p_input->input.p_demux = NULL; - p_input->input.b_title_demux = VLC_FALSE; - p_input->input.i_title = 0; - p_input->input.title = NULL; - p_input->input.i_title_offset = p_input->input.i_seekpoint_offset = 0; - p_input->input.b_can_pace_control = VLC_TRUE; - p_input->input.b_eof = VLC_FALSE; - p_input->input.i_cr_average = 0; + p_input->p->input.p_item = 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.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_eof = VLC_FALSE; + p_input->p->input.i_cr_average = 0; + + vlc_mutex_lock( &p_item->lock ); + if( !p_input->p->input.p_item->p_meta ) + p_input->p->input.p_item->p_meta = vlc_meta_New(); + + if( !p_item->p_stats ) + p_item->p_stats = stats_NewInputStats( p_input ); + vlc_mutex_unlock( &p_item->lock ); /* No slave */ - p_input->i_slave = 0; - p_input->slave = NULL; + p_input->p->i_slave = 0; + p_input->p->slave = NULL; /* Init control buffer */ - vlc_mutex_init( p_input, &p_input->lock_control ); - p_input->i_control = 0; + vlc_mutex_init( p_input, &p_input->p->lock_control ); + p_input->p->i_control = 0; /* Parse input options */ vlc_mutex_lock( &p_item->lock ); for( i = 0; i < p_item->i_options; i++ ) - { - msg_Dbg( p_input, "option: %s", p_item->ppsz_options[i] ); - ParseOption( p_input, p_item->ppsz_options[i] ); - } + var_OptionParse( p_input, p_item->ppsz_options[i] ); vlc_mutex_unlock( &p_item->lock ); /* Create Object Variables for private use only */ @@ -170,93 +201,235 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, /* Create Objects variables for public Get and Set */ input_ControlVarInit( p_input ); - p_input->input.i_cr_average = var_GetInteger( p_input, "cr-average" ); - - /* TODO */ - var_Get( p_input, "bookmarks", &val ); - if( val.psz_string ) - { - /* FIXME: have a common cfg parsing routine used by sout and others */ - char *psz_parser, *psz_start, *psz_end; - psz_parser = val.psz_string; - while( (psz_start = strchr( psz_parser, '{' ) ) ) - { - seekpoint_t seekpoint; - char backup; - psz_start++; - psz_end = strchr( psz_start, '}' ); - if( !psz_end ) break; - psz_parser = psz_end + 1; - backup = *psz_parser; - *psz_parser = 0; - *psz_end = ','; - - seekpoint.psz_name = 0; - seekpoint.i_byte_offset = 0; - seekpoint.i_time_offset = 0; - while( (psz_end = strchr( psz_start, ',' ) ) ) + + p_input->p->input.i_cr_average = var_GetInteger( p_input, "cr-average" ); + + if( !p_input->b_preparsing ) + { + var_Get( p_input, "bookmarks", &val ); + if( val.psz_string ) + { + /* FIXME: have a common cfg parsing routine used by sout and others */ + char *psz_parser, *psz_start, *psz_end; + psz_parser = val.psz_string; + while( (psz_start = strchr( psz_parser, '{' ) ) ) { - *psz_end = 0; - if( !strncmp( psz_start, "name=", 5 ) ) - { - seekpoint.psz_name = psz_start + 5; - } - else if( !strncmp( psz_start, "bytes=", 6 ) ) - { - seekpoint.i_byte_offset = atoll(psz_start + 6); - } - else if( !strncmp( psz_start, "time=", 5 ) ) - { - seekpoint.i_time_offset = atoll(psz_start + 5) * 1000000; + seekpoint_t *p_seekpoint = vlc_seekpoint_New(); + char backup; + psz_start++; + psz_end = strchr( psz_start, '}' ); + if( !psz_end ) break; + psz_parser = psz_end + 1; + backup = *psz_parser; + *psz_parser = 0; + *psz_end = ','; + while( (psz_end = strchr( psz_start, ',' ) ) ) + { + *psz_end = 0; + if( !strncmp( psz_start, "name=", 5 ) ) + { + p_seekpoint->psz_name = strdup(psz_start + 5); + } + else if( !strncmp( psz_start, "bytes=", 6 ) ) + { + p_seekpoint->i_byte_offset = atoll(psz_start + 6); + } + else if( !strncmp( psz_start, "time=", 5 ) ) + { + p_seekpoint->i_time_offset = atoll(psz_start + 5) * + 1000000; + } + psz_start = psz_end + 1; } - psz_start = psz_end + 1; + msg_Dbg( p_input, "adding bookmark: %s, bytes="I64Fd", time="I64Fd, + p_seekpoint->psz_name, p_seekpoint->i_byte_offset, + p_seekpoint->i_time_offset ); + input_Control( p_input, INPUT_ADD_BOOKMARK, p_seekpoint ); + vlc_seekpoint_Delete( p_seekpoint ); + *psz_parser = backup; } - msg_Dbg( p_input, "adding bookmark: %s, bytes="I64Fd", time="I64Fd, - seekpoint.psz_name, seekpoint.i_byte_offset, - seekpoint.i_time_offset ); - input_Control( p_input, INPUT_ADD_BOOKMARK, &seekpoint ); - *psz_parser = backup; + free( val.psz_string ); } - free( val.psz_string ); } - /* Now we can attach our new input */ + /* Remove 'Now playing' info as it is probably outdated */ + input_Control( p_input, INPUT_DEL_INFO, _(VLC_META_INFO_CAT), VLC_META_NOW_PLAYING ); + vlc_mutex_lock( &p_item->lock ); + vlc_meta_SetNowPlaying( p_item->p_meta, NULL ); + vlc_mutex_unlock( &p_item->lock ); + + /* */ + if( p_input->b_preparsing ) + p_input->i_flags |= OBJECT_FLAGS_QUIET | OBJECT_FLAGS_NOINTERACT; + + /* */ + if( p_sout ) + p_input->p->p_sout = p_sout; + + /* Attach only once we are ready */ vlc_object_attach( p_input, p_parent ); + return p_input; +} + +static void Destroy( input_thread_t *p_input, sout_instance_t **pp_sout ) +{ + vlc_object_detach( p_input ); + + if( pp_sout ) + *pp_sout = NULL; + if( p_input->p->p_sout ) + { + if( pp_sout ) + *pp_sout = p_input->p->p_sout; + else if( p_input->p->b_sout_keep ) + SoutKeep( p_input->p->p_sout ); + else + sout_DeleteInstance( p_input->p->p_sout ); + } + + vlc_mutex_destroy( &p_input->p->lock_control ); + free( p_input->p ); + + vlc_object_destroy( p_input ); +} + +/** + * Initialize an input thread and run it. You will need to monitor the + * thread to clean up after it is done + * + * \param p_parent a vlc_object + * \param p_item an input item + * \return a pointer to the spawned input thread + */ +input_thread_t *__input_CreateThread( vlc_object_t *p_parent, + input_item_t *p_item ) +{ + 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; +} + +/* */ +input_thread_t *__input_CreateThreadExtended( vlc_object_t *p_parent, + input_item_t *p_item, + const char *psz_log, sout_instance_t *p_sout ) +{ + input_thread_t *p_input; + + p_input = Create( p_parent, p_item, psz_log, VLC_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 ) ) { + input_ChangeState( p_input, ERROR_S ); msg_Err( p_input, "cannot create input thread" ); - vlc_object_detach( p_input ); - vlc_object_destroy( p_input ); + Destroy( p_input, &p_sout ); return NULL; } return p_input; } -/***************************************************************************** - * input_StopThread: mark an input thread as zombie - ***************************************************************************** - * This function should not return until the thread is effectively cancelled. - *****************************************************************************/ +/** + * Initialize an input thread and run it. This thread will clean after himself, + * 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 + */ +int __input_Read( vlc_object_t *p_parent, input_item_t *p_item, + vlc_bool_t 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 ); + return VLC_EGENERIC; + } + p_input->p->b_sout_keep = b_sout_keep; + + if( b_block ) + { + RunAndDestroy( p_input ); + return VLC_SUCCESS; + } + else + { + if( vlc_thread_create( p_input, "input", RunAndDestroy, + VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) ) + { + input_ChangeState( p_input, ERROR_S ); + msg_Err( p_input, "cannot create input thread" ); + Destroy( p_input, NULL ); + return VLC_EGENERIC; + } + } + return p_input->i_object_id; +} + +/** + * Initialize an input and initialize it to preparse the item + * This function is blocking. It will only accept to parse files + * + * \param p_parent a vlc_object_t + * \param p_item an input item + * \return VLC_SUCCESS or an error + */ +int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item ) +{ + input_thread_t *p_input; + + /* Allocate descriptor */ + p_input = Create( p_parent, p_item, NULL, VLC_TRUE, NULL ); + if( !p_input ) + return VLC_EGENERIC; + + if( !Init( p_input ) ) + End( p_input ); + + Destroy( p_input, NULL ); + + return VLC_SUCCESS; +} + +/** + * Request a running input thread to stop and die + * + * \param the input thread to stop + */ void input_StopThread( input_thread_t *p_input ) { vlc_list_t *p_list; int i; /* Set die for input */ - p_input->b_die = VLC_TRUE; + vlc_object_kill( p_input ); + /* FIXME: seems to be duplicated in ControlPush(INPUT_CONTROL_SET_DIE) */ - /* We cannot touch p_input fields directly (we can from another thread), + /* 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++ ) { - p_list->p_values[i].p_object->b_die = VLC_TRUE; + vlc_object_kill( p_list->p_values[i].p_object ); } vlc_list_release( p_list ); @@ -264,7 +437,7 @@ void input_StopThread( input_thread_t *p_input ) p_list = vlc_list_find( p_input, VLC_OBJECT_STREAM, FIND_CHILD ); for( i = 0; i < p_list->i_count; i++ ) { - p_list->p_values[i].p_object->b_die = VLC_TRUE; + vlc_object_kill( p_list->p_values[i].p_object ); } vlc_list_release( p_list ); @@ -272,43 +445,40 @@ void input_StopThread( input_thread_t *p_input ) p_list = vlc_list_find( p_input, VLC_OBJECT_DEMUX, FIND_CHILD ); for( i = 0; i < p_list->i_count; i++ ) { - p_list->p_values[i].p_object->b_die = VLC_TRUE; + vlc_object_kill( p_list->p_values[i].p_object ); } vlc_list_release( p_list ); input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL ); } -/***************************************************************************** - * input_DestroyThread: mark an input thread as zombie - ***************************************************************************** - * This function should not return until the thread is effectively cancelled. - *****************************************************************************/ +/** + * Clean up a dead input thread + * This function does not return until the thread is effectively cancelled. + * + * \param the input thread to kill + */ void input_DestroyThread( input_thread_t *p_input ) +{ + input_DestroyThreadExtended( p_input, NULL ); +} + +void input_DestroyThreadExtended( input_thread_t *p_input, sout_instance_t **pp_sout ) { /* Join the thread */ vlc_thread_join( p_input ); - /* Delete input lock (only after thread joined) */ - vlc_mutex_destroy( &p_input->lock_control ); - - /* TODO: maybe input_DestroyThread should also delete p_input instead - * of the playlist but I'm not sure if it's possible */ + /* */ + Destroy( p_input, pp_sout ); } /***************************************************************************** * Run: main thread loop - ***************************************************************************** - * Thread in charge of processing the network packets and demultiplexing. - * - * TODO: - * read subtitle support (XXX take care of spu-delay in the right way). - * multi-input support (XXX may be done with subs) + * 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 ) { - int64_t i_intf_update = 0; - /* Signal that the thread is launched */ vlc_thread_ready( p_input ); @@ -316,6 +486,7 @@ static int Run( input_thread_t *p_input ) { /* If we failed, wait before we are killed, and exit */ p_input->b_error = VLC_TRUE; + playlist_Signal( pl_Get( p_input ) ); Error( p_input ); @@ -325,8 +496,89 @@ static int Run( input_thread_t *p_input ) return 0; } - /* Main loop */ - while( !p_input->b_die && !p_input->b_error && !p_input->input.b_eof ) + 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 ); + } + + /* Clean up */ + End( p_input ); + + return 0; +} + +/***************************************************************************** + * RunAndDestroy: main thread loop + * This is the "just forget me" thread that spawns the input processing chain, + * reads the stream, cleans up and releases memory + *****************************************************************************/ +static int RunAndDestroy( input_thread_t *p_input ) +{ + /* Signal that the thread is launched */ + vlc_thread_ready( p_input ); + + 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 */ + Destroy( p_input, NULL ); + return 0; +} + +/***************************************************************************** + * Main loop: Fill buffers from access, and demux + *****************************************************************************/ +static void MainLoop( input_thread_t *p_input ) +{ + int64_t i_start_mdate = mdate(); + int64_t i_intf_update = 0; + int i_updates = 0; + + while( !p_input->b_die && !p_input->b_error && !p_input->p->input.b_eof ) { vlc_bool_t b_force_update = VLC_FALSE; int i_ret; @@ -336,23 +588,24 @@ static int Run( input_thread_t *p_input ) /* Do the read */ if( p_input->i_state != PAUSE_S ) { - if( p_input->i_stop <= 0 || p_input->i_time < p_input->i_stop ) - i_ret=p_input->input.p_demux->pf_demux(p_input->input.p_demux); + 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 = 0; /* EOF */ + i_ret = p_input->p->input.p_demux->pf_demux(p_input->p->input.p_demux); if( i_ret > 0 ) { /* TODO */ - if( p_input->input.b_title_demux && - p_input->input.p_demux->info.i_update ) + 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->input.b_title_demux && - p_input->input.p_access && - p_input->input.p_access->info.i_update ) + 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; @@ -368,8 +621,9 @@ static int Run( input_thread_t *p_input ) { /* 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->input.b_eof = VLC_TRUE; + p_input->p->input.b_eof = VLC_TRUE; } else { @@ -382,23 +636,23 @@ static int Run( input_thread_t *p_input ) } /* Seek to start title/seekpoint */ - val.i_int = p_input->input.i_title_start - - p_input->input.i_title_offset; - if( val.i_int < 0 || val.i_int >= p_input->input.i_title ) + 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->input.i_seekpoint_start - - p_input->input.i_seekpoint_offset; + 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->i_start > 0 ) + if( p_input->p->i_start > 0 ) { - val.i_time = p_input->i_start; + val.i_time = p_input->p->i_start; input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &val ); } @@ -408,6 +662,9 @@ static int Run( input_thread_t *p_input ) input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION, &val ); } + + /* */ + i_start_mdate = mdate(); } } else if( i_ret < 0 ) @@ -415,7 +672,7 @@ static int Run( input_thread_t *p_input ) p_input->b_error = VLC_TRUE; } - if( i_ret > 0 && p_input->i_slave > 0 ) + if( i_ret > 0 && p_input->p->i_slave > 0 ) { SlaveDemux( p_input ); } @@ -427,7 +684,7 @@ static int Run( input_thread_t *p_input ) } /* Handle control */ - vlc_mutex_lock( &p_input->lock_control ); + vlc_mutex_lock( &p_input->p->lock_control ); ControlReduce( p_input ); while( !ControlPopNoLock( p_input, &i_type, &val ) ) { @@ -435,7 +692,7 @@ static int Run( input_thread_t *p_input ) if( Control( p_input, i_type, val ) ) b_force_update = VLC_TRUE; } - vlc_mutex_unlock( &p_input->lock_control ); + vlc_mutex_unlock( &p_input->p->lock_control ); if( b_force_update || i_intf_update < mdate() ) { @@ -443,20 +700,20 @@ static int Run( input_thread_t *p_input ) double f_pos; int64_t i_time, i_length; /* update input status variables */ - if( !demux2_Control( p_input->input.p_demux, + if( !demux2_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( !demux2_Control( p_input->input.p_demux, + if( !demux2_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( !demux2_Control( p_input->input.p_demux, + if( !demux2_Control( p_input->p->input.p_demux, DEMUX_GET_LENGTH, &i_length ) ) { vlc_value_t old_val; @@ -473,395 +730,493 @@ static int Run( input_thread_t *p_input ) var_SetBool( p_input, "intf-change", VLC_TRUE ); i_intf_update = mdate() + I64C(150000); } - } - - if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof ) - { - /* We have finish to demux data but not to play them */ - while( !p_input->b_die ) + /* 150ms * 8 = ~ 1 second */ + if( ++i_updates % 8 == 0 ) { - if( input_EsOutDecodersEmpty( p_input->p_es_out ) ) - break; - - msg_Dbg( p_input, "waiting decoder fifos to empty" ); - - msleep( INPUT_IDLE_SLEEP ); + 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_playlist->p_stats_computer == p_input ) + { + stats_ComputeGlobalStats( p_input->p_libvlc->p_playlist, + p_input->p_libvlc->p_playlist->p_stats ); + } } - - /* We have finished */ - p_input->b_eof = VLC_TRUE; - } - - /* Wait we are asked to die */ - if( !p_input->b_die ) - { - Error( p_input ); } - - /* Clean up */ - End( p_input ); - - return 0; } -/***************************************************************************** - * Init: init the input Thread - *****************************************************************************/ 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, *p_meta_user; - int i; - - /* Initialize optional stream output. (before access/demuxer) */ - psz = var_GetString( p_input, "sout" ); - if( *psz ) + vlc_meta_t *p_meta; + int i_es_out_mode; + int i, i_delay; + + /* Initialize optional stream output. (before access/demuxer) + * XXX: we add a special case if the uri starts by vlc. + * else 'vlc in.file --sout "" vlc:quit' cannot work (the output will + * be destroyed in case of a file). + * (this will break playing of file starting by 'vlc:' but I don't + * want to add more logic, just force file by file:// or code it ;) + */ + memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) ); + vlc_mutex_init( p_input, &p_input->p->counters.counters_lock ); + + if( !p_input->b_preparsing ) { - p_input->p_sout = sout_NewInstance( p_input, psz ); - if( p_input->p_sout == NULL ) + /* 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 ) { - msg_Err( p_input, "cannot start stream output instance, aborting" ); - free( psz ); - return VLC_EGENERIC; + 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_GetString( 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" ); + + sout_DeleteInstance( p_input->p->p_sout ); + p_input->p->p_sout = NULL; + } + } + + if( p_input->p->p_sout ) + { + /* Reuse it */ + msg_Dbg( p_input, "sout keep: reusing sout" ); + msg_Dbg( p_input, "sout keep: you probably want to use " + "gather stream_out" ); + vlc_object_attach( p_input->p->p_sout, p_input ); + } + else + { + /* Create a new one */ + p_input->p->p_sout = sout_NewInstance( p_input, psz ); + + if( !p_input->p->p_sout ) + { + input_ChangeState( p_input, ERROR_S ); + msg_Err( p_input, "cannot start stream output instance, " \ + "aborting" ); + free( psz ); + return VLC_EGENERIC; + } + } + + if( p_input->p_libvlc->b_stats ) + { + 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; + } + } + else if( p_input->p->p_sout ) + { + msg_Dbg( p_input, "destroying useless sout" ); + + sout_DeleteInstance( p_input->p->p_sout ); + p_input->p->p_sout = NULL; + } + free( psz ); } - free( psz ); /* Create es out */ - p_input->p_es_out = input_EsOutNew( p_input ); - es_out_Control( p_input->p_es_out, ES_OUT_SET_ACTIVE, VLC_FALSE ); - es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE ); + p_input->p->p_es_out = input_EsOutNew( p_input ); + 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 ); + + var_Create( p_input, "bit-rate", VLC_VAR_INTEGER ); + var_Create( p_input, "sample-rate", VLC_VAR_INTEGER ); - if( InputSourceInit( p_input, &p_input->input, - p_input->input.p_item->psz_uri, NULL ) ) + if( InputSourceInit( p_input, &p_input->p->input, + p_input->p->input.p_item->psz_uri, NULL ) ) { goto error; } /* Create global title (from master) */ - p_input->i_title = p_input->input.i_title; - p_input->title = p_input->input.title; - p_input->i_title_offset = p_input->input.i_title_offset; - p_input->i_seekpoint_offset = p_input->input.i_seekpoint_offset; - if( p_input->i_title > 0 ) + if( !p_input->b_preparsing ) { - /* Setup variables */ - input_ControlVarNavigation( p_input ); - input_ControlVarTitle( p_input, 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 ) + { + /* 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; - /* Global flag */ - p_input->b_can_pace_control = p_input->input.b_can_pace_control; - p_input->b_can_pause = p_input->input.b_can_pause; + /* Fix pts delay */ + if( p_input->i_pts_delay < 0 ) + p_input->i_pts_delay = 0; - /* Fix pts delay */ - if( p_input->i_pts_delay <= 0 ) - p_input->i_pts_delay = DEFAULT_PTS_DELAY; + /* 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); - /* 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; + } /* Load master infos */ /* Init length */ - if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_LENGTH, + if( !demux2_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 ); } /* Start title/chapter */ - val.i_int = p_input->input.i_title_start - - p_input->input.i_title_offset; - if( val.i_int > 0 && val.i_int < p_input->input.i_title ) - input_ControlPush( p_input, INPUT_CONTROL_SET_TITLE, &val ); - val.i_int = p_input->input.i_seekpoint_start - - p_input->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->i_start = (int64_t)var_GetInteger( p_input, "start-time" ) * - I64C(1000000); - p_input->i_stop = (int64_t)var_GetInteger( p_input, "stop-time" ) * - I64C(1000000); - - if( p_input->i_start > 0 ) + if( !p_input->b_preparsing ) { - if( p_input->i_start >= val.i_time ) + 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 = 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 ) { - msg_Warn( p_input, "invalid start-time ignored" ); + msg_Warn( p_input, "invalid run-time ignored" ); + p_input->p->i_run = 0; } - else + + if( p_input->p->i_start > 0 ) { - vlc_value_t s; + if( p_input->p->i_start >= val.i_time ) + { + msg_Warn( p_input, "invalid start-time ignored" ); + } + else + { + vlc_value_t s; - msg_Dbg( p_input, "start-time: %ds", - (int)( p_input->i_start / I64C(1000000) ) ); + msg_Dbg( p_input, "starting at time: %ds", + (int)( p_input->p->i_start / I64C(1000000) ) ); - s.i_time = p_input->i_start; - input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s ); + s.i_time = p_input->p->i_start; + input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s ); + } } - } - if( p_input->i_stop > 0 && p_input->i_stop <= p_input->i_start ) - { - msg_Warn( p_input, "invalid stop-time ignored" ); - p_input->i_stop = 0; - } - - - /* Load subtitles */ - /* Get fps and set it if not already set */ - if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) && - f_fps > 1.0 ) - { - vlc_value_t fps; - - if( var_Get( p_input, "sub-fps", &fps ) ) + if( p_input->p->i_stop > 0 && p_input->p->i_stop <= p_input->p->i_start ) { - var_Create( p_input, "sub-fps", VLC_VAR_FLOAT| VLC_VAR_DOINHERIT ); - var_SetFloat( p_input, "sub-fps", f_fps ); + msg_Warn( p_input, "invalid stop-time ignored" ); + p_input->p->i_stop = 0; } - } - /* Look for and add subtitle files */ - psz_subtitle = var_GetString( p_input, "sub-file" ); - if( *psz_subtitle ) - { - input_source_t *sub; - vlc_value_t count; - vlc_value_t list; + /* 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; - msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle ); + var_Create( p_input, "sub-original-fps", VLC_VAR_FLOAT ); + var_SetFloat( p_input, "sub-original-fps", f_fps ); - var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL ); + 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 ); + } + } - /* */ - sub = InputSourceNew( p_input ); - if( !InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) ) + i_delay = var_CreateGetInteger( p_input, "sub-delay" ); + if( i_delay != 0 ) { - TAB_APPEND( p_input->i_slave, p_input->slave, sub ); + var_SetTime( p_input, "spu-delay", (mtime_t)i_delay * 100000 ); + } - /* Select the ES */ - if( !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) ) + /* Look for and add subtitle files */ + psz_subtitle = var_GetString( p_input, "sub-file" ); + if( *psz_subtitle ) + { + msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle ); + input_AddSubtitles( p_input, psz_subtitle, VLC_FALSE ); + } + + var_Get( p_input, "sub-autodetect-file", &val ); + if( val.b_bool ) + { + char *psz_autopath = var_GetString( 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; + + /* Try to autoselect the first autodetected subtitles file + * if no subtitles file was specified */ + if( *psz_subtitle == 0 && subs && subs[0] ) { - if( count.i_int == 0 ) - count.i_int++; /* if it was first one, there is disable too */ + input_AddSubtitles( p_input, subs[0], VLC_FALSE ); + free( subs[0] ); + i = 1; + } - if( count.i_int < list.p_list->i_count ) + /* Then, just add the following subtitles files */ + for( ; subs && subs[i]; i++ ) + { + if( strcmp( psz_subtitle, subs[i] ) ) { - input_ControlPush( p_input, INPUT_CONTROL_SET_ES, - &list.p_list->p_values[count.i_int] ); + 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 ); } - var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, NULL ); + free( subs[i] ); } + if( subs ) free( subs ); + if( psz_autopath ) free( psz_autopath ); } - } - - var_Get( p_input, "sub-autodetect-file", &val ); - if( val.b_bool ) - { - char *psz_autopath = var_GetString( p_input, "sub-autodetect-path" ); - char **subs = subtitles_Detect( p_input, psz_autopath, - p_input->input.p_item->psz_uri ); - input_source_t *sub; + free( psz_subtitle ); - for( i = 0; subs[i] != NULL; i++ ) + /* Look for slave */ + psz = var_GetString( p_input, "input-slave" ); + if( *psz ) { - if( strcmp( psz_subtitle, subs[i] ) ) + char *psz_delim; + input_source_t *slave; + while( psz && *psz ) { - sub = InputSourceNew( p_input ); - if( !InputSourceInit( p_input, sub, subs[i], "subtitle" ) ) + while( *psz == ' ' || *psz == '#' ) + { + psz++; + } + if( ( psz_delim = strchr( psz, '#' ) ) ) { - TAB_APPEND( p_input->i_slave, p_input->slave, sub ); + *psz_delim++ = '\0'; + } + if( *psz == 0 ) + { + break; } + + 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( subs[i] ); } - free( subs ); - free( psz_autopath ); + if( psz ) free( psz ); } - free( psz_subtitle ); - - /* Look for slave */ - psz = var_GetString( p_input, "input-slave" ); - if( *psz ) + else { - char *psz_delim = strchr( psz, '#' ); + p_input->p->i_start = 0; + p_input->p->i_start = 0; + } - for( ;; ) + /* Set up es_out */ + if( !p_input->b_preparsing ) + { + 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 ) { - input_source_t *slave; - - if( psz_delim ) + var_Get( p_input, "sout-all", &val ); + if ( val.b_bool ) { - *psz_delim++ = '\0'; + i_es_out_mode = ES_OUT_MODE_ALL; + val.p_list = NULL; } - - if( *psz == '\0' ) + else { - if( psz_delim ) - continue; + 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 - break; - } - - msg_Dbg( p_input, "adding slave '%s'", psz ); - slave = InputSourceNew( p_input ); - if( !InputSourceInit( p_input, slave, psz, NULL ) ) - { - TAB_APPEND( p_input->i_slave, p_input->slave, slave ); + var_Change( p_input, "programs", VLC_VAR_FREELIST, &val, + NULL ); } - if( !psz_delim ) - break; } - } - free( psz ); + es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, i_es_out_mode ); - /* Set up es_out */ - es_out_Control( p_input->p_es_out, ES_OUT_SET_ACTIVE, VLC_TRUE ); - val.b_bool = VLC_FALSE; - if( p_input->p_sout ) - { - var_Get( p_input, "sout-all", &val ); - } - es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE, - val.b_bool ? ES_OUT_MODE_ALL : ES_OUT_MODE_AUTO ); - - if( p_input->p_sout ) - { - if( p_input->p_sout->i_out_pace_nocontrol > 0 ) + /* 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 ) { - p_input->b_out_pace_control = VLC_FALSE; + demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1, + val.p_list ); } else { - p_input->b_out_pace_control = VLC_TRUE; + demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, + (int) var_GetInteger( p_input, "program" ), NULL ); + } + + 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; + } + + 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" ); } - msg_Dbg( p_input, "starting in %s mode", - p_input->b_out_pace_control ? "asynch" : "synch" ); } + p_meta = vlc_meta_New(); /* Get meta data from users */ - p_meta_user = InputMetaUser( p_input ); + InputMetaUser( p_input, p_meta ); /* Get meta data from master input */ - if( demux2_Control( p_input->input.p_demux, DEMUX_GET_META, &p_meta ) ) - p_meta = NULL; - - /* Merge them */ - if( p_meta == NULL ) - { - p_meta = p_meta_user; - } - else if( p_meta_user ) - { - vlc_meta_Merge( p_meta, p_meta_user ); - vlc_meta_Delete( p_meta_user ); - } + demux2_Control( p_input->p->input.p_demux, DEMUX_GET_META, p_meta ); - /* Get meta data from slave input */ - for( i = 0; i < p_input->i_slave; i++ ) + /* Access_file does not give any meta, and there are no slave */ + if( !p_input->b_preparsing ) { - vlc_meta_t *p_meta_slave; + if( p_input->p->input.p_access ) + access2_Control( p_input->p->input.p_access, ACCESS_GET_META, + p_meta ); - if( !demux2_Control( p_input->slave[i]->p_demux, DEMUX_GET_META, &p_meta_slave ) ) + /* Get meta data from slave input */ + for( i = 0; i < p_input->p->i_slave; i++ ) { - if( p_meta == NULL ) - { - p_meta = p_meta_slave; - } - else if( p_meta_slave ) + demux2_Control( p_input->p->slave[i]->p_demux, + DEMUX_GET_META, p_meta ); + if( p_input->p->slave[i]->p_access ) { - vlc_meta_Merge( p_meta, p_meta_slave ); - vlc_meta_Delete( p_meta_slave ); + access2_Control( p_input->p->slave[i]->p_access, + ACCESS_GET_META, p_meta ); } } } - if( p_meta && p_meta->i_meta > 0 ) - { - msg_Dbg( p_input, "meta information:" ); - for( i = 0; i < p_meta->i_meta; i++ ) - { - msg_Dbg( p_input, " - '%s' = '%s'", - _(p_meta->name[i]), p_meta->value[i] ); + InputUpdateMeta( p_input, p_meta ); - if( !strcmp(p_meta->name[i], VLC_META_TITLE) && p_meta->value[i] ) - input_Control( p_input, INPUT_SET_NAME, p_meta->value[i] ); + if( !p_input->b_preparsing ) + { + msg_Dbg( p_input, "`%s' successfully opened", + p_input->p->input.p_item->psz_uri ); - if( !strcmp( p_meta->name[i], VLC_META_AUTHOR ) ) - input_Control( p_input, INPUT_ADD_INFO, _("General"), - _("Author"), p_meta->value[i] ); + } - input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"), - _(p_meta->name[i]), "%s", p_meta->value[i] ); - } + /* initialization is complete */ + input_ChangeState( p_input, PLAYING_S ); - for( i = 0; i < p_meta->i_track; i++ ) - { - vlc_meta_t *tk = p_meta->track[i]; - int j; + return VLC_SUCCESS; - if( tk->i_meta > 0 ) - { - char *psz_cat = malloc( strlen(_("Stream")) + 10 ); +error: + input_ChangeState( p_input, ERROR_S ); - msg_Dbg( p_input, " - track[%d]:", i ); + if( p_input->p->p_es_out ) + input_EsOutDelete( p_input->p->p_es_out ); - sprintf( psz_cat, "%s %d", _("Stream"), i ); - for( j = 0; j < tk->i_meta; j++ ) - { - msg_Dbg( p_input, " - '%s' = '%s'", _(tk->name[j]), - tk->value[j] ); + if( p_input->p->p_sout ) + { + vlc_object_detach( p_input->p->p_sout ); + sout_DeleteInstance( p_input->p->p_sout ); + } - input_Control( p_input, INPUT_ADD_INFO, psz_cat, - _(tk->name[j]), "%s", tk->value[j] ); - } - } - } - if( p_input->p_sout && p_input->p_sout->p_meta == NULL ) - { - p_input->p_sout->p_meta = p_meta; - } - else + if( !p_input->b_preparsing && p_input->p_libvlc->b_stats ) + { +#define EXIT_COUNTER( c ) do { if( p_input->p->counters.p_##c ) \ + stats_CounterClean( p_input->p->counters.p_##c );\ + p_input->p->counters.p_##c = NULL; } while(0) + EXIT_COUNTER( read_bytes ); + EXIT_COUNTER( read_packets ); + EXIT_COUNTER( demux_read ); + EXIT_COUNTER( input_bitrate ); + EXIT_COUNTER( demux_bitrate ); + EXIT_COUNTER( played_abuffers ); + EXIT_COUNTER( lost_abuffers ); + EXIT_COUNTER( displayed_pictures ); + EXIT_COUNTER( lost_pictures ); + EXIT_COUNTER( decoded_audio ); + EXIT_COUNTER( decoded_video ); + EXIT_COUNTER( decoded_sub ); + + if( p_input->p->p_sout ) { - vlc_meta_Delete( p_meta ); + EXIT_COUNTER( sout_sent_packets ); + EXIT_COUNTER (sout_sent_bytes ); + EXIT_COUNTER( sout_send_bitrate ); } +#undef EXIT_COUNTER } - msg_Dbg( p_input, "`%s' sucessfully opened", - p_input->input.p_item->psz_uri ); - - /* initialization is complete */ - p_input->i_state = PLAYING_S; - - val.i_int = PLAYING_S; - var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); - - return VLC_SUCCESS; - -error: - if( p_input->p_es_out ) - input_EsOutDelete( p_input->p_es_out ); - - if( p_input->p_sout ) - sout_DeleteInstance( p_input->p_sout ); - /* Mark them deleted */ - p_input->input.p_demux = NULL; - p_input->input.p_stream = NULL; - p_input->input.p_access = NULL; - p_input->p_es_out = NULL; - p_input->p_sout = NULL; + p_input->p->input.p_demux = NULL; + p_input->p->input.p_stream = NULL; + p_input->p->input.p_access = NULL; + p_input->p->p_es_out = NULL; + p_input->p->p_sout = NULL; return VLC_EGENERIC; } @@ -869,13 +1224,14 @@ error: /***************************************************************************** * Error: RunThread() error loop ***************************************************************************** - * This function is called when an error occured during thread main's loop. + * This function is called when an error occurred during thread main's loop. *****************************************************************************/ static void Error( input_thread_t *p_input ) { while( !p_input->b_die ) { /* Sleep a while */ + input_ChangeState( p_input, ERROR_S ); msleep( INPUT_IDLE_SLEEP ); } } @@ -885,61 +1241,147 @@ static void Error( input_thread_t *p_input ) *****************************************************************************/ static void End( input_thread_t * p_input ) { - vlc_value_t val; int i; - msg_Dbg( p_input, "closing `%s'", - p_input->input.p_item->psz_uri ); - /* We are at the end */ - p_input->i_state = END_S; + input_ChangeState( p_input, END_S ); + + /* Clean control variables */ + input_ControlVarClean( p_input ); + + /* Clean up master */ + InputSourceClean( &p_input->p->input ); + + /* Delete slave */ + for( i = 0; i < p_input->p->i_slave; i++ ) + { + InputSourceClean( p_input->p->slave[i] ); + free( p_input->p->slave[i] ); + } + if( p_input->p->slave ) free( p_input->p->slave ); + + /* Unload all modules */ + if( p_input->p->p_es_out ) + input_EsOutDelete( p_input->p->p_es_out ); + + 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 ) + { + /* 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_playlist->p_stats_computer == p_input ) + { + stats_ComputeGlobalStats( p_input->p_libvlc->p_playlist, + p_input->p_libvlc->p_playlist->p_stats ); + p_input->p_libvlc->p_playlist->p_stats_computer = NULL; + } + CL_CO( read_bytes ); + CL_CO( read_packets ); + CL_CO( demux_read ); + CL_CO( input_bitrate ); + CL_CO( demux_bitrate ); + CL_CO( played_abuffers ); + CL_CO( lost_abuffers ); + CL_CO( displayed_pictures ); + CL_CO( lost_pictures ); + CL_CO( decoded_audio) ; + CL_CO( decoded_video ); + CL_CO( decoded_sub) ; + } + + /* Close optional stream output instance */ + if( p_input->p->p_sout ) + { + CL_CO( sout_sent_packets ); + CL_CO( sout_sent_bytes ); + CL_CO( sout_send_bitrate ); + + vlc_object_detach( p_input->p->p_sout ); + } +#undef CL_CO + } + + if( p_input->p->i_attachment > 0 ) + { + for( i = 0; i < p_input->p->i_attachment; i++ ) + vlc_input_attachment_Delete( p_input->p->attachment[i] ); + TAB_CLEAN( p_input->p->i_attachment, p_input->p->attachment ); + } - val.i_int = END_S; - var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); + vlc_mutex_destroy( &p_input->p->counters.counters_lock ); - /* Clean control variables */ - input_ControlVarClean( p_input ); + /* Tell we're dead */ + p_input->b_dead = VLC_TRUE; +} - /* Clean up master */ - InputSourceClean( p_input, &p_input->input ); +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; - /* Delete slave */ - for( i = 0; i < p_input->i_slave; 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++ ) { - InputSourceClean( p_input, p_input->slave[i] ); - free( p_input->slave[i] ); - } - if( p_input->slave ) free( p_input->slave ); + const char *psz_option = p_item->ppsz_options[i]; + if( !psz_option ) + continue; + if( *psz_option == ':' ) + psz_option++; - /* Unload all modules */ - if( p_input->p_es_out ) - input_EsOutDelete( p_input->p_es_out ); + 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 ); - /* Close optional stream output instance */ - if( p_input->p_sout ) + /* Find a potential sout to reuse + * XXX it might be unusable but this will be checked later */ + if( b_keep_sout ) { - vlc_object_t *p_pl = - vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); - vlc_value_t keep; + /* Remove the sout from the playlist garbage collector */ + playlist_t *p_playlist = pl_Yield( p_parent ); - if( var_Get( p_input, "sout-keep", &keep ) >= 0 && keep.b_bool && p_pl ) + vlc_mutex_lock( &p_playlist->gc_lock ); + p_sout = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, FIND_CHILD ); + if( p_sout ) { - /* attach sout to the playlist */ - msg_Warn( p_input, "keeping sout" ); - vlc_object_detach( p_input->p_sout ); - vlc_object_attach( p_input->p_sout, p_pl ); - } - else - { - msg_Warn( p_input, "destroying sout" ); - sout_DeleteInstance( p_input->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 ); + } } - if( p_pl ) - vlc_object_release( p_pl ); + vlc_mutex_unlock( &p_playlist->gc_lock ); + + pl_Release( p_parent ); } - /* Tell we're dead */ - p_input->b_dead = VLC_TRUE; + if( pb_sout_keep ) + *pb_sout_keep = b_keep_sout; + + return p_sout; +} +static void SoutKeep( sout_instance_t *p_sout ) +{ + /* attach sout to the playlist */ + playlist_t *p_playlist = pl_Yield( p_sout ); + + msg_Dbg( p_sout, "sout has been kept" ); + vlc_object_attach( p_sout, p_playlist ); + + pl_Release( p_sout ); } /***************************************************************************** @@ -948,23 +1390,23 @@ static void End( input_thread_t * p_input ) static inline int ControlPopNoLock( input_thread_t *p_input, int *pi_type, vlc_value_t *p_val ) { - if( p_input->i_control <= 0 ) + if( p_input->p->i_control <= 0 ) { return VLC_EGENERIC; } - *pi_type = p_input->control[0].i_type; - *p_val = p_input->control[0].val; + *pi_type = p_input->p->control[0].i_type; + *p_val = p_input->p->control[0].val; - p_input->i_control--; - if( p_input->i_control > 0 ) + p_input->p->i_control--; + if( p_input->p->i_control > 0 ) { int i; - for( i = 0; i < p_input->i_control; i++ ) + for( i = 0; i < p_input->p->i_control; i++ ) { - p_input->control[i].i_type = p_input->control[i+1].i_type; - p_input->control[i].val = p_input->control[i+1].val; + p_input->p->control[i].i_type = p_input->p->control[i+1].i_type; + p_input->p->control[i].val = p_input->p->control[i+1].val; } } @@ -974,14 +1416,19 @@ static inline int ControlPopNoLock( input_thread_t *p_input, static void ControlReduce( input_thread_t *p_input ) { int i; - for( i = 1; i < p_input->i_control; i++ ) + + if( !p_input ) + return; + + for( i = 1; i < p_input->p->i_control; i++ ) { - const int i_lt = p_input->control[i-1].i_type; - const int i_ct = p_input->control[i].i_type; + const int i_lt = p_input->p->control[i-1].i_type; + const int i_ct = p_input->p->control[i].i_type; /* XXX We can't merge INPUT_CONTROL_SET_ES */ - msg_Dbg( p_input, "[%d/%d] l=%d c=%d", i, p_input->i_control, +/* msg_Dbg( p_input, "[%d/%d] l=%d c=%d", i, p_input->p->i_control, i_lt, i_ct ); +*/ if( i_lt == i_ct && ( i_ct == INPUT_CONTROL_SET_STATE || i_ct == INPUT_CONTROL_SET_RATE || @@ -993,11 +1440,11 @@ static void ControlReduce( input_thread_t *p_input ) i_ct == INPUT_CONTROL_SET_BOOKMARK ) ) { int j; - msg_Dbg( p_input, "merged at %d", i ); +// msg_Dbg( p_input, "merged at %d", i ); /* Remove the i-1 */ - for( j = i; j < p_input->i_control; j++ ) - p_input->control[j-1] = p_input->control[j]; - p_input->i_control--; + for( j = i; j < p_input->p->i_control; j++ ) + p_input->p->control[j-1] = p_input->p->control[j]; + p_input->p->i_control--; } else { @@ -1016,18 +1463,20 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, { vlc_bool_t b_force_update = VLC_FALSE; + if( !p_input ) return b_force_update; + switch( i_type ) { case INPUT_CONTROL_SET_DIE: - msg_Dbg( p_input, "control: INPUT_CONTROL_SET_DIE proceed" ); + msg_Dbg( p_input, "control: stopping input" ); /* Mark all submodules to die */ - if( p_input->input.p_access ) - p_input->input.p_access->b_die = VLC_TRUE; - if( p_input->input.p_stream ) - p_input->input.p_stream->b_die = VLC_TRUE; - p_input->input.p_demux->b_die = VLC_TRUE; + 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 ); - p_input->b_die = VLC_TRUE; + vlc_object_kill( p_input ); break; case INPUT_CONTROL_SET_POSITION: @@ -1041,13 +1490,16 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, else { /* Should not fail */ - demux2_Control( p_input->input.p_demux, + demux2_Control( p_input->p->input.p_demux, DEMUX_GET_POSITION, &f_pos ); f_pos += val.f_float; } if( f_pos < 0.0 ) f_pos = 0.0; if( f_pos > 1.0 ) f_pos = 1.0; - if( demux2_Control( p_input->input.p_demux, DEMUX_SET_POSITION, + /* Reset the decoders states and clock sync (before calling the demuxer */ + es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR ); + input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE ); + if( demux2_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION, f_pos ) ) { msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) " @@ -1055,11 +1507,9 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, } else { - if( p_input->i_slave > 0 ) + if( p_input->p->i_slave > 0 ) SlaveSeek( p_input ); - input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); - es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); b_force_update = VLC_TRUE; } break; @@ -1078,40 +1528,42 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, else { /* Should not fail */ - demux2_Control( p_input->input.p_demux, + demux2_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ); i_time += val.i_time; } if( i_time < 0 ) i_time = 0; - i_ret = demux2_Control( p_input->input.p_demux, + + /* Reset the decoders states and clock sync (before calling the demuxer */ + es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR ); + input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE ); + + i_ret = demux2_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->input.p_demux, + /* Emulate it with a SET_POS */ + demux2_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->input.p_demux, + i_ret = demux2_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION, f_pos ); } } if( i_ret ) { - msg_Err( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) "I64Fd - " failed", i_time ); + msg_Warn( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) "I64Fd + " failed or not possible", i_time ); } else { - if( p_input->i_slave > 0 ) + if( p_input->p->i_slave > 0 ) SlaveSeek( p_input ); - input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); - - es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); b_force_update = VLC_TRUE; } break; @@ -1122,18 +1574,20 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, ( val.i_int == PAUSE_S && p_input->i_state == PAUSE_S ) ) { int i_ret; - if( p_input->input.p_access ) - i_ret = access2_Control( p_input->input.p_access, + if( p_input->p->input.p_access ) + i_ret = access2_Control( p_input->p->input.p_access, ACCESS_SET_PAUSE_STATE, VLC_FALSE ); else - i_ret = demux2_Control( p_input->input.p_demux, + i_ret = demux2_Control( p_input->p->input.p_demux, DEMUX_SET_PAUSE_STATE, VLC_FALSE ); if( i_ret ) { /* FIXME What to do ? */ msg_Warn( p_input, "cannot unset pause -> EOF" ); + vlc_mutex_unlock( &p_input->p->lock_control ); input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL ); + vlc_mutex_lock( &p_input->p->lock_control ); } b_force_update = VLC_TRUE; @@ -1144,17 +1598,17 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); /* Reset clock */ - es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); + es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR ); } else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S && - p_input->b_can_pause ) + p_input->p->b_can_pause ) { int i_ret; - if( p_input->input.p_access ) - i_ret = access2_Control( p_input->input.p_access, + if( p_input->p->input.p_access ) + i_ret = access2_Control( p_input->p->input.p_access, ACCESS_SET_PAUSE_STATE, VLC_TRUE ); else - i_ret = demux2_Control( p_input->input.p_demux, + i_ret = demux2_Control( p_input->p->input.p_demux, DEMUX_SET_PAUSE_STATE, VLC_TRUE ); b_force_update = VLC_TRUE; @@ -1172,8 +1626,12 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, /* Switch to new state */ p_input->i_state = val.i_int; var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); + + /* Send discontinuity to decoders (it will allow them to flush + * if implemented */ + input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE, VLC_FALSE ); } - else if( val.i_int == PAUSE_S && !p_input->b_can_pause ) + else if( val.i_int == PAUSE_S && !p_input->p->b_can_pause ) { b_force_update = VLC_TRUE; @@ -1194,9 +1652,9 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, int i_rate; if( i_type == INPUT_CONTROL_SET_RATE_SLOWER ) - i_rate = p_input->i_rate * 2; + i_rate = p_input->p->i_rate * 2; else if( i_type == INPUT_CONTROL_SET_RATE_FASTER ) - i_rate = p_input->i_rate / 2; + i_rate = p_input->p->i_rate / 2; else i_rate = val.i_int; @@ -1212,23 +1670,22 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, } if( i_rate != INPUT_RATE_DEFAULT && ( !p_input->b_can_pace_control || - ( p_input->p_sout && !p_input->b_out_pace_control ) ) ) + ( p_input->p->p_sout && !p_input->p->b_out_pace_control ) ) ) { msg_Dbg( p_input, "cannot change rate" ); i_rate = INPUT_RATE_DEFAULT; } - if( i_rate != p_input->i_rate ) + if( i_rate != p_input->p->i_rate ) { - p_input->i_rate = i_rate; val.i_int = i_rate; var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL ); - /* We haven't send data to decoder when rate != default */ - if( i_rate == INPUT_RATE_DEFAULT ) - input_EsOutDiscontinuity( p_input->p_es_out, VLC_TRUE ); + input_EsOutDiscontinuity( p_input->p->p_es_out, + VLC_FALSE, VLC_FALSE ); - /* Reset clock */ - es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); + p_input->p->i_rate = i_rate; + + input_EsOutSetRate( p_input->p->p_es_out ); b_force_update = VLC_TRUE; } @@ -1237,25 +1694,28 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, case INPUT_CONTROL_SET_PROGRAM: /* No need to force update, es_out does it if needed */ - es_out_Control( p_input->p_es_out, + 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, + NULL ); break; case INPUT_CONTROL_SET_ES: /* No need to force update, es_out does it if needed */ - es_out_Control( p_input->p_es_out, ES_OUT_SET_ES, - input_EsOutGetFromID( p_input->p_es_out, + es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ES, + input_EsOutGetFromID( p_input->p->p_es_out, val.i_int ) ); break; case INPUT_CONTROL_SET_AUDIO_DELAY: - input_EsOutSetDelay( p_input->p_es_out, + input_EsOutSetDelay( p_input->p->p_es_out, AUDIO_ES, val.i_time ); var_Change( p_input, "audio-delay", VLC_VAR_SETVALUE, &val, NULL ); break; case INPUT_CONTROL_SET_SPU_DELAY: - input_EsOutSetDelay( p_input->p_es_out, + input_EsOutSetDelay( p_input->p->p_es_out, SPU_ES, val.i_time ); var_Change( p_input, "spu-delay", VLC_VAR_SETVALUE, &val, NULL ); break; @@ -1263,12 +1723,12 @@ 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->input.b_title_demux && - p_input->input.i_title > 0 ) + if( p_input->p->input.b_title_demux && + p_input->p->input.i_title > 0 ) { /* TODO */ /* FIXME handle demux title */ - demux_t *p_demux = p_input->input.p_demux; + demux_t *p_demux = p_input->p->input.p_demux; int i_title; if( i_type == INPUT_CONTROL_SET_TITLE_PREV ) @@ -1278,19 +1738,18 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, else i_title = val.i_int; - if( i_title >= 0 && i_title < p_input->input.i_title ) + if( i_title >= 0 && i_title < p_input->p->input.i_title ) { - demux2_Control( p_demux, DEMUX_SET_TITLE, i_title ); - - input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); - es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); + es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR ); + input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE ); + demux2_Control( p_demux, DEMUX_SET_TITLE, i_title ); input_ControlVarTitle( p_input, i_title ); } } - else if( p_input->input.i_title > 0 ) + else if( p_input->p->input.i_title > 0 ) { - access_t *p_access = p_input->input.p_access; + access_t *p_access = p_input->p->input.p_access; int i_title; if( i_type == INPUT_CONTROL_SET_TITLE_PREV ) @@ -1300,65 +1759,147 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, else i_title = val.i_int; - if( i_title >= 0 && i_title < p_input->input.i_title ) + if( i_title >= 0 && i_title < p_input->p->input.i_title ) { - access2_Control( p_access, ACCESS_SET_TITLE, i_title ); - stream_AccessReset( p_input->input.p_stream ); + es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR ); + input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE ); - input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); - es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); + access2_Control( p_access, ACCESS_SET_TITLE, i_title ); + stream_AccessReset( p_input->p->input.p_stream ); } } break; case INPUT_CONTROL_SET_SEEKPOINT: case INPUT_CONTROL_SET_SEEKPOINT_NEXT: case INPUT_CONTROL_SET_SEEKPOINT_PREV: - if( p_input->input.b_title_demux && - p_input->input.i_title > 0 ) + if( p_input->p->input.b_title_demux && + p_input->p->input.i_title > 0 ) { - demux_t *p_demux = p_input->input.p_demux; + demux_t *p_demux = p_input->p->input.p_demux; int i_seekpoint; + int64_t i_input_time; + int64_t i_seekpoint_time; if( i_type == INPUT_CONTROL_SET_SEEKPOINT_PREV ) - i_seekpoint = p_demux->info.i_seekpoint - 1; + { + 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_GET_TIME, &i_input_time ) ) + { + if ( i_input_time < i_seekpoint_time + 3000000 ) + i_seekpoint--; + } + else + i_seekpoint--; + } else if( i_type == INPUT_CONTROL_SET_SEEKPOINT_NEXT ) i_seekpoint = p_demux->info.i_seekpoint + 1; else i_seekpoint = val.i_int; if( i_seekpoint >= 0 && i_seekpoint < - p_input->input.title[p_demux->info.i_title]->i_seekpoint ) + p_input->p->input.title[p_demux->info.i_title]->i_seekpoint ) { - demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint ); + es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR ); + input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE ); - input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); - es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); + demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint ); } } - else if( p_input->input.i_title > 0 ) + else if( p_input->p->input.i_title > 0 ) { - access_t *p_access = p_input->input.p_access; + demux_t *p_demux = p_input->p->input.p_demux; + access_t *p_access = p_input->p->input.p_access; int i_seekpoint; + int64_t i_input_time; + int64_t i_seekpoint_time; if( i_type == INPUT_CONTROL_SET_SEEKPOINT_PREV ) - i_seekpoint = p_access->info.i_seekpoint - 1; - else if( i_type == INPUT_CONTROL_SET_TITLE_NEXT ) + { + 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_GET_TIME, &i_input_time ) ) + { + if ( i_input_time < i_seekpoint_time + 3000000 ) + i_seekpoint--; + } + else + i_seekpoint--; + } + else if( i_type == INPUT_CONTROL_SET_SEEKPOINT_NEXT ) i_seekpoint = p_access->info.i_seekpoint + 1; else i_seekpoint = val.i_int; if( i_seekpoint >= 0 && i_seekpoint < - p_input->input.title[p_access->info.i_title]->i_seekpoint ) + p_input->p->input.title[p_access->info.i_title]->i_seekpoint ) { - access2_Control( p_access, ACCESS_SET_SEEKPOINT, i_seekpoint ); - stream_AccessReset( p_input->input.p_stream ); + es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR ); + input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE ); - input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); - es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); + access2_Control( p_access, ACCESS_SET_SEEKPOINT, + i_seekpoint ); + stream_AccessReset( p_input->p->input.p_stream ); } } break; + case INPUT_CONTROL_ADD_SLAVE: + if( val.psz_string ) + { + input_source_t *slave = InputSourceNew( p_input ); + + if( !InputSourceInit( p_input, slave, val.psz_string, NULL ) ) + { + vlc_meta_t *p_meta; + int64_t i_time; + + /* Add the slave */ + msg_Dbg( p_input, "adding %s as slave on the fly", + val.psz_string ); + + /* Set position */ + if( demux2_Control( p_input->p->input.p_demux, + DEMUX_GET_TIME, &i_time ) ) + { + msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" ); + InputSourceClean( slave ); + free( slave ); + break; + } + if( demux2_Control( slave->p_demux, + DEMUX_SET_TIME, i_time ) ) + { + msg_Err( p_input, "seek failed for new slave" ); + InputSourceClean( slave ); + free( slave ); + break; + } + + /* Get meta (access and demux) */ + p_meta = vlc_meta_New(); + access2_Control( slave->p_access, ACCESS_GET_META, + p_meta ); + demux2_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 ); + } + else + { + free( slave ); + msg_Warn( p_input, "failed to add %s as slave", + val.psz_string ); + } + + free( val.psz_string ); + } + break; + case INPUT_CONTROL_SET_BOOKMARK: default: msg_Err( p_input, "not yet implemented" ); @@ -1373,7 +1914,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, *****************************************************************************/ static int UpdateFromDemux( input_thread_t *p_input ) { - demux_t *p_demux = p_input->input.p_demux; + demux_t *p_demux = p_input->p->input.p_demux; vlc_value_t v; if( p_demux->info.i_update & INPUT_UPDATE_TITLE ) @@ -1395,14 +1936,14 @@ static int UpdateFromDemux( input_thread_t *p_input ) p_demux->info.i_update &= ~INPUT_UPDATE_SIZE; /* Hmmm only works with master input */ - if( p_input->input.p_demux == p_demux ) + if( p_input->p->input.p_demux == p_demux ) { - int i_title_end = p_input->input.i_title_end - - p_input->input.i_title_offset; - int i_seekpoint_end = p_input->input.i_seekpoint_end - - p_input->input.i_seekpoint_offset; + int i_title_end = p_input->p->input.i_title_end - + p_input->p->input.i_title_offset; + int i_seekpoint_end = p_input->p->input.i_seekpoint_end - + p_input->p->input.i_seekpoint_offset; - if( i_title_end >= 0 && i_seekpoint_end >=0 ) + if( i_title_end >= 0 && i_seekpoint_end >= 0 ) { if( p_demux->info.i_title > i_title_end || ( p_demux->info.i_title == i_title_end && @@ -1426,7 +1967,7 @@ static int UpdateFromDemux( input_thread_t *p_input ) *****************************************************************************/ static int UpdateFromAccess( input_thread_t *p_input ) { - access_t *p_access = p_input->input.p_access; + access_t *p_access = p_input->p->input.p_access; vlc_value_t v; if( p_access->info.i_update & INPUT_UPDATE_TITLE ) @@ -1436,7 +1977,7 @@ static int UpdateFromAccess( input_thread_t *p_input ) input_ControlVarTitle( p_input, p_access->info.i_title ); - stream_AccessUpdate( p_input->input.p_stream ); + stream_AccessUpdate( p_input->p->input.p_stream ); p_access->info.i_update &= ~INPUT_UPDATE_TITLE; } @@ -1444,18 +1985,27 @@ static int UpdateFromAccess( input_thread_t *p_input ) { v.i_int = p_access->info.i_seekpoint; var_Change( p_input, "chapter", VLC_VAR_SETVALUE, &v, NULL); - p_access->info.i_update &= ~INPUT_UPDATE_SEEKPOINT; } + if( p_access->info.i_update & INPUT_UPDATE_META ) + { + /* 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 ); + InputUpdateMeta( p_input, p_meta ); + var_SetBool( p_input, "item-change", p_input->p->input.p_item->i_id ); + p_access->info.i_update &= ~INPUT_UPDATE_META; + } + p_access->info.i_update &= ~INPUT_UPDATE_SIZE; /* Hmmm only works with master input */ - if( p_input->input.p_access == p_access ) + if( p_input->p->input.p_access == p_access ) { - int i_title_end = p_input->input.i_title_end - - p_input->input.i_title_offset; - int i_seekpoint_end = p_input->input.i_seekpoint_end - - p_input->input.i_seekpoint_offset; + int i_title_end = p_input->p->input.i_title_end - + p_input->p->input.i_title_offset; + int i_seekpoint_end = p_input->p->input.i_seekpoint_end - + p_input->p->input.i_seekpoint_offset; if( i_title_end >= 0 && i_seekpoint_end >=0 ) { @@ -1481,14 +2031,17 @@ static int UpdateFromAccess( input_thread_t *p_input ) *****************************************************************************/ static void UpdateItemLength( input_thread_t *p_input, int64_t i_length ) { - char psz_buffer[MSTRTIME_MAX_SIZE]; + vlc_mutex_lock( &p_input->p->input.p_item->lock ); + p_input->p->input.p_item->i_duration = i_length; + vlc_mutex_unlock( &p_input->p->input.p_item->lock ); - vlc_mutex_lock( &p_input->input.p_item->lock ); - p_input->input.p_item->i_duration = i_length; - vlc_mutex_unlock( &p_input->input.p_item->lock ); - - input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Duration"), - msecstotimestr( psz_buffer, i_length / 1000 ) ); + 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 ) + } } /***************************************************************************** @@ -1496,15 +2049,20 @@ 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 = malloc( sizeof( input_source_t ) ); + 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; - in->i_title = 0; - in->title = NULL; + TAB_INIT( in->i_title, in->title ); in->b_can_pace_control = VLC_TRUE; in->b_eof = VLC_FALSE; in->i_cr_average = 0; @@ -1516,33 +2074,79 @@ static input_source_t *InputSourceNew( input_thread_t *p_input ) * InputSourceInit: *****************************************************************************/ static int InputSourceInit( input_thread_t *p_input, - input_source_t *in, char *psz_mrl, - char *psz_forced_demux ) + input_source_t *in, const char *psz_mrl, + const char *psz_forced_demux ) { - char *psz_dup = strdup( psz_mrl ); - char *psz_access; - char *psz_demux; + char psz_dup[strlen (psz_mrl) + 1]; + const char *psz_access; + const char *psz_demux; char *psz_path; + char *psz_tmp; + char *psz; vlc_value_t val; + strcpy( psz_dup, psz_mrl ); + + if( !in ) return VLC_EGENERIC; + if( !p_input ) return VLC_EGENERIC; + /* Split uri */ - MRLSplit( p_input, psz_dup, &psz_access, &psz_demux, &psz_path ); + if( !p_input->b_preparsing ) + { + MRLSplit( VLC_OBJECT(p_input), psz_dup, + &psz_access, &psz_demux, &psz_path ); + + msg_Dbg( p_input, "`%s' gives access `%s' demux `%s' path `%s'", + psz_mrl, psz_access, psz_demux, psz_path ); - msg_Dbg( p_input, "`%s' gives access `%s' demux `%s' path `%s'", - psz_mrl, psz_access, psz_demux, psz_path ); + /* Hack to allow udp://@:port syntax */ + if( !psz_access || + (strncmp( psz_access, "udp", 3 ) && + strncmp( psz_access, "rtp", 3 )) ) + + /* Find optional titles and seekpoints */ + MRLSections( p_input, psz_path, &in->i_title_start, &in->i_title_end, + &in->i_seekpoint_start, &in->i_seekpoint_end ); + + if( psz_forced_demux && *psz_forced_demux ) + { + psz_demux = psz_forced_demux; + } + else if( !psz_demux || *psz_demux == '\0' ) + { + /* special hack for forcing a demuxer with --demux=module + * (and do nothing with a list) */ + char *psz_var_demux = var_GetString( p_input, "demux" ); - /* Find optional titles and seekpoints */ - MRLSections( p_input, psz_path, &in->i_title_start, &in->i_title_end, - &in->i_seekpoint_start, &in->i_seekpoint_end ); + if( *psz_var_demux != '\0' && + !strchr(psz_var_demux, ',' ) && + !strchr(psz_var_demux, ':' ) ) + { + psz_demux = psz_var_demux; - if( psz_forced_demux && *psz_forced_demux ) - psz_demux = psz_forced_demux; + msg_Dbg( p_input, "enforced demux ` %s'", psz_demux ); + } + else if( psz_var_demux ) + { + free( psz_var_demux ); + } + } - /* Try access_demux if no demux given */ - if( *psz_demux == '\0' ) + /* 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 ); + } + } + else { - in->p_demux = demux2_New( p_input, psz_access, psz_demux, psz_path, - NULL, p_input->p_es_out ); + psz_path = psz_dup; + if( !strncmp( psz_path, "file://", 7 ) ) + psz_path += 7; + msg_Dbg( p_input, "trying to pre-parse %s", psz_path ); + psz_demux = ""; + psz_access = "file"; } if( in->p_demux ) @@ -1576,68 +2180,96 @@ static int InputSourceInit( input_thread_t *p_input, { int64_t i_pts_delay; + 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 = access2_New( p_input, psz_access, psz_demux, psz_path, + p_input->b_preparsing ); /* Access failed, URL encoded ? */ if( in->p_access == NULL && strchr( psz_path, '%' ) ) { - DecodeUrl( psz_path ); + decode_URI( psz_path ); - msg_Dbg( p_input, "retying with access `%s' demux `%s' path `%s'", + 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, - psz_access, psz_demux, psz_path ); + psz_access, psz_demux, psz_path, + p_input->b_preparsing ); } -#ifndef WIN32 /* Remove this gross hack from the win32 build as colons - * are forbidden in filenames on Win32. */ - - /* Maybe we got something like: /Volumes/toto:titi/gabu.mpg */ - if( in->p_access == NULL && - *psz_access == '\0' && ( *psz_demux || *psz_path ) ) + /* access failed, maybe our access detection was wrong. + * Retry with the full name */ + if( in->p_access == NULL && strchr( psz_mrl, ':' ) ) { - free( psz_dup ); - psz_dup = strdup( psz_mrl ); - psz_access = ""; - psz_demux = ""; - psz_path = psz_dup; - - in->p_access = access2_New( p_input, - psz_access, psz_demux, psz_path ); + msg_Dbg( p_input, "retrying with access `' demux `' path `%s'", + psz_mrl ); + in->p_access = access2_New( p_input, + "", "", psz_mrl, + p_input->b_preparsing ); } -#endif - if( in->p_access == NULL ) { - msg_Err( p_input, "no suitable access module for `%s'", psz_mrl ); + msg_Err( p_input, "open of `%s' failed: %s", psz_mrl, + msg_StackMsg() ); + intf_UserFatal( VLC_OBJECT( p_input), VLC_FALSE, + _("Your input can't be opened"), + _("VLC is unable to open the MRL '%s'." + " Check the log for details."), psz_mrl ); goto error; } - /* Get infos from access */ - access2_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 ); + /* */ + psz_tmp = psz = var_GetString( p_input, "access-filter" ); + while( psz && *psz ) + { + access_t *p_access = in->p_access; + char *end = strchr( psz, ':' ); + + if( end ) + *end++ = '\0'; + + in->p_access = access2_FilterNew( in->p_access, psz ); + if( in->p_access == NULL ) + { + in->p_access = p_access; + msg_Warn( p_input, "failed to insert access filter %s", + psz ); + } - in->b_title_demux = VLC_FALSE; - if( access2_Control( in->p_access, ACCESS_GET_TITLE_INFO, - &in->title, &in->i_title, - &in->i_title_offset, &in->i_seekpoint_offset ) ) + psz = end; + } + if( psz_tmp ) free( psz_tmp ); + /* Get infos from access */ + if( !p_input->b_preparsing ) { - in->i_title = 0; - in->title = NULL; + access2_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->title, &in->i_title, + &in->i_title_offset, &in->i_seekpoint_offset ) ) + + { + in->i_title = 0; + in->title = NULL; + } + access2_Control( in->p_access, ACCESS_CAN_CONTROL_PACE, + &in->b_can_pace_control ); + access2_Control( in->p_access, ACCESS_CAN_PAUSE, + &in->b_can_pause ); + access2_Control( in->p_access, ACCESS_CAN_SEEK, + &val.b_bool ); + var_Set( p_input, "seekable", val ); } - access2_Control( in->p_access, ACCESS_CAN_CONTROL_PACE, - &in->b_can_pace_control ); - access2_Control( in->p_access, ACCESS_CAN_PAUSE, - &in->b_can_pause ); - access2_Control( in->p_access, ACCESS_CAN_SEEK, - &val.b_bool ); - var_Set( p_input, "seekable", val ); + + input_ChangeState( p_input, BUFFERING_S ); /* Create the stream_t */ - in->p_stream = stream_AccessNew( in->p_access ); + in->p_stream = stream_AccessNew( in->p_access, p_input->b_preparsing ); if( in->p_stream == NULL ) { msg_Warn( p_input, "cannot create a stream_t from access" ); @@ -1649,44 +2281,92 @@ static int InputSourceInit( input_thread_t *p_input, { psz_demux = in->p_access->psz_demux; } - in->p_demux = demux2_New( p_input, psz_access, psz_demux, psz_path, - in->p_stream, p_input->p_es_out ); + + { + /* Take access redirections into account */ + char *psz_real_path; + char *psz_buf = NULL; + if( in->p_access->psz_path ) + { + const char *psz_a, *psz_d; + psz_buf = strdup( in->p_access->psz_path ); + MRLSplit( VLC_OBJECT(p_input), psz_buf, + &psz_a, &psz_d, &psz_real_path ); + } + else + { + psz_real_path = psz_path; + } + in->p_demux = demux2_New( p_input, psz_access, psz_demux, + psz_real_path, + in->p_stream, p_input->p->p_es_out, + p_input->b_preparsing ); + free( psz_buf ); + } + if( in->p_demux == NULL ) { msg_Err( p_input, "no suitable demux module for `%s/%s://%s'", psz_access, psz_demux, psz_path ); + intf_UserFatal( VLC_OBJECT( p_input ), VLC_FALSE, + _("Can't recognize the input's format"), + _("The format of '%s' can't be detected. " + "Have a look the log for details."), psz_mrl ); goto error; } - /* TODO get title from demux */ - if( in->i_title <= 0 ) + /* Get title from demux */ + if( !p_input->b_preparsing && in->i_title <= 0 ) { if( demux2_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 ); } else { in->b_title_demux = VLC_TRUE; } } + /* 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, + &attachment, &i_attachment ) ) + { + int i; + vlc_mutex_lock( &p_input->p->input.p_item->lock ); + p_input->p->attachment = realloc( p_input->p->attachment, + sizeof(input_attachment_t**) * ( p_input->p->i_attachment + i_attachment ) ); + for( i = 0; i < i_attachment; i++ ) + p_input->p->attachment[p_input->p->i_attachment++] = attachment[i]; + if( attachment ) + free( attachment ); + vlc_mutex_unlock( &p_input->p->input.p_item->lock ); + } + } } - free( psz_dup ); + + if( var_GetInteger( p_input, "clock-synchro" ) != -1 ) + in->b_can_pace_control = !var_GetInteger( p_input, "clock-synchro" ); + return VLC_SUCCESS; error: + input_ChangeState( p_input, ERROR_S ); + if( in->p_demux ) demux2_Delete( in->p_demux ); if( in->p_stream ) - stream_AccessDelete( in->p_stream ); + stream_Delete( in->p_stream ); if( in->p_access ) access2_Delete( in->p_access ); - free( psz_dup ); return VLC_EGENERIC; } @@ -1694,25 +2374,24 @@ error: /***************************************************************************** * InputSourceClean: *****************************************************************************/ -static void InputSourceClean( input_thread_t *p_input, input_source_t *in ) +static void InputSourceClean( input_source_t *in ) { + int i; + if( in->p_demux ) demux2_Delete( in->p_demux ); if( in->p_stream ) - stream_AccessDelete( in->p_stream ); + stream_Delete( in->p_stream ); if( in->p_access ) access2_Delete( in->p_access ); if( in->i_title > 0 ) { - int i; for( i = 0; i < in->i_title; i++ ) - { vlc_input_title_Delete( in->title[i] ); - } - free( in->title ); + TAB_CLEAN( in->i_title, in->title ); } } @@ -1720,15 +2399,16 @@ static void SlaveDemux( input_thread_t *p_input ) { int64_t i_time; int i; - if( demux2_Control( p_input->input.p_demux, DEMUX_GET_TIME, &i_time ) ) + + if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) ) { msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" ); return; } - for( i = 0; i < p_input->i_slave; i++ ) + for( i = 0; i < p_input->p->i_slave; i++ ) { - input_source_t *in = p_input->slave[i]; + input_source_t *in = p_input->p->slave[i]; int i_ret = 1; if( in->b_eof ) @@ -1772,15 +2452,17 @@ static void SlaveSeek( input_thread_t *p_input ) int64_t i_time; int i; - if( demux2_Control( p_input->input.p_demux, DEMUX_GET_TIME, &i_time ) ) + if( !p_input ) return; + + if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) ) { msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" ); return; } - for( i = 0; i < p_input->i_slave; i++ ) + for( i = 0; i < p_input->p->i_slave; i++ ) { - input_source_t *in = p_input->slave[i]; + input_source_t *in = p_input->p->slave[i]; if( demux2_Control( in->p_demux, DEMUX_SET_TIME, i_time ) ) { @@ -1789,201 +2471,161 @@ static void SlaveSeek( input_thread_t *p_input ) } } } + /***************************************************************************** * InputMetaUser: *****************************************************************************/ -static vlc_meta_t *InputMetaUser( input_thread_t *p_input ) +static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta ) { - vlc_meta_t *p_meta; vlc_value_t val; - if( ( p_meta = vlc_meta_New() ) == NULL ) - return NULL; + if( !p_meta ) return; /* Get meta information from user */ -#define GET_META( c, s ) \ +#define GET_META( field, s ) \ var_Get( p_input, (s), &val ); \ - if( *val.psz_string ) \ - vlc_meta_Add( p_meta, c, val.psz_string ); \ + if( *val.psz_string ) { \ + if( p_meta->psz_ ## field ) free ( p_meta->psz_ ## field ); \ + p_meta->psz_ ## field = strdup( val.psz_string ); \ + } \ free( val.psz_string ) - GET_META( VLC_META_TITLE, "meta-title" ); - GET_META( VLC_META_AUTHOR, "meta-author" ); - GET_META( VLC_META_ARTIST, "meta-artist" ); - GET_META( VLC_META_GENRE, "meta-genre" ); - GET_META( VLC_META_COPYRIGHT, "meta-copyright" ); - GET_META( VLC_META_DESCRIPTION, "meta-description" ); - GET_META( VLC_META_DATE, "meta-date" ); - GET_META( VLC_META_URL, "meta-url" ); + GET_META( title, "meta-title" ); + GET_META( artist, "meta-artist" ); + GET_META( genre, "meta-genre" ); + GET_META( copyright, "meta-copyright" ); + GET_META( description, "meta-description" ); + GET_META( date, "meta-date" ); + GET_META( url, "meta-url" ); #undef GET_META - - return p_meta; } /***************************************************************************** - * DecodeUrl: decode a given encoded url + * InputUpdateMeta: merge p_item meta data with p_meta taking care of + * arturl and locking issue. *****************************************************************************/ -static void DecodeUrl( char *psz ) +static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta ) { - char *dup = strdup( psz ); - char *p = dup; + input_item_t *p_item = p_input->p->input.p_item; + char *psz_title = NULL; + int i; - while( *p ) - { - if( *p == '%' ) - { - char val[3]; - p++; - if( !*p ) - { - break; - } + if( !p_meta ) + return; - val[0] = *p++; - val[1] = *p++; - val[2] = '\0'; + vlc_mutex_lock( &p_item->lock ); + if( p_meta->psz_title && !p_item->b_fixed_name ) + psz_title = strdup( p_meta->psz_title ); - *psz++ = strtol( val, NULL, 16 ); - } - else if( *p == '+' ) - { - *psz++ = ' '; - p++; - } - else - { - *psz++ = *p++; - } - } - *psz++ ='\0'; - free( dup ); -} + if( p_item->p_meta ) + { + char *psz_arturl = p_item->p_meta->psz_arturl; + p_item->p_meta->psz_arturl = NULL; -/***************************************************************************** - * ParseOption: parses the options for the input - ***************************************************************************** - * This function parses the input (config) options and creates their associated - * object variables. - * Options are of the form "[no[-]]foo[=bar]" where foo is the option name and - * bar is the value of the option. - *****************************************************************************/ -static void ParseOption( input_thread_t *p_input, const char *psz_option ) -{ - char *psz_name = (char *)psz_option; - char *psz_value = strchr( psz_option, '=' ); - int i_name_len, i_type; - vlc_bool_t b_isno = VLC_FALSE; - vlc_value_t val; + vlc_meta_Merge( p_item->p_meta, p_meta ); - if( psz_value ) i_name_len = psz_value - psz_option; - else i_name_len = strlen( psz_option ); + if( psz_arturl && *psz_arturl ) + vlc_meta_SetArtURL( p_item->p_meta, psz_arturl ); - /* It's too much of an hassle to remove the ':' when we parse - * the cmd line :) */ - if( i_name_len && *psz_name == ':' ) + vlc_meta_Delete( p_meta ); + } + else + { + p_item->p_meta = p_meta; + } + if( p_item->p_meta->psz_arturl && !strncmp( p_item->p_meta->psz_arturl, "attachment://", strlen("attachment") ) ) { - psz_name++; - i_name_len--; + /* Don't look for art cover if sout + * XXX It can change when sout has meta data support */ + if( p_input->p->p_sout && !p_input->b_preparsing ) + vlc_meta_SetArtURL( p_item->p_meta, "" ); + else + input_ExtractAttachmentAndCacheArt( p_input ); } - if( i_name_len == 0 ) return; + p_item->p_meta->i_status |= ITEM_PREPARSED; - psz_name = strndup( psz_name, i_name_len ); - if( psz_value ) psz_value++; + /* A bit ugly */ + p_meta = NULL; + if( vlc_dictionary_keys_count( &p_item->p_meta->extra_tags ) > 0 ) + { + p_meta = vlc_meta_New(); + vlc_meta_Merge( p_meta, p_item->p_meta ); + } + vlc_mutex_unlock( &p_item->lock ); - i_type = config_GetType( p_input, psz_name ); + if( psz_title ) + { + input_Control( p_input, INPUT_SET_NAME, psz_title ); + free( psz_title ); + } - if( !i_type && !psz_value ) + if( p_meta ) { - /* check for "no-foo" or "nofoo" */ - if( !strncmp( psz_name, "no-", 3 ) ) - { - memmove( psz_name, psz_name + 3, strlen(psz_name) + 1 - 3 ); - } - else if( !strncmp( psz_name, "no", 2 ) ) + char ** ppsz_all_keys = vlc_dictionary_all_keys( &p_meta->extra_tags ); + for( i = 0; ppsz_all_keys[i]; i++ ) { - memmove( psz_name, psz_name + 2, strlen(psz_name) + 1 - 2 ); + 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] ); } - else goto cleanup; /* Option doesn't exist */ - - b_isno = VLC_TRUE; - i_type = config_GetType( p_input, psz_name ); - - if( !i_type ) goto cleanup; /* Option doesn't exist */ + free( ppsz_all_keys ); + vlc_meta_Delete( p_meta ); } - else if( !i_type ) goto cleanup; /* Option doesn't exist */ - - if( ( i_type != VLC_VAR_BOOL ) && - ( !psz_value || !*psz_value ) ) goto cleanup; /* Invalid value */ - /* Create the variable in the input object. - * Children of the input object will be able to retreive this value - * thanks to the inheritance property of the object variables. */ - var_Create( p_input, psz_name, i_type ); - - switch( i_type ) - { - case VLC_VAR_BOOL: - val.b_bool = !b_isno; - break; + /** \todo handle sout meta */ +} - case VLC_VAR_INTEGER: - val.i_int = atoi( psz_value ); - break; - case VLC_VAR_FLOAT: - val.f_float = atof( psz_value ); - break; +static inline vlc_bool_t IsValidAccess( const char *psz ) +{ + char c; - case VLC_VAR_STRING: - case VLC_VAR_MODULE: - case VLC_VAR_FILE: - case VLC_VAR_DIRECTORY: - val.psz_string = psz_value; - break; + while( ( c = *psz ) != '\0' ) + { + if( c == ':' ) + return VLC_TRUE; - default: - goto cleanup; - break; + if( ( !isascii( c ) || !isalnum( c ) ) && ( c != '/' ) ) + return VLC_FALSE; + psz++; } - - var_Set( p_input, psz_name, val ); - - msg_Dbg( p_input, "set input option: %s to %s", psz_name, psz_value ); - - cleanup: - if( psz_name ) free( psz_name ); - return; + /* should not happen though */ + return VLC_FALSE; } + /***************************************************************************** * MRLSplit: parse the access, demux and url part of the * Media Resource Locator. *****************************************************************************/ -static void MRLSplit( input_thread_t *p_input, char *psz_dup, - char **ppsz_access, char **ppsz_demux, char **ppsz_path ) +void MRLSplit( vlc_object_t *p_input, char *psz_dup, + const char **ppsz_access, const char **ppsz_demux, + char **ppsz_path ) { - char *psz_access = NULL; - char *psz_demux = NULL; - char *psz_path = NULL; - char *psz, *psz_check; + const char *psz_access = ""; + const char *psz_demux = ""; + char *psz_path; + char *psz; psz = strchr( psz_dup, ':' ); - /* '@' not allowed in access/demux part */ - psz_check = strchr( psz_dup, '@' ); - if( psz_check && psz_check < psz ) psz = 0; - -#if defined( WIN32 ) || defined( UNDER_CE ) - if( psz - psz_dup == 1 ) + if( psz != NULL ) { - msg_Warn( p_input, "drive letter %c: found in source", *psz_dup ); - psz_path = psz_dup; - } - else + /* Guess whether ':' is part of a local filename, or separates + * access/demux from path */ + if( !IsValidAccess( psz_dup ) ) + psz = NULL; +#if defined( WIN32 ) || defined( UNDER_CE ) + else if( ( psz - psz_dup == 1 ) && isalpha( psz_dup[0] ) ) + { + msg_Dbg( p_input, "drive letter %c: found in source", *psz_dup ); + psz = NULL; + } #endif + } - if( psz ) + if( psz != NULL ) { *psz++ = '\0'; if( psz[0] == '/' && psz[1] == '/' ) psz += 2; @@ -2004,14 +2646,9 @@ static void MRLSplit( input_thread_t *p_input, char *psz_dup, psz_path = psz_dup; } - if( !psz_access ) *ppsz_access = ""; - else *ppsz_access = psz_access; - - if( !psz_demux ) *ppsz_demux = ""; - else *ppsz_demux = psz_demux; - - if( !psz_path ) *ppsz_path = ""; - else *ppsz_path = psz_path; + *ppsz_access = psz_access; + *ppsz_demux = psz_demux; + *ppsz_path = psz_path; } /***************************************************************************** @@ -2080,3 +2717,69 @@ static void MRLSections( input_thread_t *p_input, char *psz_source, psz_source, *pi_title_start, *pi_chapter_start, *pi_title_end, *pi_chapter_end ); } + +/***************************************************************************** + * 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 ) +{ + 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 ); + if( psz_path ) + { + psz_extension = strrchr( psz_path, '.'); + if( psz_extension && strcmp( psz_extension, ".sub" ) == 0 ) + { + FILE *f; + + strcpy( psz_extension, ".idx" ); + /* FIXME: a portable wrapper for stat() or access() would be more suited */ + if( ( f = utf8_fopen( psz_path, "rt" ) ) ) + { + fclose( f ); + msg_Dbg( p_input, "using %s subtitles file instead of %s", + psz_path, psz_subtitle ); + strcpy( psz_subtitle, psz_path ); + } + } + free( psz_path ); + } + + var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL ); + + sub = InputSourceNew( p_input ); + if( !InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) ) + { + TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub ); + + /* Select the ES */ + if( !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) ) + { + if( count.i_int == 0 ) + count.i_int++; + /* if it was first one, there is disable too */ + + 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 ); + } + } + else free( sub ); + + return VLC_TRUE; +}