# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <ctype.h>
#include <limits.h>
msg_Err( p_parent, "out of memory" );
return NULL;
}
+
+ /* Construct a nice name for the input timer */
+ char psz_timer_name[255];
+ char * psz_name = input_item_GetName( p_item );
+ snprintf( psz_timer_name, sizeof(psz_timer_name),
+ "input launching for '%s'", psz_name );
+ free( psz_name );
+
+ /* Start a timer to mesure how long it takes
+ * to launch an input */
+ stats_TimerStart( p_input, psz_timer_name,
+ STATS_TIMER_INPUT_LAUNCHING );
+
MALLOC_NULL( p_input->p, input_thread_private_t );
+ memset( p_input->p, 0, sizeof( input_thread_private_t ) );
/* One "randomly" selected input thread is responsible for computing
* the global stats. Check if there is already someone doing this */
if( p_input->p_libvlc->p_stats && !b_quick )
{
+ libvlc_priv_t *priv = libvlc_priv (p_input->p_libvlc);
vlc_mutex_lock( &p_input->p_libvlc->p_stats->lock );
- if( p_input->p_libvlc->p_stats_computer == NULL )
- {
- p_input->p_libvlc->p_stats_computer = p_input;
- }
+ if( priv->p_stats_computer == NULL )
+ priv->p_stats_computer = p_input;
vlc_mutex_unlock( &p_input->p_libvlc->p_stats->lock );
}
p_input->p->slave = NULL;
/* Init control buffer */
- vlc_mutex_init( p_input, &p_input->p->lock_control );
+ vlc_mutex_init( &p_input->p->lock_control );
p_input->p->i_control = 0;
/* Parse input options */
}
psz_start = psz_end + 1;
}
- msg_Dbg( p_input, "adding bookmark: %s, bytes="I64Fd", time="I64Fd,
+ msg_Dbg( p_input, "adding bookmark: %s, bytes=%"PRId64", time=%"PRId64,
p_seekpoint->psz_name, p_seekpoint->i_byte_offset,
p_seekpoint->i_time_offset );
input_Control( p_input, INPUT_ADD_BOOKMARK, p_seekpoint );
}
/* Remove 'Now playing' info as it is probably outdated */
- input_Control( p_input, INPUT_DEL_INFO,
- _(VLC_META_INFO_CAT),
- _(VLC_META_NOW_PLAYING) );
input_item_SetNowPlaying( p_item, NULL );
/* */
}
memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) );
- vlc_mutex_init( p_input, &p_input->p->counters.counters_lock );
+ vlc_mutex_init( &p_input->p->counters.counters_lock );
/* Attach only once we are ready */
vlc_object_attach( p_input, p_parent );
{
input_thread_private_t *priv = p_input->p;
+ stats_TimerDump( p_input, STATS_TIMER_INPUT_LAUNCHING );
+ stats_TimerClean( p_input, STATS_TIMER_INPUT_LAUNCHING );
+#ifdef ENABLE_SOUT
if( priv->b_owns_its_sout && priv->p_sout )
{
if( priv->b_sout_keep )
SoutKeep( priv->p_sout );
else
+ {
sout_DeleteInstance( priv->p_sout );
+ priv->p_sout = NULL;
+ }
}
-
+#endif
vlc_gc_decref( p_input->p->input.p_item );
vlc_mutex_destroy( &p_input->p->counters.counters_lock );
/* We have finished */
p_input->b_eof = true;
- playlist_Signal( pl_Get( p_input ) );
+ playlist_Signal( libvlc_priv (p_input->p_libvlc)->p_playlist );
}
/* Wait until we are asked to die */
int64_t i_intf_update = 0;
int i_updates = 0;
+ /* Stop the timer */
+ stats_TimerStop( p_input, STATS_TIMER_INPUT_LAUNCHING );
+
while( !p_input->b_die && !p_input->b_error && !p_input->p->input.b_eof )
{
bool b_force_update = false;
vlc_value_t val;
/* Do the read */
- if( p_input->i_state != PAUSE_S )
+ if( p_input->i_state != PAUSE_S )
{
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() ) )
}
var_SetBool( p_input, "intf-change", true );
- i_intf_update = mdate() + I64C(150000);
+ i_intf_update = mdate() + INT64_C(150000);
}
/* 150ms * 8 = ~ 1 second */
if( ++i_updates % 8 == 0 )
{
stats_ComputeInputStats( p_input, p_input->p->input.p_item->p_stats );
/* Are we the thread responsible for computing global stats ? */
- if( p_input->p_libvlc->p_stats_computer == p_input )
+ if( libvlc_priv (p_input->p_libvlc)->p_stats_computer == p_input )
{
stats_ComputeGlobalStats( p_input->p_libvlc,
- p_input->p_libvlc->p_stats );
+ p_input->p_libvlc->p_stats );
}
}
}
/* 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 )
+ if( libvlc_stats (p_input) )
{
INIT_COUNTER( read_bytes, INTEGER, COUNTER );
INIT_COUNTER( read_packets, INTEGER, COUNTER );
}
}
+#ifdef ENABLE_SOUT
static int InitSout( input_thread_t * p_input )
{
char *psz;
return VLC_EGENERIC;
}
}
- if( p_input->p_libvlc->b_stats )
+ if( libvlc_stats (p_input) )
{
INIT_COUNTER( sout_sent_packets, INTEGER, COUNTER );
INIT_COUNTER (sout_sent_bytes, INTEGER, COUNTER );
return VLC_SUCCESS;
}
+#endif
static void InitTitle( input_thread_t * p_input )
{
int i, i_delay;
char *psz;
char *psz_subtitle;
+ int64_t i_length;
/* Start title/chapter */
/* 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" );
+ p_input->p->i_start = INT64_C(1000000) * var_GetInteger( p_input, "start-time" );
+ p_input->p->i_stop = INT64_C(1000000) * var_GetInteger( p_input, "stop-time" );
+ p_input->p->i_run = INT64_C(1000000) * var_GetInteger( p_input, "run-time" );
+ i_length = var_GetTime( p_input, "length" );
if( p_input->p->i_run < 0 )
{
msg_Warn( p_input, "invalid run-time ignored" );
if( p_input->p->i_start > 0 )
{
- if( p_input->p->i_start >= val.i_time )
+ if( p_input->p->i_start >= i_length )
{
msg_Warn( p_input, "invalid start-time ignored" );
}
vlc_value_t s;
msg_Dbg( p_input, "starting at time: %ds",
- (int)( p_input->p->i_start / I64C(1000000) ) );
+ (int)( p_input->p->i_start / INT64_C(1000000) ) );
s.i_time = p_input->p->i_start;
input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s );
}
InitStatistics( p_input );
+#ifdef ENABLE_SOUT
ret = InitSout( p_input );
-
if( ret != VLC_SUCCESS )
return ret; /* FIXME: goto error; should be better here */
+#endif
/* Create es out */
p_input->p->p_es_out = input_EsOutNew( p_input, p_input->p->i_rate );
/* Access_file does not give any meta, and there are no slave */
AccessMeta( p_input, p_meta );
+ InputUpdateMeta( p_input, p_meta );
+
if( !p_input->b_preparsing )
{
msg_Dbg( p_input, "`%s' successfully opened",
if( p_input->p->p_es_out )
input_EsOutDelete( p_input->p->p_es_out );
-
+#ifdef ENABLE_SOUT
if( p_input->p->p_sout )
{
vlc_object_detach( p_input->p->p_sout );
sout_DeleteInstance( p_input->p->p_sout );
}
+#endif
-
- if( !p_input->b_preparsing && p_input->p_libvlc->b_stats )
+ if( !p_input->b_preparsing && libvlc_stats (p_input) )
{
#define EXIT_COUNTER( c ) do { if( p_input->p->counters.p_##c ) \
stats_CounterClean( p_input->p->counters.p_##c );\
if( !p_input->b_preparsing )
{
#define CL_CO( c ) stats_CounterClean( p_input->p->counters.p_##c ); p_input->p->counters.p_##c = NULL;
- if( p_input->p_libvlc->b_stats )
+ if( libvlc_stats (p_input) )
{
+ libvlc_priv_t *priv = libvlc_priv (p_input->p_libvlc);
+
/* make sure we are up to date */
stats_ComputeInputStats( p_input, p_input->p->input.p_item->p_stats );
- if( p_input->p_libvlc->p_stats_computer == p_input )
+ if( priv->p_stats_computer == p_input )
{
stats_ComputeGlobalStats( p_input->p_libvlc,
p_input->p_libvlc->p_stats );
- p_input->p_libvlc->p_stats_computer = NULL;
+ priv->p_stats_computer = NULL;
}
CL_CO( read_bytes );
CL_CO( read_packets );
* XXX it might be unusable but this will be checked later */
if( b_keep_sout )
{
- /* Remove the sout from the playlist garbage collector */
- /* FIXME: we don't want to depend on the playlist, sout
- * should be attached to libvlc */
- playlist_t * p_playlist = vlc_object_find( p_parent,
- VLC_OBJECT_PLAYLIST, FIND_PARENT );
+ playlist_t *p_playlist = vlc_object_find( p_parent->p_libvlc,
+ VLC_OBJECT_PLAYLIST, FIND_CHILD );
if( p_playlist )
{
vlc_mutex_lock( &p_playlist->gc_lock );
p_sout = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, FIND_CHILD );
if( p_sout )
{
- if( p_sout->p_parent != VLC_OBJECT(p_playlist) )
+ if( p_sout->p_parent != VLC_OBJECT( p_playlist ) )
{
vlc_object_release( p_sout );
p_sout = NULL;
else
{
vlc_object_detach( p_sout ); /* Remove it from the GC */
-
vlc_object_release( p_sout );
}
}
vlc_mutex_unlock( &p_playlist->gc_lock );
-
vlc_object_release( p_playlist );
}
}
static void SoutKeep( sout_instance_t *p_sout )
{
- /* FIXME: we don't want to depend on the playlist, sout
- * should be attached to libvlc */
playlist_t * p_playlist = vlc_object_find( p_sout, VLC_OBJECT_PLAYLIST,
- FIND_PARENT );
+ FIND_PARENT );
if( !p_playlist ) return;
msg_Dbg( p_sout, "sout has been kept" );
vlc_object_attach( p_sout, p_playlist );
- pl_Release( p_sout );
+ vlc_object_release( p_playlist );
}
/*****************************************************************************
}
if( i_ret )
{
- msg_Warn( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) "I64Fd
+ msg_Warn( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) %"PRId64
" failed or not possible", i_time );
}
else
vlc_meta_t *p_meta = vlc_meta_New();
access_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta );
InputUpdateMeta( p_input, p_meta );
- var_SetInteger( pl_Get( p_input ), "item-change", p_input->p->input.p_item->i_id );
p_access->info.i_update &= ~INPUT_UPDATE_META;
}
if( !p_input->b_preparsing )
{
pl_Yield( p_input );
- var_SetInteger( pl_Get( p_input ), "item-change",
- p_input->p->input.p_item->i_id );
+ var_SetInteger( libvlc_priv (p_input->p_libvlc)->p_playlist,
+ "item-change", p_input->p->input.p_item->i_id );
pl_Release( p_input );
}
}
static input_source_t *InputSourceNew( input_thread_t *p_input )
{
input_source_t *in = (input_source_t*) malloc( sizeof( input_source_t ) );
-
- if( !in )
- {
- msg_Err( p_input, "out of memory for new input source" );
- return NULL;
- }
-
- in->p_item = NULL;
- in->p_access = NULL;
- in->p_stream = NULL;
- in->p_demux = NULL;
- in->b_title_demux = false;
- TAB_INIT( in->i_title, in->title );
- in->b_can_pause = true;
- in->b_can_pace_control = true;
- in->b_can_rate_control = true;
- in->b_rescale_ts = true;
- in->b_eof = false;
- in->f_fps = 0.0;
- in->i_cr_average = 0;
-
+ if( in )
+ memset( in, 0, sizeof( input_source_t ) );
return in;
}
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 = false;
if( !p_meta )
free( psz_title );
}
- if( p_meta )
- {
- char ** ppsz_all_keys = vlc_dictionary_all_keys( &p_meta->extra_tags );
- for( i = 0; ppsz_all_keys[i]; i++ )
- {
- input_Control( p_input, INPUT_ADD_INFO, _(VLC_META_INFO_CAT), _(ppsz_all_keys[i]),
- vlc_dictionary_value_for_key( &p_meta->extra_tags, ppsz_all_keys[i] ) );
- free( ppsz_all_keys[i] );
- }
- free( ppsz_all_keys );
- vlc_meta_Delete( p_meta );
- }
-
/** \todo handle sout meta */
}
psz_demux = strchr( psz_access, '/' );
if( psz_demux )
*psz_demux++ = '\0';
+
+ /* We really don't want module name substitution here! */
+ if( psz_access[0] == '$' )
+ psz_access++;
+ if( psz_demux && psz_demux[0] == '$' )
+ psz_demux++;
}
else
{