X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=94b1d766bc5163f1369539e213bca75aaeff8b2b;hb=a276d9aa737e353a7c2bf5e19b36216a8c47528b;hp=5a2745285b305922a41a8ddadc18838602986eef;hpb=0597403277c49d3fc23da19fb6f6954e984bae86;p=vlc diff --git a/src/input/input.c b/src/input/input.c index 5a2745285b..94b1d766bc 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -43,12 +43,12 @@ #include "demux.h" #include "stream.h" #include "item.h" -#include "ressource.h" +#include "resource.h" #include #include "../stream_output/stream_output.h" -#include +#include #include #include #include @@ -66,14 +66,14 @@ static void *Run ( vlc_object_t *p_this ); static void *RunAndDestroy ( vlc_object_t *p_this ); static input_thread_t * Create ( vlc_object_t *, input_item_t *, - const char *, bool, input_ressource_t * ); + const char *, bool, input_resource_t * ); static int Init ( input_thread_t *p_input ); static void End ( input_thread_t *p_input ); static void MainLoop( input_thread_t *p_input ); static void ObjectKillChildrens( input_thread_t *, vlc_object_t * ); -static inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t *, mtime_t i_deadline ); +static inline int ControlPop( input_thread_t *, int *, vlc_value_t *, mtime_t i_deadline ); static void ControlReduce( input_thread_t * ); static bool Control( input_thread_t *, int, vlc_value_t ); @@ -117,11 +117,10 @@ static void input_ChangeState( input_thread_t *p_input, int i_state ); /* TODO f *****************************************************************************/ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, const char *psz_header, bool b_quick, - input_ressource_t *p_ressource ) + input_resource_t *p_resource ) { static const char input_name[] = "input"; input_thread_t *p_input = NULL; /* thread descriptor */ - vlc_value_t val; int i; /* Allocate descriptor */ @@ -149,17 +148,6 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, if( !p_input->p ) return NULL; - /* One "randomly" selected input thread is responsible for computing - * the global stats. Check if there is already someone doing this */ - if( p_input->p_libvlc->p_stats && !b_quick ) - { - libvlc_priv_t *p_private = libvlc_priv( p_input->p_libvlc ); - vlc_mutex_lock( &p_input->p_libvlc->p_stats->lock ); - if( p_private->p_stats_computer == NULL ) - p_private->p_stats_computer = p_input; - vlc_mutex_unlock( &p_input->p_libvlc->p_stats->lock ); - } - p_input->b_preparsing = b_quick; p_input->psz_header = psz_header ? strdup( psz_header ) : NULL; @@ -183,8 +171,6 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, p_input->p->p_es_out = NULL; p_input->p->p_sout = NULL; p_input->p->b_out_pace_control = false; - p_input->p->i_pts_delay = 0; - p_input->p->i_cr_average = 0; vlc_gc_incref( p_item ); /* Released in Destructor() */ p_input->p->p_item = p_item; @@ -213,16 +199,17 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, p_input->p->slave = NULL; /* */ - if( p_ressource ) - p_input->p->p_ressource = p_ressource; + if( p_resource ) + p_input->p->p_resource = p_resource; else - p_input->p->p_ressource = input_ressource_New(); - input_ressource_SetInput( p_input->p->p_ressource, p_input ); + p_input->p->p_resource = input_resource_New(); + input_resource_SetInput( p_input->p->p_resource, p_input ); /* Init control buffer */ vlc_mutex_init( &p_input->p->lock_control ); vlc_cond_init( &p_input->p->wait_control ); p_input->p->i_control = 0; + p_input->p->b_abort = false; /* Parse input options */ vlc_mutex_lock( &p_item->lock ); @@ -239,16 +226,14 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, input_ControlVarInit( p_input ); /* */ - p_input->p->i_cr_average = var_GetInteger( p_input, "cr-average" ); - if( !p_input->b_preparsing ) { - var_Get( p_input, "bookmarks", &val ); - if( val.psz_string ) + char *psz_bookmarks = var_GetNonEmptyString( p_input, "bookmarks" ); + if( psz_bookmarks ) { /* FIXME: have a common cfg parsing routine used by sout and others */ char *psz_parser, *psz_start, *psz_end; - psz_parser = val.psz_string; + psz_parser = psz_bookmarks; while( (psz_start = strchr( psz_parser, '{' ) ) ) { seekpoint_t *p_seekpoint; @@ -287,7 +272,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, vlc_seekpoint_Delete( p_seekpoint ); *psz_parser = backup; } - free( val.psz_string ); + free( psz_bookmarks ); } } @@ -326,8 +311,8 @@ static void Destructor( input_thread_t * p_input ) stats_TimerDump( p_input, STATS_TIMER_INPUT_LAUNCHING ); stats_TimerClean( p_input, STATS_TIMER_INPUT_LAUNCHING ); - if( p_input->p->p_ressource ) - input_ressource_Delete( p_input->p->p_ressource ); + if( p_input->p->p_resource ) + input_resource_Delete( p_input->p->p_resource ); vlc_gc_decref( p_input->p->p_item ); @@ -355,11 +340,11 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, /* */ input_thread_t *__input_CreateThreadExtended( vlc_object_t *p_parent, input_item_t *p_item, - const char *psz_log, input_ressource_t *p_ressource ) + const char *psz_log, input_resource_t *p_resource ) { input_thread_t *p_input; - p_input = Create( p_parent, p_item, psz_log, false, p_ressource ); + p_input = Create( p_parent, p_item, psz_log, false, p_resource ); if( !p_input ) return NULL; @@ -416,13 +401,13 @@ int __input_Read( vlc_object_t *p_parent, input_item_t *p_item, /** * Initialize an input and initialize it to preparse the item - * This function is blocking. It will only accept to parse files + * This function is blocking. It will only accept parsing regular files. * * \param p_parent a vlc_object_t * \param p_item an input item * \return VLC_SUCCESS or an error */ -int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item ) +int input_Preparse( vlc_object_t *p_parent, input_item_t *p_item ) { input_thread_t *p_input; @@ -445,27 +430,30 @@ int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item ) * * \param the input thread to stop */ -void input_StopThread( input_thread_t *p_input ) +void input_StopThread( input_thread_t *p_input, bool b_abort ) { /* Set die for input and ALL of this childrens (even (grand-)grand-childrens) * It is needed here even if it is done in INPUT_CONTROL_SET_DIE handler to * unlock the control loop */ ObjectKillChildrens( p_input, VLC_OBJECT(p_input) ); + vlc_mutex_lock( &p_input->p->lock_control ); + p_input->p->b_abort |= b_abort; + vlc_mutex_unlock( &p_input->p->lock_control ); + input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL ); } -input_ressource_t *input_DetachRessource( input_thread_t *p_input ) +input_resource_t *input_DetachResource( input_thread_t *p_input ) { assert( p_input->b_dead ); - input_ressource_t *p_ressource = p_input->p->p_ressource; - input_ressource_SetInput( p_ressource, NULL ); + input_resource_SetInput( p_input->p->p_resource, NULL ); - p_input->p->p_ressource = NULL; + input_resource_t *p_resource = input_resource_Detach( p_input->p->p_resource ); p_input->p->p_sout = NULL; - return p_ressource; + return p_resource; } /** @@ -489,11 +477,10 @@ static void ObjectKillChildrens( input_thread_t *p_input, vlc_object_t *p_obj ) int i; /* FIXME ObjectKillChildrens seems a very bad idea in fact */ - if( p_obj->i_object_type == VLC_OBJECT_VOUT || - p_obj->i_object_type == VLC_OBJECT_AOUT || + i = vlc_internals( p_obj )->i_object_type; + if( i == VLC_OBJECT_VOUT ||i == VLC_OBJECT_AOUT || p_obj == VLC_OBJECT(p_input->p->p_sout) || - p_obj->i_object_type == VLC_OBJECT_DECODER || - p_obj->i_object_type == VLC_OBJECT_PACKETIZER ) + i == VLC_OBJECT_DECODER || i == VLC_OBJECT_PACKETIZER ) return; vlc_object_kill( p_obj ); @@ -524,7 +511,14 @@ static void *Run( vlc_object_t *p_this ) exit: /* Tell we're dead */ + vlc_mutex_lock( &p_input->p->lock_control ); + const bool b_abort = p_input->p->b_abort; + vlc_mutex_unlock( &p_input->p->lock_control ); + + if( b_abort ) + input_SendEventAbort( p_input ); input_SendEventDead( p_input ); + vlc_restorecancel( canc ); return NULL; } @@ -599,10 +593,8 @@ static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed, mtime_t *p if( i_ret == 0 ) /* EOF */ { - vlc_value_t repeat; - - var_Get( p_input, "input-repeat", &repeat ); - if( repeat.i_int == 0 ) + int i_repeat = var_GetInteger( p_input, "input-repeat" ); + if( i_repeat == 0 ) { /* End of file - we do not set b_die because only the * playlist is allowed to do so. */ @@ -613,12 +605,11 @@ static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed, mtime_t *p { vlc_value_t val; - msg_Dbg( p_input, "repeating the same input (%d)", - repeat.i_int ); - if( repeat.i_int > 0 ) + msg_Dbg( p_input, "repeating the same input (%d)", i_repeat ); + if( i_repeat > 0 ) { - repeat.i_int--; - var_Set( p_input, "input-repeat", repeat ); + i_repeat--; + var_SetInteger( p_input, "input-repeat", i_repeat ); } /* Seek to start title/seekpoint */ @@ -705,12 +696,6 @@ static void MainLoopInterface( input_thread_t *p_input ) static void MainLoopStatistic( input_thread_t *p_input ) { stats_ComputeInputStats( p_input, p_input->p->p_item->p_stats ); - /* Are we the thread responsible for computing global stats ? */ - if( libvlc_priv( p_input->p_libvlc )->p_stats_computer == p_input ) - { - stats_ComputeGlobalStats( p_input->p_libvlc, - p_input->p_libvlc->p_stats ); - } input_SendEventStatistics( p_input ); } @@ -772,16 +757,15 @@ static void MainLoop( input_thread_t *p_input ) i_deadline = __MIN( i_intf_update, i_statistic_update ); /* Handle control */ - vlc_mutex_lock( &p_input->p->lock_control ); ControlReduce( p_input ); - while( !ControlPopNoLock( p_input, &i_type, &val, i_deadline ) ) + while( !ControlPop( p_input, &i_type, &val, i_deadline ) ) { + msg_Dbg( p_input, "control type=%d", i_type ); if( Control( p_input, i_type, val ) ) b_force_update = true; } - vlc_mutex_unlock( &p_input->p->lock_control ); /* Update interface and statistics */ i_current = mdate(); @@ -825,6 +809,8 @@ static void InitStatistics( input_thread_t * p_input ) INIT_COUNTER( demux_read, INTEGER, COUNTER ); INIT_COUNTER( input_bitrate, FLOAT, DERIVATIVE ); INIT_COUNTER( demux_bitrate, FLOAT, DERIVATIVE ); + INIT_COUNTER( demux_corrupted, INTEGER, COUNTER ); + INIT_COUNTER( demux_discontinuity, INTEGER, COUNTER ); INIT_COUNTER( played_abuffers, INTEGER, COUNTER ); INIT_COUNTER( lost_abuffers, INTEGER, COUNTER ); INIT_COUNTER( displayed_pictures, INTEGER, COUNTER ); @@ -852,7 +838,7 @@ static int InitSout( input_thread_t * p_input ) char *psz = var_GetNonEmptyString( p_input, "sout" ); if( psz && strncasecmp( p_input->p->p_item->psz_uri, "vlc:", 4 ) ) { - p_input->p->p_sout = input_ressource_RequestSout( p_input->p->p_ressource, NULL, psz ); + p_input->p->p_sout = input_resource_RequestSout( p_input->p->p_resource, NULL, psz ); if( !p_input->p->p_sout ) { input_ChangeState( p_input, ERROR_S ); @@ -873,7 +859,7 @@ static int InitSout( input_thread_t * p_input ) } else { - input_ressource_RequestSout( p_input->p->p_ressource, NULL, NULL ); + input_resource_RequestSout( p_input->p->p_resource, NULL, NULL ); } free( psz ); @@ -897,29 +883,13 @@ static void InitTitle( input_thread_t * p_input ) { /* Setup variables */ input_ControlVarNavigation( p_input ); - input_ControlVarTitle( p_input, 0 ); + input_SendEventTitle( p_input, 0 ); } /* Global flag */ p_input->p->b_can_pace_control = p_master->b_can_pace_control; p_input->p->b_can_pause = p_master->b_can_pause; p_input->p->b_can_rate_control = p_master->b_can_rate_control; - - /* Fix pts delay */ - if( p_input->p->i_pts_delay < 0 ) - p_input->p->i_pts_delay = 0; - - /* If the desynchronisation requested by the user is < 0, we need to - * cache more data. */ - const int i_desynch = var_GetInteger( p_input, "audio-desync" ); - if( i_desynch < 0 ) - p_input->p->i_pts_delay -= i_desynch * 1000; - - /* Update cr_average depending on the caching */ - p_input->p->i_cr_average *= (10 * p_input->p->i_pts_delay / 200000); - p_input->p->i_cr_average /= 10; - if( p_input->p->i_cr_average < 10 ) - p_input->p->i_cr_average = 10; } static void StartTitle( input_thread_t * p_input ) @@ -970,6 +940,7 @@ static void StartTitle( input_thread_t * p_input ) msg_Warn( p_input, "invalid stop-time ignored" ); p_input->p->i_stop = 0; } + p_input->p->b_fast_seek = var_GetBool( p_input, "input-fast-seek" ); } static void LoadSubtitles( input_thread_t *p_input ) @@ -1060,19 +1031,47 @@ static void LoadSlaves( input_thread_t *p_input ) free( psz_org ); } +static void UpdatePtsDelay( input_thread_t *p_input ) +{ + input_thread_private_t *p_sys = p_input->p; + + /* Get max pts delay from input source */ + mtime_t i_pts_delay = p_sys->input.i_pts_delay; + for( int i = 0; i < p_sys->i_slave; i++ ) + i_pts_delay = __MAX( i_pts_delay, p_sys->slave[i]->i_pts_delay ); + + if( i_pts_delay < 0 ) + i_pts_delay = 0; + + /* Take care of audio/spu delay */ + const mtime_t i_audio_delay = var_GetTime( p_input, "audio-delay" ); + const mtime_t i_spu_delay = var_GetTime( p_input, "spu-delay" ); + const mtime_t i_extra_delay = __MIN( i_audio_delay, i_spu_delay ); + if( i_extra_delay < 0 ) + i_pts_delay -= i_extra_delay; + + /* Update cr_average depending on the caching */ + const int i_cr_average = var_GetInteger( p_input, "cr-average" ) * i_pts_delay / DEFAULT_PTS_DELAY; + + /* */ + es_out_SetJitter( p_input->p->p_es_out, i_pts_delay, i_cr_average ); +} + static void InitPrograms( input_thread_t * p_input ) { int i_es_out_mode; vlc_value_t val; + /* Compute correct pts_delay */ + UpdatePtsDelay( p_input ); + /* Set up es_out */ es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, true ); i_es_out_mode = ES_OUT_MODE_AUTO; val.p_list = NULL; if( p_input->p->p_sout ) { - var_Get( p_input, "sout-all", &val ); - if( val.b_bool ) + if( var_GetBool( p_input, "sout-all" ) ) { i_es_out_mode = ES_OUT_MODE_ALL; val.p_list = NULL; @@ -1134,7 +1133,7 @@ static int Init( input_thread_t * p_input ) #ifdef ENABLE_SOUT ret = InitSout( p_input ); if( ret != VLC_SUCCESS ) - return ret; /* FIXME: goto error; should be better here */ + goto error_stats; #endif /* Create es out */ @@ -1209,12 +1208,8 @@ static int Init( input_thread_t * p_input ) InputUpdateMeta( p_input, p_meta ); } - if( !p_input->b_preparsing ) - { - msg_Dbg( p_input, "`%s' successfully opened", - p_input->p->p_item->psz_uri ); - - } + msg_Dbg( p_input, "`%s' successfully opened", + p_input->p->p_item->psz_uri ); /* initialization is complete */ input_ChangeState( p_input, PLAYING_S ); @@ -1228,14 +1223,17 @@ error: es_out_Delete( p_input->p->p_es_out ); if( p_input->p->p_es_out_display ) es_out_Delete( p_input->p->p_es_out_display ); - if( p_input->p->p_ressource ) + if( p_input->p->p_resource ) { if( p_input->p->p_sout ) - input_ressource_RequestSout( p_input->p->p_ressource, + input_resource_RequestSout( p_input->p->p_resource, p_input->p->p_sout, NULL ); - input_ressource_SetInput( p_input->p->p_ressource, NULL ); + input_resource_SetInput( p_input->p->p_resource, NULL ); } +#ifdef ENABLE_SOUT +error_stats: +#endif if( !p_input->b_preparsing && libvlc_stats( p_input ) ) { #define EXIT_COUNTER( c ) do { if( p_input->p->counters.p_##c ) \ @@ -1246,6 +1244,8 @@ error: EXIT_COUNTER( demux_read ); EXIT_COUNTER( input_bitrate ); EXIT_COUNTER( demux_bitrate ); + EXIT_COUNTER( demux_corrupted ); + EXIT_COUNTER( demux_discontinuity ); EXIT_COUNTER( played_abuffers ); EXIT_COUNTER( lost_abuffers ); EXIT_COUNTER( displayed_pictures ); @@ -1313,22 +1313,15 @@ static void End( input_thread_t * p_input ) #define CL_CO( c ) stats_CounterClean( p_input->p->counters.p_##c ); p_input->p->counters.p_##c = NULL; if( libvlc_stats( p_input ) ) { - libvlc_priv_t *p_private = libvlc_priv( p_input->p_libvlc ); - /* make sure we are up to date */ stats_ComputeInputStats( p_input, p_input->p->p_item->p_stats ); - if( p_private->p_stats_computer == p_input ) - { - stats_ComputeGlobalStats( p_input->p_libvlc, - p_input->p_libvlc->p_stats ); - /* FIXME how can it be thread safe ? */ - p_private->p_stats_computer = NULL; - } CL_CO( read_bytes ); CL_CO( read_packets ); CL_CO( demux_read ); CL_CO( input_bitrate ); CL_CO( demux_bitrate ); + CL_CO( demux_corrupted ); + CL_CO( demux_discontinuity ); CL_CO( played_abuffers ); CL_CO( lost_abuffers ); CL_CO( displayed_pictures ); @@ -1356,9 +1349,9 @@ static void End( input_thread_t * p_input ) } /* */ - input_ressource_RequestSout( p_input->p->p_ressource, + input_resource_RequestSout( p_input->p->p_resource, p_input->p->p_sout, NULL ); - input_ressource_SetInput( p_input->p->p_ressource, NULL ); + input_resource_SetInput( p_input->p->p_resource, NULL ); } /***************************************************************************** @@ -1395,49 +1388,47 @@ void input_ControlPush( input_thread_t *p_input, vlc_mutex_unlock( &p_input->p->lock_control ); } -static inline int ControlPopNoLock( input_thread_t *p_input, - int *pi_type, vlc_value_t *p_val, - mtime_t i_deadline ) +static inline int ControlPop( input_thread_t *p_input, + int *pi_type, vlc_value_t *p_val, + mtime_t i_deadline ) { + input_thread_private_t *p_sys = p_input->p; - while( p_input->p->i_control <= 0 ) + vlc_mutex_lock( &p_sys->lock_control ); + while( p_sys->i_control <= 0 ) { - if( !vlc_object_alive( p_input ) ) - return VLC_EGENERIC; - - if( i_deadline < 0 ) + if( !vlc_object_alive( p_input ) || i_deadline < 0 ) + { + vlc_mutex_unlock( &p_sys->lock_control ); return VLC_EGENERIC; + } - if( vlc_cond_timedwait( &p_input->p->wait_control, &p_input->p->lock_control, i_deadline ) ) + if( vlc_cond_timedwait( &p_sys->wait_control, &p_sys->lock_control, + i_deadline ) ) + { + vlc_mutex_unlock( &p_sys->lock_control ); return VLC_EGENERIC; + } } - *pi_type = p_input->p->control[0].i_type; - *p_val = p_input->p->control[0].val; - - p_input->p->i_control--; - if( p_input->p->i_control > 0 ) - { - int i; + /* */ + *pi_type = p_sys->control[0].i_type; + *p_val = p_sys->control[0].val; - for( i = 0; i < p_input->p->i_control; i++ ) - { - p_input->p->control[i].i_type = p_input->p->control[i+1].i_type; - p_input->p->control[i].val = p_input->p->control[i+1].val; - } - } + p_sys->i_control--; + if( p_sys->i_control > 0 ) + memmove( &p_sys->control[0], &p_sys->control[1], + sizeof(*p_sys->control) * p_sys->i_control ); + vlc_mutex_unlock( &p_sys->lock_control ); return VLC_SUCCESS; } static void ControlReduce( input_thread_t *p_input ) { - int i; - - if( !p_input ) - return; + vlc_mutex_lock( &p_input->p->lock_control ); - for( i = 1; i < p_input->p->i_control; i++ ) + for( int i = 1; i < p_input->p->i_control; i++ ) { const int i_lt = p_input->p->control[i-1].i_type; const int i_ct = p_input->p->control[i].i_type; @@ -1473,6 +1464,7 @@ static void ControlReduce( input_thread_t *p_input ) */ } } + vlc_mutex_unlock( &p_input->p->lock_control ); } /* Pause input */ static void ControlPause( input_thread_t *p_input, mtime_t i_control_date ) @@ -1528,9 +1520,7 @@ static void ControlUnpause( input_thread_t *p_input, mtime_t i_control_date ) { /* FIXME What to do ? */ msg_Warn( p_input, "cannot unset pause -> EOF" ); - vlc_mutex_unlock( &p_input->p->lock_control ); input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL ); - vlc_mutex_lock( &p_input->p->lock_control ); } } @@ -1581,7 +1571,7 @@ static bool Control( input_thread_t *p_input, int i_type, /* Reset the decoders states and clock sync (before calling the demuxer */ es_out_SetTime( p_input->p->p_es_out, -1 ); if( demux_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION, - f_pos ) ) + f_pos, !p_input->p->b_fast_seek ) ) { msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) " "%2.1f%% failed", f_pos * 100 ); @@ -1620,7 +1610,8 @@ static bool Control( input_thread_t *p_input, int i_type, es_out_SetTime( p_input->p->p_es_out, -1 ); i_ret = demux_Control( p_input->p->input.p_demux, - DEMUX_SET_TIME, i_time ); + DEMUX_SET_TIME, i_time, + !p_input->p->b_fast_seek ); if( i_ret ) { int64_t i_length; @@ -1632,7 +1623,8 @@ static bool Control( input_thread_t *p_input, int i_type, { double f_pos = (double)i_time / (double)i_length; i_ret = demux_Control( p_input->p->input.p_demux, - DEMUX_SET_POSITION, f_pos ); + DEMUX_SET_POSITION, f_pos, + !p_input->p->b_fast_seek ); } } if( i_ret ) @@ -1832,12 +1824,18 @@ static bool Control( input_thread_t *p_input, int i_type, case INPUT_CONTROL_SET_AUDIO_DELAY: if( !es_out_SetDelay( p_input->p->p_es_out_display, AUDIO_ES, val.i_time ) ) + { input_SendEventAudioDelay( p_input, val.i_time ); + UpdatePtsDelay( p_input ); + } break; case INPUT_CONTROL_SET_SPU_DELAY: if( !es_out_SetDelay( p_input->p->p_es_out_display, SPU_ES, val.i_time ) ) + { input_SendEventSubtitleDelay( p_input, val.i_time ); + UpdatePtsDelay( p_input ); + } break; case INPUT_CONTROL_SET_TITLE: @@ -1868,7 +1866,7 @@ static bool Control( input_thread_t *p_input, int i_type, es_out_SetTime( p_input->p->p_es_out, -1 ); demux_Control( p_demux, DEMUX_SET_TITLE, i_title ); - input_ControlVarTitle( p_input, i_title ); + input_SendEventTitle( p_input, i_title ); } } else if( p_input->p->input.i_title > 0 ) @@ -1889,6 +1887,7 @@ static bool Control( input_thread_t *p_input, int i_type, stream_Control( p_input->p->input.p_stream, STREAM_CONTROL_ACCESS, ACCESS_SET_TITLE, i_title ); + input_SendEventTitle( p_input, i_title ); } } break; @@ -1934,6 +1933,7 @@ static bool Control( input_thread_t *p_input, int i_type, es_out_SetTime( p_input->p->p_es_out, -1 ); demux_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint ); + input_SendEventSeekpoint( p_input, p_demux->info.i_title, i_seekpoint ); } } else if( p_input->p->input.i_title > 0 ) @@ -1968,6 +1968,7 @@ static bool Control( input_thread_t *p_input, int i_type, stream_Control( p_input->p->input.p_stream, STREAM_CONTROL_ACCESS, ACCESS_SET_SEEKPOINT, i_seekpoint ); + input_SendEventSeekpoint( p_input, p_access->info.i_title, i_seekpoint ); } } break; @@ -2004,7 +2005,7 @@ static bool Control( input_thread_t *p_input, int i_type, break; } if( demux_Control( slave->p_demux, - DEMUX_SET_TIME, i_time ) ) + DEMUX_SET_TIME, i_time, true ) ) { msg_Err( p_input, "seek failed for new slave" ); InputSourceClean( slave ); @@ -2275,14 +2276,15 @@ static int InputSourceInit( input_thread_t *p_input, input_source_t *in, const char *psz_mrl, const char *psz_forced_demux ) { - char psz_dup[strlen(psz_mrl) + 1]; const char *psz_access; const char *psz_demux; char *psz_path; - vlc_value_t val; double f_fps; - strcpy( psz_dup, psz_mrl ); + char *psz_dup = strdup( psz_mrl ); + + if( psz_dup == NULL ) + goto error; /* Split uri */ input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_dup ); @@ -2339,12 +2341,9 @@ static int InputSourceInit( input_thread_t *p_input, if( in->p_demux ) { - int64_t i_pts_delay; - /* Get infos from access_demux */ demux_Control( in->p_demux, - DEMUX_GET_PTS_DELAY, &i_pts_delay ); - p_input->p->i_pts_delay = __MAX( p_input->p->i_pts_delay, i_pts_delay ); + DEMUX_GET_PTS_DELAY, &in->i_pts_delay ); in->b_title_demux = true; if( demux_Control( in->p_demux, DEMUX_GET_TITLE_INFO, @@ -2378,16 +2377,13 @@ static int InputSourceInit( input_thread_t *p_input, var_SetBool( p_input, "can-rate", !in->b_can_pace_control || in->b_can_rate_control ); /* XXX temporary because of es_out_timeshift*/ var_SetBool( p_input, "can-rewind", !in->b_rescale_ts && !in->b_can_pace_control ); - int ret = demux_Control( in->p_demux, DEMUX_CAN_SEEK, - &val.b_bool ); - if( ret != VLC_SUCCESS ) - val.b_bool = false; - var_Set( p_input, "can-seek", val ); + bool b_can_seek; + if( demux_Control( in->p_demux, DEMUX_CAN_SEEK, &b_can_seek ) ) + b_can_seek = false; + var_SetBool( p_input, "can-seek", b_can_seek ); } else { - int64_t i_pts_delay; - /* Now try a real access */ in->p_access = access_New( p_input, psz_access, psz_demux, psz_path ); @@ -2406,9 +2402,8 @@ static int InputSourceInit( input_thread_t *p_input, { msg_Err( p_input, "open of `%s' failed: %s", psz_mrl, msg_StackMsg() ); - intf_UserFatal( VLC_OBJECT( p_input), false, - _("Your input can't be opened"), - _("VLC is unable to open the MRL '%s'." + dialog_Fatal( p_input, _("Your input can't be opened"), + _("VLC is unable to open the MRL '%s'." " Check the log for details."), psz_mrl ); goto error; } @@ -2416,9 +2411,9 @@ static int InputSourceInit( input_thread_t *p_input, /* Get infos from access */ if( !p_input->b_preparsing ) { + bool b_can_seek; access_Control( in->p_access, - ACCESS_GET_PTS_DELAY, &i_pts_delay ); - p_input->p->i_pts_delay = __MAX( p_input->p->i_pts_delay, i_pts_delay ); + ACCESS_GET_PTS_DELAY, &in->i_pts_delay ); in->b_title_demux = false; if( access_Control( in->p_access, ACCESS_GET_TITLE_INFO, @@ -2433,15 +2428,13 @@ static int InputSourceInit( input_thread_t *p_input, in->b_can_rate_control = in->b_can_pace_control; in->b_rescale_ts = true; - access_Control( in->p_access, ACCESS_CAN_PAUSE, - &in->b_can_pause ); + access_Control( in->p_access, ACCESS_CAN_PAUSE, &in->b_can_pause ); var_SetBool( p_input, "can-pause", in->b_can_pause || !in->b_can_pace_control ); /* XXX temporary because of es_out_timeshift*/ var_SetBool( p_input, "can-rate", !in->b_can_pace_control || in->b_can_rate_control ); /* XXX temporary because of es_out_timeshift*/ var_SetBool( p_input, "can-rewind", !in->b_rescale_ts && !in->b_can_pace_control ); - access_Control( in->p_access, ACCESS_CAN_SEEK, - &val.b_bool ); - var_Set( p_input, "can-seek", val ); + access_Control( in->p_access, ACCESS_CAN_SEEK, &b_can_seek ); + var_SetBool( p_input, "can-seek", b_can_seek ); } /* */ @@ -2515,13 +2508,13 @@ static int InputSourceInit( input_thread_t *p_input, } { - /* Take access redirections into account */ + /* Take access/stream redirections into account */ char *psz_real_path; char *psz_buf = NULL; - if( in->p_access->psz_path ) + if( in->p_stream->psz_path ) { const char *psz_a, *psz_d; - psz_buf = strdup( in->p_access->psz_path ); + psz_buf = strdup( in->p_stream->psz_path ); input_SplitMRL( &psz_a, &psz_d, &psz_real_path, psz_buf ); } else @@ -2539,9 +2532,9 @@ static int InputSourceInit( input_thread_t *p_input, { msg_Err( p_input, "no suitable demux module for `%s/%s://%s'", psz_access, psz_demux, psz_path ); - intf_UserFatal( VLC_OBJECT( p_input ), false, - _("VLC can't recognize the input's format"), - _("The format of '%s' cannot be detected. " + dialog_Fatal( VLC_OBJECT( p_input ), + _("VLC can't recognize the input's format"), + _("The format of '%s' cannot be detected. " "Have a look at the log for details."), psz_mrl ); goto error; } @@ -2562,6 +2555,8 @@ static int InputSourceInit( input_thread_t *p_input, } } + free( psz_dup ); + /* Set record capabilities */ if( demux_Control( in->p_demux, DEMUX_CAN_RECORD, &in->b_can_stream_record ) ) in->b_can_stream_record = false; @@ -2609,6 +2604,7 @@ error: if( in->p_access ) access_Delete( in->p_access ); + free( psz_dup ); return VLC_EGENERIC; } @@ -2756,7 +2752,7 @@ static void SlaveSeek( input_thread_t *p_input ) { input_source_t *in = p_input->p->slave[i]; - if( demux_Control( in->p_demux, DEMUX_SET_TIME, i_time ) ) + if( demux_Control( in->p_demux, DEMUX_SET_TIME, i_time, true ) ) { if( !in->b_eof ) msg_Err( p_input, "seek failed for slave %d -> EOF", i ); @@ -2774,14 +2770,12 @@ static void SlaveSeek( input_thread_t *p_input ) *****************************************************************************/ static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta ) { - vlc_value_t val; - /* Get meta information from user */ #define GET_META( field, s ) do { \ - var_Get( p_input, (s), &val ); \ - if( val.psz_string && *val.psz_string ) \ - vlc_meta_Set( p_meta, vlc_meta_ ## field, val.psz_string ); \ - free( val.psz_string ); } while(0) + char *psz_string = var_GetNonEmptyString( p_input, (s) ); \ + if( psz_string ) \ + vlc_meta_Set( p_meta, vlc_meta_ ## field, psz_string ); \ + free( psz_string ); } while(0) GET_META( Title, "meta-title" ); GET_META( Artist, "meta-artist" ); @@ -2813,24 +2807,30 @@ static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta ) vlc_meta_Delete( p_meta ); + if( !psz_arturl || *psz_arturl == '\0' ) + { + const char *psz_tmp = vlc_meta_Get( p_item->p_meta, vlc_meta_ArtworkURL ); + if( psz_tmp ) + psz_arturl = strdup( psz_tmp ); + } + vlc_mutex_unlock( &p_item->lock ); + if( psz_arturl && *psz_arturl ) { - vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, psz_arturl ); + input_item_SetArtURL( p_item, psz_arturl ); if( !strncmp( psz_arturl, "attachment://", strlen("attachment") ) ) { /* Don't look for art cover if sout * XXX It can change when sout has meta data support */ if( p_input->p->p_sout && !p_input->b_preparsing ) - vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, "" ); + input_item_SetArtURL( p_item, "" ); else input_ExtractAttachmentAndCacheArt( p_input ); } } free( psz_arturl ); - vlc_mutex_unlock( &p_item->lock ); - if( psz_title ) { input_item_SetName( p_item, psz_title );