X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=10dcc7693c3d88951135798218e651d2c32fc321;hb=ce654e9f4e21951c6676361b7718646714d00b98;hp=9e121264764007ed3c72e5a340741915753f1746;hpb=3fada58d1eddf3a17434acf0e106bac0a7ac9372;p=vlc diff --git a/src/input/input.c b/src/input/input.c index 9e12126476..10dcc7693c 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -1,7 +1,7 @@ /***************************************************************************** * input.c: input thread ***************************************************************************** - * Copyright (C) 1998-2004 the VideoLAN team + * Copyright (C) 1998-2007 the VideoLAN team * $Id$ * * Authors: Christophe Massiot @@ -25,11 +25,16 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include +#include +#include +#include + #include "input_internal.h" #include @@ -49,14 +54,15 @@ * Local prototypes *****************************************************************************/ static int Run ( input_thread_t *p_input ); -static int RunAndClean ( input_thread_t *p_input ); +static int RunAndDestroy ( input_thread_t *p_input ); -static input_thread_t * Create ( vlc_object_t *, input_item_t *, char *, - vlc_bool_t ); +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 * ); @@ -64,7 +70,6 @@ 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 int UpdateMeta( input_thread_t * ); static void UpdateItemLength( input_thread_t *, int64_t i_length ); @@ -73,12 +78,21 @@ 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 *, const char *, const char *psz_forced_demux ); -static void InputSourceClean( input_thread_t *, input_source_t * ); - +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 void 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 * ); + +static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_demux ); +static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment, + int i_new, input_attachment_t **pp_new ); /***************************************************************************** * This function creates a new input, and returns a pointer @@ -99,13 +113,14 @@ static void InputMetaUser( input_thread_t *p_input ); * - length * - bookmarks * - seekable (if you can seek, it doesn't say if 'bar display' has be shown or not, for that check position != 0.0) + * - can-pause * * For intf callback upon changes * - intf-change * TODO explain when Callback is called * TODO complete this list (?) *****************************************************************************/ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, - char *psz_header, vlc_bool_t b_quick ) + const char *psz_header, vlc_bool_t b_quick, sout_instance_t *p_sout ) { input_thread_t *p_input = NULL; /* thread descriptor */ vlc_value_t val; @@ -141,16 +156,17 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, p_input->p->i_start = 0; p_input->i_time = 0; p_input->p->i_stop = 0; + p_input->p->i_run = 0; p_input->p->i_title = 0; p_input->p->title = NULL; p_input->p->i_title_offset = p_input->p->i_seekpoint_offset = 0; p_input->i_state = INIT_S; p_input->p->i_rate = INPUT_RATE_DEFAULT; - p_input->p->i_bookmark = 0; - p_input->p->bookmark = NULL; - p_input->p->p_meta = NULL; + 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; @@ -164,18 +180,16 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, p_input->p->input.title = NULL; p_input->p->input.i_title_offset = p_input->p->input.i_seekpoint_offset = 0; p_input->p->input.b_can_pace_control = VLC_TRUE; + p_input->p->input.b_can_rate_control = VLC_TRUE; + p_input->p->input.b_rescale_ts = VLC_TRUE; p_input->p->input.b_eof = VLC_FALSE; p_input->p->input.i_cr_average = 0; - if( !p_input->p->input.p_item->p_meta ) - p_input->p->input.p_item->p_meta = vlc_meta_New(); + vlc_mutex_lock( &p_item->lock ); if( !p_item->p_stats ) - { - p_item->p_stats = (input_stats_t*)malloc( sizeof( input_stats_t ) ); - vlc_mutex_init( p_input, &p_item->p_stats->lock ); - stats_ReinitInputStats( p_item->p_stats ); - } + p_item->p_stats = stats_NewInputStats( p_input ); + vlc_mutex_unlock( &p_item->lock ); /* No slave */ p_input->p->i_slave = 0; @@ -188,9 +202,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, /* Parse input options */ vlc_mutex_lock( &p_item->lock ); for( i = 0; i < p_item->i_options; i++ ) - { var_OptionParse( p_input, p_item->ppsz_options[i] ); - } vlc_mutex_unlock( &p_item->lock ); /* Create Object Variables for private use only */ @@ -198,6 +210,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, /* Create Objects variables for public Get and Set */ input_ControlVarInit( p_input ); + p_input->p->input.i_cr_average = var_GetInteger( p_input, "cr-average" ); if( !p_input->b_preparsing ) @@ -224,7 +237,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, *psz_end = 0; if( !strncmp( psz_start, "name=", 5 ) ) { - p_seekpoint->psz_name = psz_start + 5; + p_seekpoint->psz_name = strdup(psz_start + 5); } else if( !strncmp( psz_start, "bytes=", 6 ) ) { @@ -249,12 +262,47 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, } /* Remove 'Now playing' info as it is probably outdated */ - input_Control( p_input, INPUT_DEL_INFO, _(VLC_META_INFO_CAT), - VLC_META_NOW_PLAYING ); /* ? Don't translate as it might has been copied ? */ + input_Control( p_input, INPUT_DEL_INFO, + _(VLC_META_INFO_CAT), + _(VLC_META_NOW_PLAYING) ); + input_item_SetNowPlaying( p_item, NULL ); + + /* */ + 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 ); + input_thread_private_t *priv = p_input->p; + + if( pp_sout ) + *pp_sout = NULL; + if( priv->p_sout ) + { + if( pp_sout ) + *pp_sout = priv->p_sout; + else if( priv->b_sout_keep ) + SoutKeep( priv->p_sout ); + else + sout_DeleteInstance( priv->p_sout ); + } + + vlc_object_destroy( p_input ); + vlc_mutex_destroy( &priv->lock_control ); + free( priv ); +} + /** * Initialize an input thread and run it. You will need to monitor the * thread to clean up after it is done @@ -266,31 +314,35 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, input_thread_t *__input_CreateThread( vlc_object_t *p_parent, input_item_t *p_item ) { - return __input_CreateThread2( p_parent, p_item, NULL ); + 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; } -/* Gruik ! */ -input_thread_t *__input_CreateThread2( vlc_object_t *p_parent, - input_item_t *p_item, - char *psz_header ) +/* */ +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 = NULL; /* thread descriptor */ + input_thread_t *p_input; - p_input = Create( p_parent, p_item, psz_header, VLC_FALSE ); + p_input = Create( p_parent, p_item, psz_log, VLC_FALSE, p_sout ); if( !p_input ) return NULL; - /* Now we can attach our new input */ - vlc_object_attach( p_input, p_parent ); - /* Create thread and wait for its readiness. */ if( vlc_thread_create( p_input, "input", Run, - VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) ) + VLC_THREAD_PRIORITY_INPUT, 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; } @@ -309,29 +361,31 @@ input_thread_t *__input_CreateThread2( vlc_object_t *p_parent, int __input_Read( vlc_object_t *p_parent, input_item_t *p_item, vlc_bool_t b_block ) { - input_thread_t *p_input = NULL; /* thread descriptor */ + 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 ); - if( !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; - - /* Now we can attach our new input */ - vlc_object_attach( p_input, p_parent ); + } + p_input->p->b_sout_keep = b_sout_keep; if( b_block ) { - RunAndClean( p_input ); + RunAndDestroy( p_input ); return VLC_SUCCESS; } else { - if( vlc_thread_create( p_input, "input", RunAndClean, + 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" ); - vlc_object_detach( p_input ); - vlc_object_destroy( p_input ); + Destroy( p_input, NULL ); return VLC_EGENERIC; } } @@ -348,29 +402,17 @@ int __input_Read( vlc_object_t *p_parent, input_item_t *p_item, */ int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item ) { - input_thread_t *p_input = NULL; /* thread descriptor */ + input_thread_t *p_input; /* Allocate descriptor */ - p_input = Create( p_parent, p_item, NULL, VLC_TRUE ); + p_input = Create( p_parent, p_item, NULL, VLC_TRUE, NULL ); if( !p_input ) return VLC_EGENERIC; - p_input->i_flags |= OBJECT_FLAGS_QUIET; - p_input->i_flags |= OBJECT_FLAGS_NOINTERACT; - - /* Now we can attach our new input */ - vlc_object_attach( p_input, p_parent ); - - Init( p_input ); - - /* Clean up master */ - InputSourceClean( p_input, &p_input->p->input ); - - /* Unload all modules */ - if( p_input->p->p_es_out ) input_EsOutDelete( p_input->p->p_es_out ); + if( !Init( p_input ) ) + End( p_input ); - vlc_object_detach( p_input ); - vlc_object_destroy( p_input ); + Destroy( p_input, NULL ); return VLC_SUCCESS; } @@ -386,7 +428,8 @@ void input_StopThread( input_thread_t *p_input ) 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 come from another thread), * so use the vlc_object_find way, it's perfectly safe */ @@ -395,7 +438,7 @@ void input_StopThread( input_thread_t *p_input ) 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 ); @@ -403,7 +446,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 ); @@ -411,7 +454,7 @@ 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 ); @@ -425,15 +468,17 @@ void input_StopThread( input_thread_t *p_input ) * \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->p->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 ); } /***************************************************************************** @@ -493,20 +538,17 @@ static int Run( input_thread_t *p_input ) } /***************************************************************************** - * RunAndClean: main thread loop + * 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 RunAndClean( input_thread_t *p_input ) +static int RunAndDestroy( input_thread_t *p_input ) { /* Signal that the thread is launched */ vlc_thread_ready( p_input ); if( Init( p_input ) ) - { - /* If we failed, just exit */ - return 0; - } + goto exit; MainLoop( p_input ); @@ -530,10 +572,9 @@ static int RunAndClean( input_thread_t *p_input ) /* Clean up */ End( p_input ); +exit: /* Release memory */ - vlc_object_detach( p_input ); - vlc_object_destroy( p_input ); - + Destroy( p_input, NULL ); return 0; } @@ -542,8 +583,10 @@ static int RunAndClean( input_thread_t *p_input ) *****************************************************************************/ 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; @@ -554,10 +597,11 @@ static void MainLoop( input_thread_t *p_input ) /* Do the read */ if( p_input->i_state != PAUSE_S ) { - if( p_input->p->i_stop <= 0 || p_input->i_time < p_input->p->i_stop ) - i_ret=p_input->p->input.p_demux->pf_demux(p_input->p->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 ) { @@ -627,6 +671,9 @@ static void MainLoop( input_thread_t *p_input ) input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION, &val ); } + + /* */ + i_start_mdate = mdate(); } } else if( i_ret < 0 ) @@ -726,6 +773,20 @@ static int Init( input_thread_t * p_input ) memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) ); vlc_mutex_init( p_input, &p_input->p->counters.counters_lock ); + for( i = 0; i < p_input->p->input.p_item->i_options; i++ ) + { + if( !strncmp( p_input->p->input.p_item->ppsz_options[i], "meta-file", 9 ) ) + { + msg_Dbg( p_input, "Input is a meta file: disabling unneeded options" ); + var_SetString( p_input, "sout", "" ); + var_SetBool( p_input, "sout-all", VLC_FALSE ); + var_SetString( p_input, "input-slave", "" ); + var_SetInteger( p_input, "input-repeat", 0 ); + var_SetString( p_input, "sub-file", "" ); + var_SetBool( p_input, "sub-autodetect-file", VLC_FALSE ); + } + } + if( !p_input->b_preparsing ) { /* Prepare statistics */ @@ -754,19 +815,44 @@ static int Init( input_thread_t * p_input ) p_input->p->counters.p_input_bitrate->update_interval = 1000000; } - /* handle sout */ - psz = var_GetString( p_input, "sout" ); - if( *psz && strncasecmp( p_input->p->input.p_item->psz_uri, "vlc:", 4 ) ) + /* Find a usable sout and attach it to p_input */ + psz = var_GetNonEmptyString( p_input, "sout" ); + if( psz && strncasecmp( p_input->p->input.p_item->psz_uri, "vlc:", 4 ) ) { - p_input->p->p_sout = sout_NewInstance( p_input, psz ); - if( p_input->p->p_sout == NULL ) + /* Check the validity of the provided sout */ + 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( 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 ); @@ -777,11 +863,18 @@ static int Init( input_thread_t * p_input ) 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 ); } /* Create es out */ - p_input->p->p_es_out = input_EsOutNew( p_input ); + p_input->p->p_es_out = input_EsOutNew( p_input, p_input->p->i_rate ); es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, VLC_FALSE ); es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE ); @@ -811,6 +904,7 @@ static int Init( input_thread_t * p_input ) /* Global flag */ p_input->b_can_pace_control = p_input->p->input.b_can_pace_control; p_input->p->b_can_pause = p_input->p->input.b_can_pause; + p_input->p->b_can_rate_control = p_input->p->input.b_can_rate_control; /* Fix pts delay */ if( p_input->i_pts_delay < 0 ) @@ -834,7 +928,15 @@ static int Init( input_thread_t * p_input ) { var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL ); UpdateItemLength( p_input, val.i_time ); - p_input->p->input.p_item->i_duration = val.i_time; + } + else + { + val.i_time = input_item_GetDuration( p_input->p->input.p_item ); + if( val.i_time > 0 ) + { /* fallback: gets length from metadata */ + var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL ); + UpdateItemLength( p_input, val.i_time ); + } } /* Start title/chapter */ @@ -851,10 +953,14 @@ static int Init( input_thread_t * p_input ) /* Start time*/ /* Set start time */ - p_input->p->i_start = (int64_t)var_GetInteger( p_input, "start-time" ) * - I64C(1000000); - p_input->p->i_stop = (int64_t)var_GetInteger( p_input, "stop-time" ) * - I64C(1000000); + 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 run-time ignored" ); + p_input->p->i_run = 0; + } if( p_input->p->i_start > 0 ) { @@ -905,8 +1011,8 @@ static int Init( input_thread_t * p_input ) } /* Look for and add subtitle files */ - psz_subtitle = var_GetString( p_input, "sub-file" ); - if( *psz_subtitle ) + psz_subtitle = var_GetNonEmptyString( p_input, "sub-file" ); + if( psz_subtitle != NULL ) { msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle ); input_AddSubtitles( p_input, psz_subtitle, VLC_FALSE ); @@ -915,15 +1021,17 @@ static int Init( input_thread_t * p_input ) var_Get( p_input, "sub-autodetect-file", &val ); if( val.b_bool ) { - char *psz_autopath = var_GetString( p_input, "sub-autodetect-path" ); + char *psz_autopath = var_GetNonEmptyString( p_input, "sub-autodetect-path" ); char **subs = subtitles_Detect( p_input, psz_autopath, p_input->p->input.p_item->psz_uri ); input_source_t *sub; i = 0; + if( psz_autopath == NULL ) + psz_autopath = strdup(""); /* Try to autoselect the first autodetected subtitles file * if no subtitles file was specified */ - if( *psz_subtitle == 0 && subs && subs[0] ) + if( ( psz_subtitle == NULL ) && subs && subs[0] ) { input_AddSubtitles( p_input, subs[0], VLC_FALSE ); free( subs[0] ); @@ -933,7 +1041,7 @@ static int Init( input_thread_t * p_input ) /* Then, just add the following subtitles files */ for( ; subs && subs[i]; i++ ) { - if( strcmp( psz_subtitle, subs[i] ) ) + if( !psz_subtitle || strcmp( psz_subtitle, subs[i] ) ) { sub = InputSourceNew( p_input ); if( !InputSourceInit( p_input, sub, subs[i], "subtitle" ) ) @@ -950,8 +1058,8 @@ static int Init( input_thread_t * p_input ) free( psz_subtitle ); /* Look for slave */ - psz = var_GetString( p_input, "input-slave" ); - if( *psz ) + psz = var_GetNonEmptyString( p_input, "input-slave" ); + if( psz != NULL ) { char *psz_delim; input_source_t *slave; @@ -979,8 +1087,8 @@ static int Init( input_thread_t * p_input ) else free( slave ); psz = psz_delim; } + free( psz ); } - if( psz ) free( psz ); } else { @@ -1056,11 +1164,12 @@ static int Init( input_thread_t * p_input ) } } - p_meta = p_input->p->input.p_item->p_meta; + p_meta = vlc_meta_New(); /* Get meta data from users */ - InputMetaUser( p_input ); + InputMetaUser( p_input, p_meta ); + /* Get meta data from master input */ - demux2_Control( p_input->p->input.p_demux, DEMUX_GET_META, p_meta ); + DemuxMeta( p_input, p_meta, p_input->p->input.p_demux ); /* Access_file does not give any meta, and there are no slave */ if( !p_input->b_preparsing ) @@ -1072,8 +1181,7 @@ static int Init( input_thread_t * p_input ) /* Get meta data from slave input */ for( i = 0; i < p_input->p->i_slave; i++ ) { - demux2_Control( p_input->p->slave[i]->p_demux, - DEMUX_GET_META, p_meta ); + DemuxMeta( p_input, p_meta, p_input->p->slave[i]->p_demux ); if( p_input->p->slave[i]->p_access ) { access2_Control( p_input->p->slave[i]->p_access, @@ -1082,7 +1190,7 @@ static int Init( input_thread_t * p_input ) } } - UpdateMeta( p_input ); + InputUpdateMeta( p_input, p_meta ); if( !p_input->b_preparsing ) { @@ -1103,7 +1211,38 @@ error: input_EsOutDelete( p_input->p->p_es_out ); if( p_input->p->p_sout ) + { + vlc_object_detach( p_input->p->p_sout ); sout_DeleteInstance( p_input->p->p_sout ); + } + + + 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 ) + { + EXIT_COUNTER( sout_sent_packets ); + EXIT_COUNTER (sout_sent_bytes ); + EXIT_COUNTER( sout_send_bitrate ); + } +#undef EXIT_COUNTER + } /* Mark them deleted */ p_input->p->input.p_demux = NULL; @@ -1122,10 +1261,10 @@ error: *****************************************************************************/ static void Error( input_thread_t *p_input ) { + input_ChangeState( p_input, ERROR_S ); while( !p_input->b_die ) { /* Sleep a while */ - input_ChangeState( p_input, ERROR_S ); msleep( INPUT_IDLE_SLEEP ); } } @@ -1137,8 +1276,6 @@ static void End( input_thread_t * p_input ) { int i; - msg_Dbg( p_input, "closing input" ); - /* We are at the end */ input_ChangeState( p_input, END_S ); @@ -1146,12 +1283,12 @@ static void End( input_thread_t * p_input ) input_ControlVarClean( p_input ); /* Clean up master */ - InputSourceClean( p_input, &p_input->p->input ); + InputSourceClean( &p_input->p->input ); /* Delete slave */ for( i = 0; i < p_input->p->i_slave; i++ ) { - InputSourceClean( p_input, p_input->p->slave[i] ); + InputSourceClean( p_input->p->slave[i] ); free( p_input->p->slave[i] ); } if( p_input->p->slave ) free( p_input->p->slave ); @@ -1160,55 +1297,51 @@ static void End( input_thread_t * p_input ) if( p_input->p->p_es_out ) input_EsOutDelete( p_input->p->p_es_out ); -#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) ; - vlc_mutex_destroy( &p_input->p->counters.counters_lock ); - } - - /* Close optional stream output instance */ - if( p_input->p->p_sout ) + if( !p_input->b_preparsing ) { - vlc_value_t keep; - - CL_CO( sout_sent_packets ); - CL_CO( sout_sent_bytes ); - CL_CO( sout_send_bitrate ); - - if( var_Get( p_input, "sout-keep", &keep ) >= 0 && keep.b_bool ) +#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 ) { - /* attach sout to the playlist */ - msg_Dbg( p_input, "keeping sout" ); - vlc_object_detach( p_input->p->p_sout ); - vlc_object_attach( p_input->p->p_sout, p_input->p_libvlc->p_playlist ); + /* 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) ; } - else + + /* Close optional stream output instance */ + if( p_input->p->p_sout ) { - msg_Dbg( p_input, "destroying sout" ); - sout_DeleteInstance( 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 ); + } vlc_mutex_destroy( &p_input->p->counters.counters_lock ); @@ -1216,6 +1349,74 @@ static void End( input_thread_t * p_input ) p_input->b_dead = VLC_TRUE; } +static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, vlc_bool_t *pb_sout_keep ) +{ + vlc_bool_t b_keep_sout = var_CreateGetBool( p_parent, "sout-keep" ); + sout_instance_t *p_sout = NULL; + int i; + + /* Search sout-keep options + * XXX it has to be done here, but it is duplicated work :( */ + vlc_mutex_lock( &p_item->lock ); + for( i = 0; i < p_item->i_options; i++ ) + { + const char *psz_option = p_item->ppsz_options[i]; + if( !psz_option ) + continue; + if( *psz_option == ':' ) + psz_option++; + + if( !strcmp( psz_option, "sout-keep" ) ) + b_keep_sout = VLC_TRUE; + else if( !strcmp( psz_option, "no-sout-keep" ) || !strcmp( psz_option, "nosout-keep" ) ) + b_keep_sout = VLC_FALSE; + } + vlc_mutex_unlock( &p_item->lock ); + + /* Find a potential sout to reuse + * XXX it might be unusable but this will be checked later */ + if( b_keep_sout ) + { + /* Remove the sout from the playlist garbage collector */ + playlist_t *p_playlist = pl_Yield( p_parent ); + + vlc_mutex_lock( &p_playlist->gc_lock ); + p_sout = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, FIND_CHILD ); + if( p_sout ) + { + if( p_sout->p_parent != VLC_OBJECT(p_playlist) ) + { + vlc_object_release( p_sout ); + p_sout = NULL; + } + else + { + vlc_object_detach( p_sout ); /* Remove it from the GC */ + + vlc_object_release( p_sout ); + } + } + vlc_mutex_unlock( &p_playlist->gc_lock ); + + pl_Release( p_parent ); + } + + 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 ); +} + /***************************************************************************** * Control *****************************************************************************/ @@ -1303,12 +1504,12 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, msg_Dbg( p_input, "control: stopping input" ); /* Mark all submodules to die */ if( p_input->p->input.p_access ) - p_input->p->input.p_access->b_die = VLC_TRUE; + vlc_object_kill( p_input->p->input.p_access ); if( p_input->p->input.p_stream ) - p_input->p->input.p_stream->b_die = VLC_TRUE; - p_input->p->input.p_demux->b_die = VLC_TRUE; + 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: @@ -1329,8 +1530,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( f_pos < 0.0 ) f_pos = 0.0; if( f_pos > 1.0 ) f_pos = 1.0; /* 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_FALSE ); + input_EsOutChangePosition( p_input->p->p_es_out ); if( demux2_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION, f_pos ) ) { @@ -1367,8 +1567,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( i_time < 0 ) i_time = 0; /* 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_FALSE ); + input_EsOutChangePosition( p_input->p->p_es_out ); i_ret = demux2_Control( p_input->p->input.p_demux, DEMUX_SET_TIME, i_time ); @@ -1429,9 +1628,9 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, val.i_int = PLAYING_S; var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); - /* Reset clock */ - es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR ); - input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE ); + /* */ + if( !i_ret ) + input_EsOutChangeState( p_input->p->p_es_out ); } else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S && p_input->p->b_can_pause ) @@ -1459,6 +1658,10 @@ 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 ); + + /* */ + if( !i_ret ) + input_EsOutChangeState( p_input->p->p_es_out ); } else if( val.i_int == PAUSE_S && !p_input->p->b_can_pause ) { @@ -1480,12 +1683,52 @@ 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->p->i_rate * 2; - else if( i_type == INPUT_CONTROL_SET_RATE_FASTER ) - i_rate = p_input->p->i_rate / 2; - else + if( i_type == INPUT_CONTROL_SET_RATE ) + { i_rate = val.i_int; + } + else + { + static const int ppi_factor[][2] = { + {1,64}, {1,32}, {1,16}, {1,8}, {1,4}, {1,3}, {1,2}, {2,3}, + {1,1}, + {3,2}, {2,1}, {3,1}, {4,1}, {8,1}, {16,1}, {32,1}, {64,1}, + {0,0} + }; + int i_error; + int i_idx; + int i; + + i_error = INT_MAX; + i_idx = -1; + for( i = 0; ppi_factor[i][0] != 0; i++ ) + { + const int i_test_r = INPUT_RATE_DEFAULT * ppi_factor[i][0] / ppi_factor[i][1]; + const int i_test_e = abs(p_input->p->i_rate - i_test_r); + if( i_test_e < i_error ) + { + i_idx = i; + i_error = i_test_e; + } + } + assert( i_idx >= 0 && ppi_factor[i_idx][0] != 0 ); + + if( i_type == INPUT_CONTROL_SET_RATE_SLOWER ) + { + if( ppi_factor[i_idx+1][0] > 0 ) + i_rate = INPUT_RATE_DEFAULT * ppi_factor[i_idx+1][0] / ppi_factor[i_idx+1][1]; + else + i_rate = INPUT_RATE_MAX+1; + } + else + { + assert( i_type == INPUT_CONTROL_SET_RATE_FASTER ); + if( i_idx > 0 ) + i_rate = INPUT_RATE_DEFAULT * ppi_factor[i_idx-1][0] / ppi_factor[i_idx-1][1]; + else + i_rate = INPUT_RATE_MIN-1; + } + } if( i_rate < INPUT_RATE_MIN ) { @@ -1498,24 +1741,39 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, i_rate = INPUT_RATE_MAX; } if( i_rate != INPUT_RATE_DEFAULT && - ( !p_input->b_can_pace_control || + ( ( !p_input->b_can_pace_control && !p_input->p->b_can_rate_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->p->i_rate && + !p_input->b_can_pace_control && p_input->p->b_can_rate_control ) + { + int i_ret; + if( p_input->p->input.p_access ) + i_ret = VLC_EGENERIC; + else + i_ret = demux2_Control( p_input->p->input.p_demux, + DEMUX_SET_RATE, &i_rate ); + if( i_ret ) + { + msg_Warn( p_input, "ACCESS/DEMUX_SET_RATE failed" ); + i_rate = p_input->p->i_rate; + } + } + + /* */ if( i_rate != p_input->p->i_rate ) { - p_input->p->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->p_es_out, VLC_TRUE ); + p_input->p->i_rate = i_rate; - /* Reset clock */ - es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR ); + /* FIXME do we need a RESET_PCR when !p_input->p->input.b_rescale_ts ? */ + if( p_input->p->input.b_rescale_ts ) + input_EsOutChangeRate( p_input->p->p_es_out, i_rate ); b_force_update = VLC_TRUE; } @@ -1570,8 +1828,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( i_title >= 0 && i_title < p_input->p->input.i_title ) { - input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE ); - es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR ); + input_EsOutChangePosition( p_input->p->p_es_out ); demux2_Control( p_demux, DEMUX_SET_TITLE, i_title ); input_ControlVarTitle( p_input, i_title ); @@ -1591,8 +1848,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( i_title >= 0 && i_title < p_input->p->input.i_title ) { - input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE ); - es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR ); + input_EsOutChangePosition( p_input->p->p_es_out ); access2_Control( p_access, ACCESS_SET_TITLE, i_title ); stream_AccessReset( p_input->p->input.p_stream ); @@ -1632,8 +1888,8 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( i_seekpoint >= 0 && i_seekpoint < p_input->p->input.title[p_demux->info.i_title]->i_seekpoint ) { - input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE ); - es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR ); + + input_EsOutChangePosition( p_input->p->p_es_out ); demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint ); } @@ -1660,7 +1916,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, else i_seekpoint--; } - else if( i_type == INPUT_CONTROL_SET_SEEKPOINT_NEXT ) + else if( i_type == INPUT_CONTROL_SET_SEEKPOINT_NEXT ) i_seekpoint = p_access->info.i_seekpoint + 1; else i_seekpoint = val.i_int; @@ -1668,8 +1924,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( i_seekpoint >= 0 && i_seekpoint < p_input->p->input.title[p_access->info.i_title]->i_seekpoint ) { - input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE ); - es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR ); + input_EsOutChangePosition( p_input->p->p_es_out ); access2_Control( p_access, ACCESS_SET_SEEKPOINT, i_seekpoint ); @@ -1685,7 +1940,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, if( !InputSourceInit( p_input, slave, val.psz_string, NULL ) ) { - vlc_meta_t *p_meta = p_input->p->input.p_item->p_meta; + vlc_meta_t *p_meta; int64_t i_time; /* Add the slave */ @@ -1697,7 +1952,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, DEMUX_GET_TIME, &i_time ) ) { msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" ); - InputSourceClean( p_input, slave ); + InputSourceClean( slave ); free( slave ); break; } @@ -1705,16 +1960,17 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, DEMUX_SET_TIME, i_time ) ) { msg_Err( p_input, "seek failed for new slave" ); - InputSourceClean( p_input, 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 ); - UpdateMeta( p_input ); + InputUpdateMeta( p_input, p_meta ); TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave ); } @@ -1819,10 +2075,10 @@ static int UpdateFromAccess( input_thread_t *p_input ) if( p_access->info.i_update & INPUT_UPDATE_META ) { /* TODO maybe multi - access ? */ - vlc_meta_t *p_meta = p_input->p->input.p_item->p_meta; + vlc_meta_t *p_meta = vlc_meta_New(); access2_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta ); - UpdateMeta( p_input ); - var_SetBool( p_input, "item-change", p_input->p->input.p_item->i_id ); + InputUpdateMeta( p_input, p_meta ); + var_SetInteger( pl_Get( p_input ), "item-change", p_input->p->input.p_item->i_id ); p_access->info.i_update &= ~INPUT_UPDATE_META; } @@ -1855,38 +2111,19 @@ static int UpdateFromAccess( input_thread_t *p_input ) return 1; } -/***************************************************************************** - * UpdateMeta: - *****************************************************************************/ -static int UpdateMeta( input_thread_t *p_input ) -{ - vlc_meta_t *p_meta = p_input->p->input.p_item->p_meta; - if( !p_meta ) - return VLC_SUCCESS; - - if( p_meta->psz_title && !p_input->p->input.p_item->b_fixed_name ) - input_Control( p_input, INPUT_SET_NAME, p_meta->psz_title ); - - /** \todo handle sout meta */ - - return VLC_SUCCESS; -} - /***************************************************************************** * UpdateItemLength: *****************************************************************************/ static void UpdateItemLength( input_thread_t *p_input, int64_t i_length ) { - 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 ); + input_item_SetDuration( p_input->p->input.p_item, (mtime_t) i_length ); if( !p_input->b_preparsing ) { pl_Yield( p_input ); var_SetInteger( pl_Get( p_input ), "item-change", p_input->p->input.p_item->i_id ); - pl_Release( p_input ) + pl_Release( p_input ); } } @@ -1908,10 +2145,13 @@ static input_source_t *InputSourceNew( input_thread_t *p_input ) 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_pause = VLC_TRUE; in->b_can_pace_control = VLC_TRUE; + in->b_can_rate_control = VLC_TRUE; + in->b_rescale_ts = VLC_TRUE; in->b_eof = VLC_FALSE; + in->f_fps = 0.0; in->i_cr_average = 0; return in; @@ -1931,8 +2171,9 @@ static int InputSourceInit( input_thread_t *p_input, char *psz_tmp; char *psz; vlc_value_t val; + double f_fps; - strcpy (psz_dup, psz_mrl); + strcpy( psz_dup, psz_mrl ); if( !in ) return VLC_EGENERIC; if( !p_input ) return VLC_EGENERIC; @@ -1940,8 +2181,7 @@ static int InputSourceInit( input_thread_t *p_input, /* Split uri */ if( !p_input->b_preparsing ) { - MRLSplit( VLC_OBJECT(p_input), psz_dup, - &psz_access, &psz_demux, &psz_path ); + MRLSplit( 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 ); @@ -1963,9 +2203,9 @@ static int InputSourceInit( input_thread_t *p_input, { /* special hack for forcing a demuxer with --demux=module * (and do nothing with a list) */ - char *psz_var_demux = var_GetString( p_input, "demux" ); + char *psz_var_demux = var_GetNonEmptyString( p_input, "demux" ); - if( *psz_var_demux != '\0' && + if( psz_var_demux != NULL && !strchr(psz_var_demux, ',' ) && !strchr(psz_var_demux, ':' ) ) { @@ -1973,10 +2213,6 @@ static int InputSourceInit( input_thread_t *p_input, 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 */ @@ -1989,6 +2225,8 @@ static int InputSourceInit( input_thread_t *p_input, else { 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"; @@ -2011,15 +2249,34 @@ static int InputSourceInit( input_thread_t *p_input, in->i_title = 0; in->title = NULL; } - demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE, - &in->b_can_pace_control ); - demux2_Control( in->p_demux, DEMUX_CAN_PAUSE, - &in->b_can_pause ); + if( demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE, + &in->b_can_pace_control ) ) + in->b_can_pace_control = VLC_FALSE; + + if( !in->b_can_pace_control ) + { + if( demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_RATE, + &in->b_can_rate_control, &in->b_rescale_ts ) ) + { + in->b_can_rate_control = VLC_FALSE; + in->b_rescale_ts = VLC_TRUE; /* not used */ + } + } + else + { + in->b_can_rate_control = VLC_TRUE; + in->b_rescale_ts = VLC_TRUE; + } + if( demux2_Control( in->p_demux, DEMUX_CAN_PAUSE, + &in->b_can_pause ) ) + in->b_can_pause = VLC_FALSE; + var_SetBool( p_input, "can-pause", in->b_can_pause ); - /* FIXME todo - demux2_Control( in->p_demux, DEMUX_CAN_SEEK, + int ret = demux2_Control( in->p_demux, DEMUX_CAN_SEEK, &val.b_bool ); - */ + if( ret != VLC_SUCCESS ) + val.b_bool = VLC_FALSE; + var_Set( p_input, "seekable", val ); } else { @@ -2043,31 +2300,21 @@ static int InputSourceInit( input_thread_t *p_input, 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, ':' ) ) { - strcpy (psz_dup, psz_mrl); - psz_access = ""; - if( psz_forced_demux && *psz_forced_demux ) - { - psz_demux = psz_forced_demux; - } - else psz_demux = ""; - psz_path = psz_dup; - + msg_Dbg( p_input, "retrying with access `' demux `' path `%s'", + psz_mrl ); + psz_demux = "" ; in->p_access = access2_New( p_input, - psz_access, psz_demux, psz_path, - p_input->b_preparsing ); + "", "", 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'." @@ -2076,7 +2323,7 @@ static int InputSourceInit( input_thread_t *p_input, } /* */ - psz_tmp = psz = var_GetString( p_input, "access-filter" ); + psz_tmp = psz = var_GetNonEmptyString( p_input, "access-filter" ); while( psz && *psz ) { access_t *p_access = in->p_access; @@ -2095,7 +2342,7 @@ static int InputSourceInit( input_thread_t *p_input, psz = end; } - if( psz_tmp ) free( psz_tmp ); + free( psz_tmp ); /* Get infos from access */ if( !p_input->b_preparsing ) @@ -2115,8 +2362,12 @@ static int InputSourceInit( input_thread_t *p_input, } access2_Control( in->p_access, ACCESS_CAN_CONTROL_PACE, &in->b_can_pace_control ); + in->b_can_rate_control = in->b_can_pace_control; + in->b_rescale_ts = VLC_TRUE; + access2_Control( in->p_access, ACCESS_CAN_PAUSE, &in->b_can_pause ); + var_SetBool( p_input, "can-pause", in->b_can_pause ); access2_Control( in->p_access, ACCESS_CAN_SEEK, &val.b_bool ); var_Set( p_input, "seekable", val ); @@ -2137,29 +2388,47 @@ 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->p_es_out, - p_input->b_preparsing ); + + { + /* 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( 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. " + intf_UserFatal( VLC_OBJECT( p_input ), VLC_FALSE, + _("VLC can't recognize the input's format"), + _("The format of '%s' cannot be detected. " "Have a look the log for details."), psz_mrl ); goto error; } - /* TODO get title from demux */ + /* 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 { @@ -2168,6 +2437,28 @@ static int InputSourceInit( input_thread_t *p_input, } } + /* 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 ) ) + { + vlc_mutex_lock( &p_input->p->input.p_item->lock ); + AppendAttachment( &p_input->p->i_attachment, &p_input->p->attachment, + i_attachment, attachment ); + vlc_mutex_unlock( &p_input->p->input.p_item->lock ); + } + } + if( !demux2_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) ) + { + vlc_mutex_lock( &p_input->p->input.p_item->lock ); + in->f_fps = f_fps; + vlc_mutex_unlock( &p_input->p->input.p_item->lock ); + } + if( var_GetInteger( p_input, "clock-synchro" ) != -1 ) in->b_can_pace_control = !var_GetInteger( p_input, "clock-synchro" ); @@ -2191,8 +2482,10 @@ 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 ); @@ -2204,12 +2497,9 @@ static void InputSourceClean( input_thread_t *p_input, input_source_t *in ) 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 ); } } @@ -2293,9 +2583,8 @@ static void SlaveSeek( input_thread_t *p_input ) /***************************************************************************** * InputMetaUser: *****************************************************************************/ -static void InputMetaUser( input_thread_t *p_input ) +static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta ) { - vlc_meta_t *p_meta = p_input->p->input.p_item->p_meta; vlc_value_t val; if( !p_meta ) return; @@ -2303,51 +2592,228 @@ static void InputMetaUser( input_thread_t *p_input ) /* Get meta information from user */ #define GET_META( field, s ) \ var_Get( p_input, (s), &val ); \ - if( *val.psz_string ) { \ - if( p_meta->psz_ ## field ) free ( p_meta->psz_ ## field ); \ - p_meta->psz_ ## field = strdup( val.psz_string ); \ - } \ + if( *val.psz_string ) \ + vlc_meta_Set( p_meta, vlc_meta_ ## field, val.psz_string ); \ free( val.psz_string ) - 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" ); + 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 } +/***************************************************************************** + * InputUpdateMeta: merge p_item meta data with p_meta taking care of + * arturl and locking issue. + *****************************************************************************/ +static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta ) +{ + input_item_t *p_item = p_input->p->input.p_item; + char * psz_arturl = NULL; + char *psz_title = NULL; + int i; + int i_arturl_event = VLC_FALSE; + + if( !p_meta ) + return; + + psz_arturl = input_item_GetArtURL( p_item ); + + vlc_mutex_lock( &p_item->lock ); + if( vlc_meta_Get( p_meta, vlc_meta_Title ) && !p_item->b_fixed_name ) + psz_title = strdup( vlc_meta_Get( p_meta, vlc_meta_Title ) ); + + vlc_meta_Merge( p_item->p_meta, p_meta ); + + if( psz_arturl && *psz_arturl ) + { + vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, psz_arturl ); + i_arturl_event = VLC_TRUE; + } + + vlc_meta_Delete( p_meta ); + + if( psz_arturl && !strncmp( psz_arturl, "attachment://", strlen("attachment") ) ) + { + /* Don't look for art cover if sout + * XXX It can change when sout has meta data support */ + if( p_input->p->p_sout && !p_input->b_preparsing ) + { + vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, "" ); + i_arturl_event = VLC_TRUE; + + } + else + input_ExtractAttachmentAndCacheArt( p_input ); + } + free( psz_arturl ); + + /* 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, input_item_GetMetaObject( p_item ) ); + } + vlc_mutex_unlock( &p_item->lock ); + + input_item_SetPreparsed( p_item, VLC_TRUE ); + + if( i_arturl_event == VLC_TRUE ) + { + vlc_event_t event; + + /* Notify interested third parties */ + event.type = vlc_InputItemMetaChanged; + event.u.input_item_meta_changed.meta_type = vlc_meta_ArtworkURL; + vlc_event_send( &p_item->event_manager, &event ); + } + + if( psz_title ) + { + input_Control( p_input, INPUT_SET_NAME, psz_title ); + free( psz_title ); + } + + if( p_meta ) + { + char ** ppsz_all_keys = vlc_dictionary_all_keys( &p_meta->extra_tags ); + for( i = 0; ppsz_all_keys[i]; i++ ) + { + input_Control( p_input, INPUT_ADD_INFO, _(VLC_META_INFO_CAT), _(ppsz_all_keys[i]), + vlc_dictionary_value_for_key( &p_meta->extra_tags, ppsz_all_keys[i] ) ); + free( ppsz_all_keys[i] ); + } + free( ppsz_all_keys ); + vlc_meta_Delete( p_meta ); + } + + /** \todo handle sout meta */ +} + + +static inline vlc_bool_t IsValidAccess( const char *psz ) +{ + char c; + + while( ( c = *psz ) != '\0' ) + { + if( c == ':' ) + return VLC_TRUE; + + if( ( !isascii( c ) || !isalnum( c ) ) && c != '-' && ( c != '/' ) ) + return VLC_FALSE; + psz++; + } + /* should not happen though */ + return VLC_FALSE; +} + +static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment, + int i_new, input_attachment_t **pp_new ) +{ + int i_attachment = *pi_attachment; + input_attachment_t **attachment = *ppp_attachment; + int i; + + attachment = realloc( attachment, + sizeof(input_attachment_t**) * ( i_attachment + i_new ) ); + for( i = 0; i < i_new; i++ ) + attachment[i_attachment++] = pp_new[i]; + if( pp_new ) + free( pp_new ); + + /* */ + *pi_attachment = i_attachment; + *ppp_attachment = attachment; +} + +static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_demux ) +{ + vlc_bool_t b_bool; + module_t *p_id3; + + +#if 0 + /* XXX I am not sure it is a great idea, besides, there is more than that + * if we want to do it right */ + vlc_mutex_lock( &p_item->lock ); + if( p_item->p_meta && (p_item->p_meta->i_status & ITEM_PREPARSED ) ) + { + vlc_mutex_unlock( &p_item->lock ); + return; + } + vlc_mutex_unlock( &p_item->lock ); +#endif + + demux2_Control( p_demux, DEMUX_GET_META, p_meta ); + if( demux2_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) ) + return; + if( !b_bool ) + return; + + p_demux->p_private = malloc( sizeof( demux_meta_t ) ); + if(! p_demux->p_private ) + return; + + p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ); + if( p_id3 ) + { + demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private; + + if( p_demux_meta->p_meta ) + { + vlc_meta_Merge( p_meta, p_demux_meta->p_meta ); + vlc_meta_Delete( p_demux_meta->p_meta ); + } + + if( p_demux_meta->i_attachments > 0 ) + { + vlc_mutex_lock( &p_input->p->input.p_item->lock ); + AppendAttachment( &p_input->p->i_attachment, &p_input->p->attachment, + p_demux_meta->i_attachments, p_demux_meta->attachments ); + vlc_mutex_unlock( &p_input->p->input.p_item->lock ); + } + module_Unneed( p_demux, p_id3 ); + } + free( p_demux->p_private ); +} + + /***************************************************************************** * MRLSplit: parse the access, demux and url part of the * Media Resource Locator. *****************************************************************************/ -void MRLSplit( vlc_object_t *p_input, char *psz_dup, - const char **ppsz_access, const char **ppsz_demux, +void MRLSplit( char *psz_dup, const char **ppsz_access, const char **ppsz_demux, char **ppsz_path ) { const char *psz_access = ""; const char *psz_demux = ""; char *psz_path; - char *psz, *psz_check; + 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_Dbg( 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;