# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <ctype.h>
#include <limits.h>
#include <vlc_sout.h>
#include "../stream_output/stream_output.h"
-#include <vlc_playlist.h>
#include <vlc_interface.h>
#include <vlc_url.h>
-#include <vlc_demux.h>
#include <vlc_charset.h>
#ifdef HAVE_SYS_STAT_H
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+static void Destructor( input_thread_t * p_input );
+
static int Run ( input_thread_t *p_input );
static int RunAndDestroy ( input_thread_t *p_input );
static input_thread_t * Create ( vlc_object_t *, input_item_t *,
- const char *, vlc_bool_t, sout_instance_t * );
+ const char *, bool, sout_instance_t * );
static int Init ( input_thread_t *p_input );
static void Error ( input_thread_t *p_input );
static void End ( input_thread_t *p_input );
static void MainLoop( input_thread_t *p_input );
-static void Destroy( input_thread_t *p_input, sout_instance_t **pp_sout );
static inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t * );
static void ControlReduce( input_thread_t * );
-static vlc_bool_t Control( input_thread_t *, int, vlc_value_t );
+static bool Control( input_thread_t *, int, vlc_value_t );
static int UpdateFromAccess( input_thread_t * );
static int UpdateFromDemux( input_thread_t * );
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 AccessMeta( input_thread_t * p_input, vlc_meta_t *p_meta );
static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment,
int i_new, input_attachment_t **pp_new );
* * Get only:
* - 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)
+ * - 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 complete this list (?)
*****************************************************************************/
static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
- const char *psz_header, vlc_bool_t b_quick, sout_instance_t *p_sout )
+ const char *psz_header, bool b_quick,
+ sout_instance_t *p_sout )
{
+ static const char input_name[] = "input";
input_thread_t *p_input = NULL; /* thread descriptor */
vlc_value_t val;
int i;
/* Allocate descriptor */
- p_input = vlc_object_create( p_parent, VLC_OBJECT_INPUT );
+ p_input = vlc_custom_create( p_parent, sizeof( *p_input ),
+ VLC_OBJECT_INPUT, input_name );
if( p_input == NULL )
- {
- msg_Err( p_parent, "out of memory" );
return NULL;
- }
+
+ /* Construct a nice name for the input timer */
+ char psz_timer_name[255];
+ char * psz_name = input_item_GetName( p_item );
+ snprintf( psz_timer_name, sizeof(psz_timer_name),
+ "input launching for '%s'", psz_name );
+
+ msg_Dbg( p_input, "Creating an input for '%s'", psz_name);
+
+ free( psz_name );
+
+ /* Start a timer to mesure how long it takes
+ * to launch an input */
+ stats_TimerStart( p_input, psz_timer_name,
+ STATS_TIMER_INPUT_LAUNCHING );
+
MALLOC_NULL( p_input->p, input_thread_private_t );
+ memset( p_input->p, 0, sizeof( input_thread_private_t ) );
/* One "randomly" selected input thread is responsible for computing
* the global stats. Check if there is already someone doing this */
- if( p_input->p_libvlc->p_playlist->p_stats && !b_quick )
+ if( p_input->p_libvlc->p_stats && !b_quick )
{
- vlc_mutex_lock( &p_input->p_libvlc->p_playlist->p_stats->lock );
- if( p_input->p_libvlc->p_playlist->p_stats_computer == NULL )
- {
- p_input->p_libvlc->p_playlist->p_stats_computer = p_input;
- }
- vlc_mutex_unlock( &p_input->p_libvlc->p_playlist->p_stats->lock );
+ libvlc_priv_t *priv = libvlc_priv (p_input->p_libvlc);
+ vlc_mutex_lock( &p_input->p_libvlc->p_stats->lock );
+ if( priv->p_stats_computer == NULL )
+ priv->p_stats_computer = p_input;
+ vlc_mutex_unlock( &p_input->p_libvlc->p_stats->lock );
}
p_input->b_preparsing = b_quick;
p_input->psz_header = psz_header ? strdup( psz_header ) : NULL;
+ /* Init events */
+ vlc_event_manager_t * p_em = &p_input->p->event_manager;
+ vlc_event_manager_init_with_vlc_object( p_em, p_input );
+ vlc_event_manager_register_event_type( p_em, vlc_InputStateChanged );
+ vlc_event_manager_register_event_type( p_em, vlc_InputSelectedStreamChanged );
+
/* Init Common fields */
- p_input->b_eof = VLC_FALSE;
- p_input->b_can_pace_control = VLC_TRUE;
+ p_input->b_eof = false;
+ p_input->b_can_pace_control = true;
p_input->p->i_start = 0;
p_input->i_time = 0;
p_input->p->i_stop = 0;
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->p->b_out_pace_control = false;
p_input->i_pts_delay = 0;
/* Init Input fields */
+ vlc_gc_incref( p_item ); /* Released in Destructor() */
p_input->p->input.p_item = p_item;
p_input->p->input.p_access = NULL;
p_input->p->input.p_stream = NULL;
p_input->p->input.p_demux = NULL;
- p_input->p->input.b_title_demux = VLC_FALSE;
+ p_input->p->input.b_title_demux = false;
p_input->p->input.i_title = 0;
p_input->p->input.title = NULL;
p_input->p->input.i_title_offset = p_input->p->input.i_seekpoint_offset = 0;
- p_input->p->input.b_can_pace_control = VLC_TRUE;
- p_input->p->input.b_can_rate_control = VLC_TRUE;
- p_input->p->input.b_rescale_ts = VLC_TRUE;
- p_input->p->input.b_eof = VLC_FALSE;
+ p_input->p->input.b_can_pace_control = true;
+ p_input->p->input.b_can_rate_control = true;
+ p_input->p->input.b_rescale_ts = true;
+ p_input->p->input.b_eof = false;
p_input->p->input.i_cr_average = 0;
vlc_mutex_lock( &p_item->lock );
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 */
vlc_mutex_lock( &p_item->lock );
+ assert( p_item->optflagc == p_item->i_options );
for( i = 0; i < p_item->i_options; i++ )
- var_OptionParse( VLC_OBJECT(p_input), p_item->ppsz_options[i] );
+ var_OptionParse( VLC_OBJECT(p_input), p_item->ppsz_options[i],
+ !!(p_item->optflagv[i] & VLC_INPUT_OPTION_TRUSTED) );
vlc_mutex_unlock( &p_item->lock );
/* Create Object Variables for private use only */
}
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 );
/* */
if( p_sout )
p_input->p->p_sout = p_sout;
+ memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) );
+ vlc_mutex_init( &p_input->p->counters.counters_lock );
+
/* Attach only once we are ready */
vlc_object_attach( p_input, p_parent );
+ /* Set the destructor when we are sure we are initialized */
+ vlc_object_set_destructor( p_input, (vlc_destructor_t)Destructor );
+
return p_input;
}
-static void Destroy( input_thread_t *p_input, sout_instance_t **pp_sout )
+/**
+ * Input destructor (called when the object's refcount reaches 0).
+ */
+static void Destructor( input_thread_t * p_input )
{
- vlc_object_detach( p_input );
input_thread_private_t *priv = p_input->p;
- if( pp_sout )
- *pp_sout = NULL;
+#ifndef NDEBUG
+ char * psz_name = input_item_GetName( p_input->p->input.p_item );
+ msg_Dbg( p_input, "Destroying the input for '%s'", psz_name);
+ free( psz_name );
+#endif
+
+ vlc_event_manager_fini( &p_input->p->event_manager );
+
+ stats_TimerDump( p_input, STATS_TIMER_INPUT_LAUNCHING );
+ stats_TimerClean( p_input, STATS_TIMER_INPUT_LAUNCHING );
+#ifdef ENABLE_SOUT
if( 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 );
- }
+ sout_DeleteInstance( priv->p_sout );
+#endif
+ vlc_gc_decref( p_input->p->input.p_item );
+
+ vlc_mutex_destroy( &p_input->p->counters.counters_lock );
- vlc_object_release( p_input );
vlc_mutex_destroy( &priv->lock_control );
free( priv );
}
input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
input_item_t *p_item )
{
- vlc_bool_t b_sout_keep;
- sout_instance_t *p_sout = SoutFind( p_parent, p_item, &b_sout_keep );
- input_thread_t *p_input = __input_CreateThreadExtended( p_parent, p_item, NULL, p_sout );
-
- if( !p_input && p_sout )
- SoutKeep( p_sout );
-
- p_input->p->b_sout_keep = b_sout_keep;
- return p_input;
+ return __input_CreateThreadExtended( p_parent, p_item, NULL, NULL );
}
/* */
{
input_thread_t *p_input;
- p_input = Create( p_parent, p_item, psz_log, VLC_FALSE, p_sout );
+ p_input = Create( p_parent, p_item, psz_log, false, p_sout );
if( !p_input )
return NULL;
/* Create thread and wait for its readiness. */
if( vlc_thread_create( p_input, "input", Run,
- VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
+ VLC_THREAD_PRIORITY_INPUT, true ) )
{
input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
- Destroy( p_input, &p_sout );
+ vlc_object_detach( p_input );
+ vlc_object_release( p_input );
return NULL;
}
}
/**
- * Initialize an input thread and run it. This thread will clean after himself,
+ * Initialize an input thread and run it. This thread will clean after itself,
* you can forget about it. It can work either in blocking or non-blocking mode
*
* \param p_parent a vlc_object
* \return the input object id if non blocking, an error code else
*/
int __input_Read( vlc_object_t *p_parent, input_item_t *p_item,
- vlc_bool_t b_block )
+ bool b_block )
{
- vlc_bool_t b_sout_keep;
- sout_instance_t *p_sout = SoutFind( p_parent, p_item, &b_sout_keep );
input_thread_t *p_input;
- p_input = Create( p_parent, p_item, NULL, VLC_FALSE, p_sout );
- if( !p_input && p_sout )
- {
- SoutKeep( p_sout );
+ p_input = Create( p_parent, p_item, NULL, false, NULL );
+ if( !p_input )
return VLC_EGENERIC;
- }
- p_input->p->b_sout_keep = b_sout_keep;
if( b_block )
{
else
{
if( vlc_thread_create( p_input, "input", RunAndDestroy,
- VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
+ VLC_THREAD_PRIORITY_INPUT, true ) )
{
input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
- Destroy( p_input, NULL );
+ vlc_object_release( p_input );
return VLC_EGENERIC;
}
}
input_thread_t *p_input;
/* Allocate descriptor */
- p_input = Create( p_parent, p_item, NULL, VLC_TRUE, NULL );
+ p_input = Create( p_parent, p_item, NULL, true, NULL );
if( !p_input )
return VLC_EGENERIC;
if( !Init( p_input ) )
End( p_input );
- Destroy( p_input, NULL );
+ vlc_object_detach( p_input );
+ vlc_object_release( p_input );
return VLC_SUCCESS;
}
*
* \param the input thread to stop
*/
-void input_StopThread( input_thread_t *p_input )
+static void ObjectKillChildrens( vlc_object_t *p_obj )
{
vlc_list_t *p_list;
int i;
+ vlc_object_kill( p_obj );
- /* Set die for input */
- vlc_object_kill( p_input );
- /* FIXME: seems to be duplicated in ControlPush(INPUT_CONTROL_SET_DIE) */
-
- /* We cannot touch p_input fields directly (we come from another thread),
- * so use the vlc_object_find way, it's perfectly safe */
-
- /* Set die for all access */
- p_list = vlc_list_find( p_input, VLC_OBJECT_ACCESS, FIND_CHILD );
+ p_list = vlc_list_children( p_obj );
for( i = 0; i < p_list->i_count; i++ )
- {
- vlc_object_kill( p_list->p_values[i].p_object );
- }
- vlc_list_release( p_list );
-
- /* Set die for all stream */
- p_list = vlc_list_find( p_input, VLC_OBJECT_STREAM, FIND_CHILD );
- for( i = 0; i < p_list->i_count; i++ )
- {
- vlc_object_kill( p_list->p_values[i].p_object );
- }
- vlc_list_release( p_list );
-
- /* Set die for all demux */
- p_list = vlc_list_find( p_input, VLC_OBJECT_DEMUX, FIND_CHILD );
- for( i = 0; i < p_list->i_count; i++ )
- {
- vlc_object_kill( p_list->p_values[i].p_object );
- }
+ ObjectKillChildrens( p_list->p_values[i].p_object );
vlc_list_release( p_list );
-
- input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
}
-
-/**
- * Clean up a dead input thread
- * This function does not return until the thread is effectively cancelled.
- *
- * \param the input thread to kill
- */
-void input_DestroyThread( input_thread_t *p_input )
+void input_StopThread( input_thread_t *p_input )
{
- input_DestroyThreadExtended( p_input, NULL );
+ /* 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( VLC_OBJECT(p_input) );
+
+ input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
}
-void input_DestroyThreadExtended( input_thread_t *p_input, sout_instance_t **pp_sout )
+sout_instance_t * input_DetachSout( input_thread_t *p_input )
{
- /* Join the thread */
- vlc_thread_join( p_input );
-
- /* */
- Destroy( p_input, pp_sout );
+ sout_instance_t *p_sout = p_input->p->p_sout;
+ vlc_object_detach( p_sout );
+ p_input->p->p_sout = NULL;
+ return p_sout;
}
/*****************************************************************************
if( Init( p_input ) )
{
/* If we failed, wait before we are killed, and exit */
- p_input->b_error = VLC_TRUE;
- playlist_Signal( pl_Get( p_input ) );
+ p_input->b_error = true;
Error( p_input );
/* Tell we're dead */
- p_input->b_dead = VLC_TRUE;
+ p_input->b_dead = true;
return 0;
}
}
/* We have finished */
- p_input->b_eof = VLC_TRUE;
- playlist_Signal( pl_Get( p_input ) );
+ p_input->b_eof = true;
+ input_ChangeState( p_input, END_S );
}
/* Wait until we are asked to die */
}
/* We have finished */
- p_input->b_eof = VLC_TRUE;
+ p_input->b_eof = true;
}
/* Clean up */
exit:
/* Release memory */
- Destroy( p_input, NULL );
+ vlc_object_release( p_input );
return 0;
}
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 )
{
- vlc_bool_t b_force_update = VLC_FALSE;
+ bool b_force_update = false;
int i_ret;
int i_type;
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() ) )
p_input->p->input.p_demux->info.i_update )
{
i_ret = UpdateFromDemux( p_input );
- b_force_update = VLC_TRUE;
+ b_force_update = true;
}
else if( !p_input->p->input.b_title_demux &&
p_input->p->input.p_access &&
p_input->p->input.p_access->info.i_update )
{
i_ret = UpdateFromAccess( p_input );
- b_force_update = VLC_TRUE;
+ b_force_update = true;
}
}
{
/* End of file - we do not set b_die because only the
* playlist is allowed to do so. */
- input_ChangeState( p_input, END_S );
msg_Dbg( p_input, "EOF reached" );
- p_input->p->input.b_eof = VLC_TRUE;
+ p_input->p->input.b_eof = true;
}
else
{
}
else if( i_ret < 0 )
{
- p_input->b_error = VLC_TRUE;
+ p_input->b_error = true;
}
if( i_ret > 0 && p_input->p->i_slave > 0 )
{
msg_Dbg( p_input, "control type=%d", i_type );
if( Control( p_input, i_type, val ) )
- b_force_update = VLC_TRUE;
+ b_force_update = true;
}
vlc_mutex_unlock( &p_input->p->lock_control );
double f_pos;
int64_t i_time, i_length;
/* update input status variables */
- if( !demux2_Control( p_input->p->input.p_demux,
+ if( !demux_Control( p_input->p->input.p_demux,
DEMUX_GET_POSITION, &f_pos ) )
{
val.f_float = (float)f_pos;
var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
}
- if( !demux2_Control( p_input->p->input.p_demux,
+ if( !demux_Control( p_input->p->input.p_demux,
DEMUX_GET_TIME, &i_time ) )
{
p_input->i_time = i_time;
val.i_time = i_time;
var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
}
- if( !demux2_Control( p_input->p->input.p_demux,
+ if( !demux_Control( p_input->p->input.p_demux,
DEMUX_GET_LENGTH, &i_length ) )
{
vlc_value_t old_val;
}
}
- var_SetBool( p_input, "intf-change", VLC_TRUE );
- i_intf_update = mdate() + I64C(150000);
+ var_SetBool( p_input, "intf-change", true );
+ 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_playlist->p_stats_computer == p_input )
+ if( libvlc_priv (p_input->p_libvlc)->p_stats_computer == p_input )
{
- stats_ComputeGlobalStats( p_input->p_libvlc->p_playlist,
- p_input->p_libvlc->p_playlist->p_stats );
+ stats_ComputeGlobalStats( p_input->p_libvlc,
+ p_input->p_libvlc->p_stats );
}
}
}
}
-static int Init( input_thread_t * p_input )
+static void InitStatistics( input_thread_t * p_input )
+{
+ if( p_input->b_preparsing ) return;
+
+ /* Prepare statistics */
+#define INIT_COUNTER( c, type, compute ) p_input->p->counters.p_##c = \
+ stats_CounterCreate( p_input, VLC_VAR_##type, STATS_##compute);
+ if( libvlc_stats (p_input) )
+ {
+ INIT_COUNTER( read_bytes, INTEGER, COUNTER );
+ INIT_COUNTER( read_packets, INTEGER, COUNTER );
+ INIT_COUNTER( demux_read, INTEGER, COUNTER );
+ INIT_COUNTER( input_bitrate, FLOAT, DERIVATIVE );
+ INIT_COUNTER( demux_bitrate, FLOAT, DERIVATIVE );
+ INIT_COUNTER( played_abuffers, INTEGER, COUNTER );
+ INIT_COUNTER( lost_abuffers, INTEGER, COUNTER );
+ INIT_COUNTER( displayed_pictures, INTEGER, COUNTER );
+ INIT_COUNTER( lost_pictures, INTEGER, COUNTER );
+ INIT_COUNTER( decoded_audio, INTEGER, COUNTER );
+ INIT_COUNTER( decoded_video, INTEGER, COUNTER );
+ INIT_COUNTER( decoded_sub, INTEGER, COUNTER );
+ p_input->p->counters.p_sout_send_bitrate = NULL;
+ p_input->p->counters.p_sout_sent_packets = NULL;
+ p_input->p->counters.p_sout_sent_bytes = NULL;
+ if( p_input->p->counters.p_demux_bitrate )
+ p_input->p->counters.p_demux_bitrate->update_interval = 1000000;
+ if( p_input->p->counters.p_input_bitrate )
+ p_input->p->counters.p_input_bitrate->update_interval = 1000000;
+ }
+}
+
+#ifdef ENABLE_SOUT
+static int InitSout( input_thread_t * p_input )
{
char *psz;
- char *psz_subtitle;
- vlc_value_t val;
- double f_fps;
- vlc_meta_t *p_meta;
- int i_es_out_mode;
- int i, i_delay;
- /* Initialize optional stream output. (before access/demuxer)
- * XXX: we add a special case if the uri starts by vlc.
- * else 'vlc in.file --sout "" vlc:quit' cannot work (the output will
- * be destroyed in case of a file).
- * (this will break playing of file starting by 'vlc:' but I don't
- * want to add more logic, just force file by file:// or code it ;)
- */
- memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) );
- vlc_mutex_init( p_input, &p_input->p->counters.counters_lock );
+ if( p_input->b_preparsing ) return VLC_SUCCESS;
- for( i = 0; i < p_input->p->input.p_item->i_options; i++ )
+ /* 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 ) )
{
- if( !strncmp( p_input->p->input.p_item->ppsz_options[i], "meta-file", 9 ) )
+ /* Check the validity of the provided sout */
+ if( p_input->p->p_sout )
{
- 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 */
-#define INIT_COUNTER( c, type, compute ) p_input->p->counters.p_##c = \
- stats_CounterCreate( p_input, VLC_VAR_##type, STATS_##compute);
- if( p_input->p_libvlc->b_stats )
- {
- INIT_COUNTER( read_bytes, INTEGER, COUNTER );
- INIT_COUNTER( read_packets, INTEGER, COUNTER );
- INIT_COUNTER( demux_read, INTEGER, COUNTER );
- INIT_COUNTER( input_bitrate, FLOAT, DERIVATIVE );
- INIT_COUNTER( demux_bitrate, FLOAT, DERIVATIVE );
- INIT_COUNTER( played_abuffers, INTEGER, COUNTER );
- INIT_COUNTER( lost_abuffers, INTEGER, COUNTER );
- INIT_COUNTER( displayed_pictures, INTEGER, COUNTER );
- INIT_COUNTER( lost_pictures, INTEGER, COUNTER );
- INIT_COUNTER( decoded_audio, INTEGER, COUNTER );
- INIT_COUNTER( decoded_video, INTEGER, COUNTER );
- INIT_COUNTER( decoded_sub, INTEGER, COUNTER );
- p_input->p->counters.p_sout_send_bitrate = NULL;
- p_input->p->counters.p_sout_sent_packets = NULL;
- p_input->p->counters.p_sout_sent_bytes = NULL;
- if( p_input->p->counters.p_demux_bitrate )
- p_input->p->counters.p_demux_bitrate->update_interval = 1000000;
- if( p_input->p->counters.p_input_bitrate )
- p_input->p->counters.p_input_bitrate->update_interval = 1000000;
- }
-
- /* Find a usable sout and attach it to p_input */
- psz = var_GetNonEmptyString( p_input, "sout" );
- if( psz && strncasecmp( p_input->p->input.p_item->psz_uri, "vlc:", 4 ) )
- {
- /* Check the validity of the provided sout */
- if( p_input->p->p_sout )
+ if( strcmp( p_input->p->p_sout->psz_sout, psz ) )
{
- 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;
- }
- }
+ msg_Dbg( p_input, "destroying unusable sout" );
- 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;
- }
+ sout_DeleteInstance( p_input->p->p_sout );
+ p_input->p->p_sout = NULL;
}
+ }
- if( p_input->p_libvlc->b_stats )
+ if( p_input->p->p_sout )
+ {
+ /* Reuse it */
+ msg_Dbg( p_input, "sout keep: reusing sout" );
+ msg_Dbg( p_input, "sout keep: you probably want to use "
+ "gather stream_out" );
+ vlc_object_attach( p_input->p->p_sout, p_input );
+ }
+ else
+ {
+ /* Create a new one */
+ p_input->p->p_sout = sout_NewInstance( p_input, psz );
+ if( !p_input->p->p_sout )
{
- INIT_COUNTER( sout_sent_packets, INTEGER, COUNTER );
- INIT_COUNTER (sout_sent_bytes, INTEGER, COUNTER );
- INIT_COUNTER( sout_send_bitrate, FLOAT, DERIVATIVE );
- if( p_input->p->counters.p_sout_send_bitrate )
- p_input->p->counters.p_sout_send_bitrate->update_interval =
- 1000000;
+ input_ChangeState( p_input, ERROR_S );
+ msg_Err( p_input, "cannot start stream output instance, " \
+ "aborting" );
+ free( psz );
+ return VLC_EGENERIC;
}
}
- else if( p_input->p->p_sout )
+ if( libvlc_stats (p_input) )
{
- msg_Dbg( p_input, "destroying useless sout" );
-
- sout_DeleteInstance( p_input->p->p_sout );
- p_input->p->p_sout = NULL;
+ INIT_COUNTER( sout_sent_packets, INTEGER, COUNTER );
+ INIT_COUNTER (sout_sent_bytes, INTEGER, COUNTER );
+ INIT_COUNTER( sout_send_bitrate, FLOAT, DERIVATIVE );
+ if( p_input->p->counters.p_sout_send_bitrate )
+ p_input->p->counters.p_sout_send_bitrate->update_interval =
+ 1000000;
}
- free( psz );
}
-
- /* Create es out */
- p_input->p->p_es_out = input_EsOutNew( p_input, p_input->p->i_rate );
- es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, VLC_FALSE );
- es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE );
-
- var_Create( p_input, "bit-rate", VLC_VAR_INTEGER );
- var_Create( p_input, "sample-rate", VLC_VAR_INTEGER );
-
- if( InputSourceInit( p_input, &p_input->p->input,
- p_input->p->input.p_item->psz_uri, NULL ) )
+ else if( p_input->p->p_sout )
{
- goto error;
+ msg_Dbg( p_input, "destroying useless sout" );
+
+ sout_DeleteInstance( p_input->p->p_sout );
+ p_input->p->p_sout = NULL;
}
+ free( psz );
- /* Create global title (from master) */
- if( !p_input->b_preparsing )
- {
- p_input->p->i_title = p_input->p->input.i_title;
- p_input->p->title = p_input->p->input.title;
- p_input->p->i_title_offset = p_input->p->input.i_title_offset;
- p_input->p->i_seekpoint_offset = p_input->p->input.i_seekpoint_offset;
- if( p_input->p->i_title > 0 )
- {
- /* Setup variables */
- input_ControlVarNavigation( p_input );
- input_ControlVarTitle( p_input, 0 );
- }
+ return VLC_SUCCESS;
+}
+#endif
- /* 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;
+static void InitTitle( input_thread_t * p_input )
+{
+ vlc_value_t val;
- /* Fix pts delay */
- if( p_input->i_pts_delay < 0 )
- p_input->i_pts_delay = 0;
+ if( p_input->b_preparsing ) return;
- /* If the desynchronisation requested by the user is < 0, we need to
- * cache more data. */
- var_Get( p_input, "audio-desync", &val );
- if( val.i_int < 0 ) p_input->i_pts_delay -= (val.i_int * 1000);
+ /* Create global title (from master) */
+ p_input->p->i_title = p_input->p->input.i_title;
+ p_input->p->title = p_input->p->input.title;
+ p_input->p->i_title_offset = p_input->p->input.i_title_offset;
+ p_input->p->i_seekpoint_offset = p_input->p->input.i_seekpoint_offset;
+ if( p_input->p->i_title > 0 )
+ {
+ /* Setup variables */
+ input_ControlVarNavigation( p_input );
+ input_ControlVarTitle( p_input, 0 );
+ }
+
+ /* Global flag */
+ p_input->b_can_pace_control = p_input->p->input.b_can_pace_control;
+ p_input->p->b_can_pause = p_input->p->input.b_can_pause;
+ p_input->p->b_can_rate_control = p_input->p->input.b_can_rate_control;
+
+ /* Fix pts delay */
+ if( p_input->i_pts_delay < 0 )
+ p_input->i_pts_delay = 0;
+
+ /* If the desynchronisation requested by the user is < 0, we need to
+ * cache more data. */
+ var_Get( p_input, "audio-desync", &val );
+ if( val.i_int < 0 ) p_input->i_pts_delay -= (val.i_int * 1000);
+
+ /* Update cr_average depending on the caching */
+ p_input->p->input.i_cr_average *= (10 * p_input->i_pts_delay / 200000);
+ p_input->p->input.i_cr_average /= 10;
+ if( p_input->p->input.i_cr_average < 10 ) p_input->p->input.i_cr_average = 10;
+}
- /* Update cr_average depending on the caching */
- p_input->p->input.i_cr_average *= (10 * p_input->i_pts_delay / 200000);
- p_input->p->input.i_cr_average /= 10;
- if( p_input->p->input.i_cr_average < 10 ) p_input->p->input.i_cr_average = 10;
- }
+static void StartTitle( input_thread_t * p_input )
+{
+ double f_fps;
+ vlc_value_t val;
+ int i, i_delay;
+ char *psz;
+ char *psz_subtitle;
+ int64_t i_length;
- /* Load master infos */
- /* Init length */
- if( !demux2_Control( p_input->p->input.p_demux, DEMUX_GET_LENGTH,
- &val.i_time ) && val.i_time > 0 )
+ /* Start title/chapter */
+
+ if( p_input->b_preparsing )
{
- var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
- UpdateItemLength( p_input, val.i_time );
+ p_input->p->i_start = 0;
+ return;
}
- else
+
+ val.i_int = p_input->p->input.i_title_start -
+ p_input->p->input.i_title_offset;
+ if( val.i_int > 0 && val.i_int < p_input->p->input.i_title )
+ input_ControlPush( p_input, INPUT_CONTROL_SET_TITLE, &val );
+ val.i_int = p_input->p->input.i_seekpoint_start -
+ p_input->p->input.i_seekpoint_offset;
+ if( val.i_int > 0 /* TODO: check upper boundary */ )
+ input_ControlPush( p_input, INPUT_CONTROL_SET_SEEKPOINT, &val );
+
+ /* Start time*/
+ /* Set start time */
+ p_input->p->i_start = INT64_C(1000000) * var_GetInteger( p_input, "start-time" );
+ p_input->p->i_stop = INT64_C(1000000) * var_GetInteger( p_input, "stop-time" );
+ p_input->p->i_run = INT64_C(1000000) * var_GetInteger( p_input, "run-time" );
+ i_length = var_GetTime( p_input, "length" );
+ if( p_input->p->i_run < 0 )
{
- val.i_time = input_item_GetDuration( p_input->p->input.p_item );
- if( val.i_time > 0 )
- { /* fallback: gets length from metadata */
- var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
- UpdateItemLength( p_input, val.i_time );
- }
+ msg_Warn( p_input, "invalid run-time ignored" );
+ p_input->p->i_run = 0;
}
- /* Start title/chapter */
- if( !p_input->b_preparsing )
+ if( p_input->p->i_start > 0 )
{
- val.i_int = p_input->p->input.i_title_start -
- p_input->p->input.i_title_offset;
- if( val.i_int > 0 && val.i_int < p_input->p->input.i_title )
- input_ControlPush( p_input, INPUT_CONTROL_SET_TITLE, &val );
- val.i_int = p_input->p->input.i_seekpoint_start -
- p_input->p->input.i_seekpoint_offset;
- if( val.i_int > 0 /* TODO: check upper boundary */ )
- input_ControlPush( p_input, INPUT_CONTROL_SET_SEEKPOINT, &val );
-
- /* Start time*/
- /* Set start time */
- p_input->p->i_start = I64C(1000000) * var_GetInteger( p_input, "start-time" );
- p_input->p->i_stop = I64C(1000000) * var_GetInteger( p_input, "stop-time" );
- p_input->p->i_run = I64C(1000000) * var_GetInteger( p_input, "run-time" );
- if( p_input->p->i_run < 0 )
+ if( p_input->p->i_start >= i_length )
{
- msg_Warn( p_input, "invalid run-time ignored" );
- p_input->p->i_run = 0;
+ msg_Warn( p_input, "invalid start-time ignored" );
}
-
- if( p_input->p->i_start > 0 )
+ else
{
- if( p_input->p->i_start >= val.i_time )
- {
- msg_Warn( p_input, "invalid start-time ignored" );
- }
- else
- {
- vlc_value_t s;
+ vlc_value_t s;
- msg_Dbg( p_input, "starting at time: %ds",
- (int)( p_input->p->i_start / I64C(1000000) ) );
+ msg_Dbg( p_input, "starting at time: %ds",
+ (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 );
- }
+ s.i_time = p_input->p->i_start;
+ input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s );
}
- if( p_input->p->i_stop > 0 && p_input->p->i_stop <= p_input->p->i_start )
- {
- msg_Warn( p_input, "invalid stop-time ignored" );
- p_input->p->i_stop = 0;
- }
-
- /* Load subtitles */
- /* Get fps and set it if not already set */
- if( !demux2_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) &&
- f_fps > 1.0 )
- {
- float f_requested_fps;
+ }
+ if( p_input->p->i_stop > 0 && p_input->p->i_stop <= p_input->p->i_start )
+ {
+ msg_Warn( p_input, "invalid stop-time ignored" );
+ p_input->p->i_stop = 0;
+ }
- var_Create( p_input, "sub-original-fps", VLC_VAR_FLOAT );
- var_SetFloat( p_input, "sub-original-fps", f_fps );
+ /* Load subtitles */
+ /* Get fps and set it if not already set */
+ if( !demux_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) &&
+ f_fps > 1.0 )
+ {
+ float f_requested_fps;
- f_requested_fps = var_CreateGetFloat( p_input, "sub-fps" );
- if( f_requested_fps != f_fps )
- {
- var_Create( p_input, "sub-fps", VLC_VAR_FLOAT|
- VLC_VAR_DOINHERIT );
- var_SetFloat( p_input, "sub-fps", f_requested_fps );
- }
- }
+ var_Create( p_input, "sub-original-fps", VLC_VAR_FLOAT );
+ var_SetFloat( p_input, "sub-original-fps", f_fps );
- i_delay = var_CreateGetInteger( p_input, "sub-delay" );
- if( i_delay != 0 )
+ f_requested_fps = var_CreateGetFloat( p_input, "sub-fps" );
+ if( f_requested_fps != f_fps )
{
- var_SetTime( p_input, "spu-delay", (mtime_t)i_delay * 100000 );
+ var_Create( p_input, "sub-fps", VLC_VAR_FLOAT|
+ VLC_VAR_DOINHERIT );
+ var_SetFloat( p_input, "sub-fps", f_requested_fps );
}
+ }
- /* Look for and add subtitle files */
- psz_subtitle = var_GetNonEmptyString( p_input, "sub-file" );
- if( psz_subtitle != NULL )
+ i_delay = var_CreateGetInteger( p_input, "sub-delay" );
+ if( i_delay != 0 )
+ {
+ var_SetTime( p_input, "spu-delay", (mtime_t)i_delay * 100000 );
+ }
+
+ /* Look for and add subtitle files */
+ psz_subtitle = var_GetNonEmptyString( p_input, "sub-file" );
+ if( psz_subtitle != NULL )
+ {
+ msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle );
+ input_AddSubtitles( p_input, psz_subtitle, false );
+ }
+
+ var_Get( p_input, "sub-autodetect-file", &val );
+ if( val.b_bool )
+ {
+ char *psz_autopath = var_GetNonEmptyString( p_input, "sub-autodetect-path" );
+ char **subs = subtitles_Detect( p_input, psz_autopath,
+ p_input->p->input.p_item->psz_uri );
+ input_source_t *sub;
+ i = 0;
+ if( psz_autopath == NULL )
+ psz_autopath = strdup("");
+
+ /* Try to autoselect the first autodetected subtitles file
+ * if no subtitles file was specified */
+ if( ( psz_subtitle == NULL ) && subs && subs[0] )
{
- msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle );
- input_AddSubtitles( p_input, psz_subtitle, VLC_FALSE );
+ input_AddSubtitles( p_input, subs[0], false );
+ free( subs[0] );
+ i = 1;
}
- var_Get( p_input, "sub-autodetect-file", &val );
- if( val.b_bool )
+ /* Then, just add the following subtitles files */
+ for( ; subs && subs[i]; i++ )
{
- char *psz_autopath = var_GetNonEmptyString( p_input, "sub-autodetect-path" );
- char **subs = subtitles_Detect( p_input, psz_autopath,
- p_input->p->input.p_item->psz_uri );
- input_source_t *sub;
- i = 0;
- if( psz_autopath == NULL )
- psz_autopath = strdup("");
-
- /* Try to autoselect the first autodetected subtitles file
- * if no subtitles file was specified */
- if( ( psz_subtitle == NULL ) && subs && subs[0] )
- {
- input_AddSubtitles( p_input, subs[0], VLC_FALSE );
- free( subs[0] );
- i = 1;
- }
-
- /* Then, just add the following subtitles files */
- for( ; subs && subs[i]; i++ )
+ if( !psz_subtitle || 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" ) )
{
- sub = InputSourceNew( p_input );
- if( !InputSourceInit( p_input, sub, subs[i], "subtitle" ) )
- {
- TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub );
- }
- else free( sub );
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub );
}
- free( subs[i] );
+ else free( sub );
}
- if( subs ) free( subs );
- if( psz_autopath ) free( psz_autopath );
+ free( subs[i] );
}
- free( psz_subtitle );
+ free( subs );
+ free( psz_autopath );
+ }
+ free( psz_subtitle );
- /* Look for slave */
- psz = var_GetNonEmptyString( p_input, "input-slave" );
- if( psz != NULL )
+ /* Look for slave */
+ psz = var_GetNonEmptyString( p_input, "input-slave" );
+ if( psz != NULL )
+ {
+ char *psz_delim;
+ input_source_t *slave;
+ while( psz && *psz )
{
- char *psz_delim;
- input_source_t *slave;
- while( psz && *psz )
+ while( *psz == ' ' || *psz == '#' )
{
- while( *psz == ' ' || *psz == '#' )
- {
- psz++;
- }
- if( ( psz_delim = strchr( psz, '#' ) ) )
- {
- *psz_delim++ = '\0';
- }
- if( *psz == 0 )
- {
- break;
- }
+ psz++;
+ }
+ if( ( psz_delim = strchr( psz, '#' ) ) )
+ {
+ *psz_delim++ = '\0';
+ }
+ if( *psz == 0 )
+ {
+ break;
+ }
- msg_Dbg( p_input, "adding slave input '%s'", psz );
- slave = InputSourceNew( p_input );
- if( !InputSourceInit( p_input, slave, psz, NULL ) )
- {
- TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave );
- }
- else free( slave );
- psz = psz_delim;
+ msg_Dbg( p_input, "adding slave input '%s'", psz );
+ slave = InputSourceNew( p_input );
+ if( !InputSourceInit( p_input, slave, psz, NULL ) )
+ {
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave );
}
- free( psz );
+ else free( slave );
+ psz = psz_delim;
}
+ free( psz );
}
- else
- {
- p_input->p->i_start = 0;
- p_input->p->i_start = 0;
- }
+}
+
+static void InitPrograms( input_thread_t * p_input )
+{
+ int i_es_out_mode;
+ vlc_value_t val;
+
+ if( p_input->b_preparsing ) return;
/* Set up es_out */
- if( !p_input->b_preparsing )
+ 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 )
{
- es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, VLC_TRUE );
- i_es_out_mode = ES_OUT_MODE_AUTO;
- val.p_list = NULL;
- if( p_input->p->p_sout )
+ var_Get( p_input, "sout-all", &val );
+ if ( val.b_bool )
+ {
+ i_es_out_mode = ES_OUT_MODE_ALL;
+ val.p_list = NULL;
+ }
+ else
{
- var_Get( p_input, "sout-all", &val );
- if ( val.b_bool )
+ var_Get( p_input, "programs", &val );
+ if ( val.p_list && val.p_list->i_count )
{
- i_es_out_mode = ES_OUT_MODE_ALL;
- val.p_list = NULL;
+ i_es_out_mode = ES_OUT_MODE_PARTIAL;
+ /* Note : we should remove the "program" callback. */
}
else
- {
- var_Get( p_input, "programs", &val );
- if ( val.p_list && val.p_list->i_count )
- {
- i_es_out_mode = ES_OUT_MODE_PARTIAL;
- /* Note : we should remove the "program" callback. */
- }
- else
- var_Change( p_input, "programs", VLC_VAR_FREELIST, &val,
- NULL );
- }
+ var_Change( p_input, "programs", VLC_VAR_FREELIST, &val,
+ NULL );
}
- es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, i_es_out_mode );
+ }
+ es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, i_es_out_mode );
- /* Inform the demuxer about waited group (needed only for DVB) */
- if( i_es_out_mode == ES_OUT_MODE_ALL )
- {
- demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1, NULL );
- }
- else if( i_es_out_mode == ES_OUT_MODE_PARTIAL )
+ /* Inform the demuxer about waited group (needed only for DVB) */
+ if( i_es_out_mode == ES_OUT_MODE_ALL )
+ {
+ demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1, NULL );
+ }
+ else if( i_es_out_mode == ES_OUT_MODE_PARTIAL )
+ {
+ demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1,
+ val.p_list );
+ }
+ else
+ {
+ demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP,
+ (int) var_GetInteger( p_input, "program" ), NULL );
+ }
+}
+
+static int Init( input_thread_t * p_input )
+{
+ vlc_meta_t *p_meta;
+ vlc_value_t val;
+ int i, ret;
+
+ for( i = 0; i < p_input->p->input.p_item->i_options; i++ )
+ {
+ if( !strncmp( p_input->p->input.p_item->ppsz_options[i], "meta-file", 9 ) )
{
- demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1,
- val.p_list );
+ msg_Dbg( p_input, "Input is a meta file: disabling unneeded options" );
+ var_SetString( p_input, "sout", "" );
+ var_SetBool( p_input, "sout-all", false );
+ var_SetString( p_input, "input-slave", "" );
+ var_SetInteger( p_input, "input-repeat", 0 );
+ var_SetString( p_input, "sub-file", "" );
+ var_SetBool( p_input, "sub-autodetect-file", false );
}
- else
- {
- demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP,
- (int) var_GetInteger( p_input, "program" ), NULL );
+ }
+
+ InitStatistics( p_input );
+#ifdef ENABLE_SOUT
+ ret = InitSout( p_input );
+ if( ret != VLC_SUCCESS )
+ return ret; /* FIXME: goto error; should be better here */
+#endif
+
+ /* Create es out */
+ p_input->p->p_es_out = input_EsOutNew( p_input, p_input->p->i_rate );
+ es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, false );
+ es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE );
+
+ var_Create( p_input, "bit-rate", VLC_VAR_INTEGER );
+ var_Create( p_input, "sample-rate", VLC_VAR_INTEGER );
+
+ if( InputSourceInit( p_input, &p_input->p->input,
+ p_input->p->input.p_item->psz_uri, NULL ) )
+ {
+ goto error;
+ }
+
+ InitTitle( p_input );
+
+ /* Load master infos */
+ /* Init length */
+ if( !demux_Control( p_input->p->input.p_demux, DEMUX_GET_LENGTH,
+ &val.i_time ) && val.i_time > 0 )
+ {
+ var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
+ UpdateItemLength( p_input, val.i_time );
+ }
+ else
+ {
+ val.i_time = input_item_GetDuration( p_input->p->input.p_item );
+ if( val.i_time > 0 )
+ { /* fallback: gets length from metadata */
+ var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
+ UpdateItemLength( p_input, val.i_time );
}
+ }
- if( p_input->p->p_sout )
- {
- if( p_input->p->p_sout->i_out_pace_nocontrol > 0 )
- {
- p_input->p->b_out_pace_control = VLC_FALSE;
- }
- else
- {
- p_input->p->b_out_pace_control = VLC_TRUE;
- }
+ StartTitle( p_input );
- if( p_input->b_can_pace_control && p_input->p->b_out_pace_control )
- {
- /* We don't want a high input priority here or we'll
- * end-up sucking up all the CPU time */
- vlc_thread_set_priority( p_input, VLC_THREAD_PRIORITY_LOW );
- }
+ InitPrograms( p_input );
- msg_Dbg( p_input, "starting in %s mode",
- p_input->p->b_out_pace_control ? "async" : "sync" );
+ if( !p_input->b_preparsing && p_input->p->p_sout )
+ {
+ p_input->p->b_out_pace_control = (p_input->p->p_sout->i_out_pace_nocontrol > 0);
+
+ if( p_input->b_can_pace_control && p_input->p->b_out_pace_control )
+ {
+ /* We don't want a high input priority here or we'll
+ * end-up sucking up all the CPU time */
+ vlc_thread_set_priority( p_input, VLC_THREAD_PRIORITY_LOW );
}
+
+ msg_Dbg( p_input, "starting in %s mode",
+ p_input->p->b_out_pace_control ? "async" : "sync" );
}
p_meta = vlc_meta_New();
+
/* Get meta data from users */
InputMetaUser( p_input, p_meta );
DemuxMeta( p_input, p_meta, p_input->p->input.p_demux );
/* Access_file does not give any meta, and there are no slave */
- if( !p_input->b_preparsing )
- {
- if( p_input->p->input.p_access )
- access2_Control( p_input->p->input.p_access, ACCESS_GET_META,
- p_meta );
-
- /* Get meta data from slave input */
- for( i = 0; i < p_input->p->i_slave; i++ )
- {
- DemuxMeta( p_input, p_meta, p_input->p->slave[i]->p_demux );
- if( p_input->p->slave[i]->p_access )
- {
- access2_Control( p_input->p->slave[i]->p_access,
- ACCESS_GET_META, p_meta );
- }
- }
- }
+ AccessMeta( p_input, p_meta );
InputUpdateMeta( p_input, p_meta );
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 );\
input_ChangeState( p_input, END_S );
/* Clean control variables */
- input_ControlVarClean( p_input );
+ input_ControlVarStop( p_input );
/* Clean up master */
InputSourceClean( &p_input->p->input );
InputSourceClean( p_input->p->slave[i] );
free( p_input->p->slave[i] );
}
- if( p_input->p->slave ) free( p_input->p->slave );
+ free( p_input->p->slave );
/* Unload all modules */
if( p_input->p->p_es_out )
if( !p_input->b_preparsing )
{
#define CL_CO( c ) stats_CounterClean( p_input->p->counters.p_##c ); p_input->p->counters.p_##c = NULL;
- if( p_input->p_libvlc->b_stats )
+ 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_playlist->p_stats_computer == p_input )
+ if( priv->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;
+ stats_ComputeGlobalStats( p_input->p_libvlc,
+ p_input->p_libvlc->p_stats );
+ priv->p_stats_computer = NULL;
}
CL_CO( read_bytes );
CL_CO( read_packets );
TAB_CLEAN( p_input->p->i_attachment, p_input->p->attachment );
}
- vlc_mutex_destroy( &p_input->p->counters.counters_lock );
-
/* Tell we're dead */
- p_input->b_dead = VLC_TRUE;
-}
-
-static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, vlc_bool_t *pb_sout_keep )
-{
- vlc_bool_t b_keep_sout = var_CreateGetBool( p_parent, "sout-keep" );
- sout_instance_t *p_sout = NULL;
- int i;
-
- /* Search sout-keep options
- * XXX it has to be done here, but it is duplicated work :( */
- vlc_mutex_lock( &p_item->lock );
- for( i = 0; i < p_item->i_options; i++ )
- {
- const char *psz_option = p_item->ppsz_options[i];
- if( !psz_option )
- continue;
- if( *psz_option == ':' )
- psz_option++;
-
- if( !strcmp( psz_option, "sout-keep" ) )
- b_keep_sout = VLC_TRUE;
- else if( !strcmp( psz_option, "no-sout-keep" ) || !strcmp( psz_option, "nosout-keep" ) )
- b_keep_sout = VLC_FALSE;
- }
- vlc_mutex_unlock( &p_item->lock );
-
- /* Find a potential sout to reuse
- * XXX it might be unusable but this will be checked later */
- if( b_keep_sout )
- {
- /* Remove the sout from the playlist garbage collector */
- 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 );
+ p_input->b_dead = true;
}
/*****************************************************************************
}
}
-static vlc_bool_t Control( input_thread_t *p_input, int i_type,
+static bool Control( input_thread_t *p_input, int i_type,
vlc_value_t val )
{
- vlc_bool_t b_force_update = VLC_FALSE;
+ bool b_force_update = false;
if( !p_input ) return b_force_update;
{
case INPUT_CONTROL_SET_DIE:
msg_Dbg( p_input, "control: stopping input" );
- /* Mark all submodules to die */
- if( p_input->p->input.p_access )
- vlc_object_kill( p_input->p->input.p_access );
- if( p_input->p->input.p_stream )
- vlc_object_kill( p_input->p->input.p_stream );
- vlc_object_kill( p_input->p->input.p_demux );
- vlc_object_kill( p_input );
+ /* Mark all submodules to die */
+ ObjectKillChildrens( p_input );
break;
case INPUT_CONTROL_SET_POSITION:
else
{
/* Should not fail */
- demux2_Control( p_input->p->input.p_demux,
+ demux_Control( p_input->p->input.p_demux,
DEMUX_GET_POSITION, &f_pos );
f_pos += val.f_float;
}
if( f_pos > 1.0 ) f_pos = 1.0;
/* Reset the decoders states and clock sync (before calling the demuxer */
input_EsOutChangePosition( p_input->p->p_es_out );
- if( demux2_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION,
+ if( demux_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION,
f_pos ) )
{
msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) "
if( p_input->p->i_slave > 0 )
SlaveSeek( p_input );
- b_force_update = VLC_TRUE;
+ b_force_update = true;
}
break;
}
else
{
/* Should not fail */
- demux2_Control( p_input->p->input.p_demux,
+ demux_Control( p_input->p->input.p_demux,
DEMUX_GET_TIME, &i_time );
i_time += val.i_time;
}
/* Reset the decoders states and clock sync (before calling the demuxer */
input_EsOutChangePosition( p_input->p->p_es_out );
- i_ret = demux2_Control( p_input->p->input.p_demux,
+ i_ret = demux_Control( p_input->p->input.p_demux,
DEMUX_SET_TIME, i_time );
if( i_ret )
{
int64_t i_length;
/* Emulate it with a SET_POS */
- demux2_Control( p_input->p->input.p_demux,
+ demux_Control( p_input->p->input.p_demux,
DEMUX_GET_LENGTH, &i_length );
if( i_length > 0 )
{
double f_pos = (double)i_time / (double)i_length;
- i_ret = demux2_Control( p_input->p->input.p_demux,
+ i_ret = demux_Control( p_input->p->input.p_demux,
DEMUX_SET_POSITION, f_pos );
}
}
if( i_ret )
{
- msg_Warn( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) "I64Fd
+ msg_Warn( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) %"PRId64
" failed or not possible", i_time );
}
else
if( p_input->p->i_slave > 0 )
SlaveSeek( p_input );
- b_force_update = VLC_TRUE;
+ b_force_update = true;
}
break;
}
{
int i_ret;
if( p_input->p->input.p_access )
- i_ret = access2_Control( p_input->p->input.p_access,
- ACCESS_SET_PAUSE_STATE, VLC_FALSE );
+ i_ret = access_Control( p_input->p->input.p_access,
+ ACCESS_SET_PAUSE_STATE, false );
else
- i_ret = demux2_Control( p_input->p->input.p_demux,
- DEMUX_SET_PAUSE_STATE, VLC_FALSE );
+ i_ret = demux_Control( p_input->p->input.p_demux,
+ DEMUX_SET_PAUSE_STATE, false );
if( i_ret )
{
vlc_mutex_lock( &p_input->p->lock_control );
}
- b_force_update = VLC_TRUE;
+ b_force_update = true;
/* Switch to play */
- p_input->i_state = PLAYING_S;
- val.i_int = PLAYING_S;
- var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+ input_ChangeStateWithVarCallback( p_input, PLAYING_S, false );
/* */
if( !i_ret )
else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S &&
p_input->p->b_can_pause )
{
- int i_ret;
+ int i_ret, state;
if( p_input->p->input.p_access )
- i_ret = access2_Control( p_input->p->input.p_access,
- ACCESS_SET_PAUSE_STATE, VLC_TRUE );
+ i_ret = access_Control( p_input->p->input.p_access,
+ ACCESS_SET_PAUSE_STATE, true );
else
- i_ret = demux2_Control( p_input->p->input.p_demux,
- DEMUX_SET_PAUSE_STATE, VLC_TRUE );
+ i_ret = demux_Control( p_input->p->input.p_demux,
+ DEMUX_SET_PAUSE_STATE, true );
- b_force_update = VLC_TRUE;
+ b_force_update = true;
if( i_ret )
{
msg_Warn( p_input, "cannot set pause state" );
- val.i_int = p_input->i_state;
+ state = p_input->i_state;
}
else
{
- val.i_int = PAUSE_S;
+ state = PAUSE_S;
}
/* Switch to new state */
- p_input->i_state = val.i_int;
- var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+ input_ChangeStateWithVarCallback( p_input, state, false );
/* */
if( !i_ret )
}
else if( val.i_int == PAUSE_S && !p_input->p->b_can_pause )
{
- b_force_update = VLC_TRUE;
+ b_force_update = true;
/* Correct "state" value */
- val.i_int = p_input->i_state;
- var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+ input_ChangeStateWithVarCallback( p_input, p_input->i_state, false );
}
else if( val.i_int != PLAYING_S && val.i_int != PAUSE_S )
{
if( p_input->p->input.p_access )
i_ret = VLC_EGENERIC;
else
- i_ret = demux2_Control( p_input->p->input.p_demux,
+ i_ret = demux_Control( p_input->p->input.p_demux,
DEMUX_SET_RATE, &i_rate );
if( i_ret )
{
{
val.i_int = i_rate;
var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
- var_SetBool( p_input, "rate-change", VLC_TRUE );
+ var_SetBool( p_input, "rate-change", true );
p_input->p->i_rate = i_rate;
if( p_input->p->input.b_rescale_ts )
input_EsOutChangeRate( p_input->p->p_es_out, i_rate );
- b_force_update = VLC_TRUE;
+ b_force_update = true;
}
break;
}
es_out_Control( p_input->p->p_es_out,
ES_OUT_SET_GROUP, val.i_int );
- demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, val.i_int,
+ demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, val.i_int,
NULL );
break;
{
input_EsOutChangePosition( p_input->p->p_es_out );
- demux2_Control( p_demux, DEMUX_SET_TITLE, i_title );
+ demux_Control( p_demux, DEMUX_SET_TITLE, i_title );
input_ControlVarTitle( p_input, i_title );
}
}
{
input_EsOutChangePosition( p_input->p->p_es_out );
- access2_Control( p_access, ACCESS_SET_TITLE, i_title );
+ access_Control( p_access, ACCESS_SET_TITLE, i_title );
stream_AccessReset( p_input->p->input.p_stream );
}
}
i_seekpoint = p_demux->info.i_seekpoint;
i_seekpoint_time = p_input->p->input.title[p_demux->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
if( i_seekpoint_time >= 0 &&
- !demux2_Control( p_demux,
+ !demux_Control( p_demux,
DEMUX_GET_TIME, &i_input_time ) )
{
if ( i_input_time < i_seekpoint_time + 3000000 )
input_EsOutChangePosition( p_input->p->p_es_out );
- demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
+ demux_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
}
}
else if( p_input->p->input.i_title > 0 )
i_seekpoint = p_access->info.i_seekpoint;
i_seekpoint_time = p_input->p->input.title[p_access->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
if( i_seekpoint_time >= 0 &&
- demux2_Control( p_demux,
+ demux_Control( p_demux,
DEMUX_GET_TIME, &i_input_time ) )
{
if ( i_input_time < i_seekpoint_time + 3000000 )
{
input_EsOutChangePosition( p_input->p->p_es_out );
- access2_Control( p_access, ACCESS_SET_SEEKPOINT,
+ access_Control( p_access, ACCESS_SET_SEEKPOINT,
i_seekpoint );
stream_AccessReset( p_input->p->input.p_stream );
}
val.psz_string );
/* Set position */
- if( demux2_Control( p_input->p->input.p_demux,
+ if( demux_Control( p_input->p->input.p_demux,
DEMUX_GET_TIME, &i_time ) )
{
msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
free( slave );
break;
}
- if( demux2_Control( slave->p_demux,
+ if( demux_Control( slave->p_demux,
DEMUX_SET_TIME, i_time ) )
{
msg_Err( p_input, "seek failed for new slave" );
/* Get meta (access and demux) */
p_meta = vlc_meta_New();
- access2_Control( slave->p_access, ACCESS_GET_META,
+ access_Control( slave->p_access, ACCESS_GET_META,
p_meta );
- demux2_Control( slave->p_demux, DEMUX_GET_META, p_meta );
+ demux_Control( slave->p_demux, DEMUX_GET_META, p_meta );
InputUpdateMeta( p_input, p_meta );
TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave );
{
/* TODO maybe multi - access ? */
vlc_meta_t *p_meta = vlc_meta_New();
- access2_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta );
+ access_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta );
InputUpdateMeta( p_input, p_meta );
- var_SetInteger( pl_Get( p_input ), "item-change", p_input->p->input.p_item->i_id );
p_access->info.i_update &= ~INPUT_UPDATE_META;
}
static void UpdateItemLength( input_thread_t *p_input, int64_t i_length )
{
input_item_SetDuration( p_input->p->input.p_item, (mtime_t) i_length );
-
- if( !p_input->b_preparsing )
- {
- pl_Yield( p_input );
- var_SetInteger( pl_Get( p_input ), "item-change",
- p_input->p->input.p_item->i_id );
- pl_Release( p_input );
- }
}
/*****************************************************************************
static input_source_t *InputSourceNew( input_thread_t *p_input )
{
input_source_t *in = (input_source_t*) malloc( sizeof( input_source_t ) );
-
- if( !in )
- {
- msg_Err( p_input, "out of memory for new input source" );
- return NULL;
- }
-
- in->p_item = NULL;
- in->p_access = NULL;
- in->p_stream = NULL;
- in->p_demux = NULL;
- in->b_title_demux = VLC_FALSE;
- TAB_INIT( in->i_title, in->title );
- in->b_can_pause = VLC_TRUE;
- in->b_can_pace_control = VLC_TRUE;
- in->b_can_rate_control = VLC_TRUE;
- in->b_rescale_ts = VLC_TRUE;
- in->b_eof = VLC_FALSE;
- in->f_fps = 0.0;
- in->i_cr_average = 0;
-
+ if( in )
+ memset( in, 0, sizeof( input_source_t ) );
return in;
}
if( !p_input ) return VLC_EGENERIC;
/* Split uri */
+ 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 );
if( !p_input->b_preparsing )
{
- 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 );
-
/* Hack to allow udp://@:port syntax */
if( !psz_access ||
(strncmp( psz_access, "udp", 3 ) &&
{
psz_demux = psz_forced_demux;
}
- else if( !psz_demux || *psz_demux == '\0' )
+ else if( *psz_demux == '\0' )
{
/* special hack for forcing a demuxer with --demux=module
* (and do nothing with a list) */
/* Try access_demux if no demux given */
if( *psz_demux == '\0' )
{
- in->p_demux = demux2_New( p_input, psz_access, psz_demux, psz_path,
- NULL, p_input->p->p_es_out, VLC_FALSE );
+ in->p_demux = demux_New( p_input, psz_access, psz_demux, psz_path,
+ NULL, p_input->p->p_es_out, false );
}
}
else
{
- psz_path = psz_dup;
- if( !strncmp( psz_path, "file://", 7 ) )
- psz_path += 7;
+ /* Preparsing is only for file:// */
+ if( *psz_demux )
+ goto error;
+ if( !*psz_access ) /* path without scheme:// */
+ psz_access = "file";
+ if( strcmp( psz_access, "file" ) )
+ goto error;
msg_Dbg( p_input, "trying to pre-parse %s", psz_path );
- psz_demux = "";
- psz_access = "file";
}
if( in->p_demux )
int64_t i_pts_delay;
/* Get infos from access_demux */
- demux2_Control( in->p_demux,
+ demux_Control( in->p_demux,
DEMUX_GET_PTS_DELAY, &i_pts_delay );
p_input->i_pts_delay = __MAX( p_input->i_pts_delay, i_pts_delay );
- in->b_title_demux = VLC_TRUE;
- if( demux2_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
+ in->b_title_demux = true;
+ if( demux_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
&in->title, &in->i_title,
&in->i_title_offset, &in->i_seekpoint_offset ) )
{
in->i_title = 0;
in->title = NULL;
}
- if( demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE,
+ if( demux_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE,
&in->b_can_pace_control ) )
- in->b_can_pace_control = VLC_FALSE;
+ in->b_can_pace_control = false;
if( !in->b_can_pace_control )
{
- if( demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_RATE,
+ if( demux_Control( in->p_demux, DEMUX_CAN_CONTROL_RATE,
&in->b_can_rate_control, &in->b_rescale_ts ) )
{
- in->b_can_rate_control = VLC_FALSE;
- in->b_rescale_ts = VLC_TRUE; /* not used */
+ in->b_can_rate_control = false;
+ in->b_rescale_ts = true; /* not used */
}
}
else
{
- in->b_can_rate_control = VLC_TRUE;
- in->b_rescale_ts = VLC_TRUE;
+ in->b_can_rate_control = true;
+ in->b_rescale_ts = true;
}
- if( demux2_Control( in->p_demux, DEMUX_CAN_PAUSE,
+ if( demux_Control( in->p_demux, DEMUX_CAN_PAUSE,
&in->b_can_pause ) )
- in->b_can_pause = VLC_FALSE;
+ in->b_can_pause = false;
var_SetBool( p_input, "can-pause", in->b_can_pause );
- int ret = demux2_Control( in->p_demux, DEMUX_CAN_SEEK,
+ int ret = demux_Control( in->p_demux, DEMUX_CAN_SEEK,
&val.b_bool );
if( ret != VLC_SUCCESS )
- val.b_bool = VLC_FALSE;
+ val.b_bool = false;
var_Set( p_input, "seekable", val );
}
else
input_ChangeState( p_input, OPENING_S );
/* Now try a real access */
- in->p_access = access2_New( p_input, psz_access, psz_demux, psz_path,
- p_input->b_preparsing );
+ in->p_access = access_New( p_input, psz_access, psz_demux, psz_path );
/* Access failed, URL encoded ? */
if( in->p_access == NULL && strchr( psz_path, '%' ) )
msg_Dbg( p_input, "retrying with access `%s' demux `%s' path `%s'",
psz_access, psz_demux, psz_path );
- in->p_access = access2_New( p_input,
- psz_access, psz_demux, psz_path,
- p_input->b_preparsing );
+ in->p_access = access_New( p_input,
+ psz_access, psz_demux, psz_path );
}
if( in->p_access == NULL )
{
msg_Err( p_input, "open of `%s' failed: %s", psz_mrl,
msg_StackMsg() );
- intf_UserFatal( VLC_OBJECT( p_input), VLC_FALSE,
+ intf_UserFatal( VLC_OBJECT( p_input), false,
_("Your input can't be opened"),
_("VLC is unable to open the MRL '%s'."
" Check the log for details."), psz_mrl );
if( end )
*end++ = '\0';
- in->p_access = access2_FilterNew( in->p_access, psz );
+ in->p_access = access_FilterNew( in->p_access, psz );
if( in->p_access == NULL )
{
in->p_access = p_access;
/* Get infos from access */
if( !p_input->b_preparsing )
{
- access2_Control( in->p_access,
+ access_Control( in->p_access,
ACCESS_GET_PTS_DELAY, &i_pts_delay );
p_input->i_pts_delay = __MAX( p_input->i_pts_delay, i_pts_delay );
- in->b_title_demux = VLC_FALSE;
- if( access2_Control( in->p_access, ACCESS_GET_TITLE_INFO,
+ in->b_title_demux = false;
+ if( access_Control( in->p_access, ACCESS_GET_TITLE_INFO,
&in->title, &in->i_title,
&in->i_title_offset, &in->i_seekpoint_offset ) )
in->i_title = 0;
in->title = NULL;
}
- access2_Control( in->p_access, ACCESS_CAN_CONTROL_PACE,
+ access_Control( in->p_access, ACCESS_CAN_CONTROL_PACE,
&in->b_can_pace_control );
in->b_can_rate_control = in->b_can_pace_control;
- in->b_rescale_ts = VLC_TRUE;
+ in->b_rescale_ts = true;
- access2_Control( in->p_access, ACCESS_CAN_PAUSE,
+ access_Control( in->p_access, ACCESS_CAN_PAUSE,
&in->b_can_pause );
var_SetBool( p_input, "can-pause", in->b_can_pause );
- access2_Control( in->p_access, ACCESS_CAN_SEEK,
+ access_Control( in->p_access, ACCESS_CAN_SEEK,
&val.b_bool );
var_Set( p_input, "seekable", val );
}
{
psz_real_path = psz_path;
}
- in->p_demux = demux2_New( p_input, psz_access, psz_demux,
+ in->p_demux = demux_New( p_input, psz_access, psz_demux,
psz_real_path,
in->p_stream, p_input->p->p_es_out,
p_input->b_preparsing );
{
msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
psz_access, psz_demux, psz_path );
- intf_UserFatal( VLC_OBJECT( p_input ), VLC_FALSE,
+ intf_UserFatal( VLC_OBJECT( p_input ), false,
_("VLC can't recognize the input's format"),
_("The format of '%s' cannot be detected. "
"Have a look the log for details."), psz_mrl );
/* Get title from demux */
if( !p_input->b_preparsing && in->i_title <= 0 )
{
- if( demux2_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
+ if( demux_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
&in->title, &in->i_title,
&in->i_title_offset, &in->i_seekpoint_offset ))
{
}
else
{
- in->b_title_demux = VLC_TRUE;
+ in->b_title_demux = true;
}
}
}
{
int i_attachment;
input_attachment_t **attachment;
- if( !demux2_Control( in->p_demux, DEMUX_GET_ATTACHMENTS,
+ if( !demux_Control( in->p_demux, DEMUX_GET_ATTACHMENTS,
&attachment, &i_attachment ) )
{
vlc_mutex_lock( &p_input->p->input.p_item->lock );
vlc_mutex_unlock( &p_input->p->input.p_item->lock );
}
}
- if( !demux2_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) )
+ if( !demux_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) )
{
vlc_mutex_lock( &p_input->p->input.p_item->lock );
in->f_fps = f_fps;
input_ChangeState( p_input, ERROR_S );
if( in->p_demux )
- demux2_Delete( in->p_demux );
+ demux_Delete( in->p_demux );
if( in->p_stream )
stream_Delete( in->p_stream );
if( in->p_access )
- access2_Delete( in->p_access );
+ access_Delete( in->p_access );
return VLC_EGENERIC;
}
int i;
if( in->p_demux )
- demux2_Delete( in->p_demux );
+ demux_Delete( in->p_demux );
if( in->p_stream )
stream_Delete( in->p_stream );
if( in->p_access )
- access2_Delete( in->p_access );
+ access_Delete( in->p_access );
if( in->i_title > 0 )
{
int64_t i_time;
int i;
- if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
+ if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
{
msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
return;
if( in->b_eof )
continue;
- if( demux2_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) )
+ if( demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) )
{
for( ;; )
{
int64_t i_stime;
- if( demux2_Control( in->p_demux, DEMUX_GET_TIME, &i_stime ) )
+ if( demux_Control( in->p_demux, DEMUX_GET_TIME, &i_stime ) )
{
msg_Err( p_input, "slave[%d] doesn't like "
"DEMUX_GET_TIME -> EOF", i );
if( i_ret <= 0 )
{
msg_Dbg( p_input, "slave %d EOF", i );
- in->b_eof = VLC_TRUE;
+ in->b_eof = true;
}
}
}
if( !p_input ) return;
- if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
+ if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
{
msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
return;
{
input_source_t *in = p_input->p->slave[i];
- if( demux2_Control( in->p_demux, DEMUX_SET_TIME, i_time ) )
+ if( demux_Control( in->p_demux, DEMUX_SET_TIME, i_time ) )
{
msg_Err( p_input, "seek failed for slave %d -> EOF", i );
- in->b_eof = VLC_TRUE;
+ in->b_eof = true;
}
}
}
input_item_t *p_item = p_input->p->input.p_item;
char * psz_arturl = NULL;
char *psz_title = NULL;
- int i;
- int i_arturl_event = VLC_FALSE;
+ int i_arturl_event = false;
if( !p_meta )
return;
if( psz_arturl && *psz_arturl )
{
vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, psz_arturl );
- i_arturl_event = VLC_TRUE;
+ i_arturl_event = true;
}
vlc_meta_Delete( p_meta );
if( p_input->p->p_sout && !p_input->b_preparsing )
{
vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, "" );
- i_arturl_event = VLC_TRUE;
+ i_arturl_event = true;
}
else
}
vlc_mutex_unlock( &p_item->lock );
- input_item_SetPreparsed( p_item, VLC_TRUE );
+ input_item_SetPreparsed( p_item, true );
- if( i_arturl_event == VLC_TRUE )
+ if( i_arturl_event == true )
{
vlc_event_t event;
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 */
}
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 );
+ free( pp_new );
/* */
*pi_attachment = i_attachment;
*ppp_attachment = attachment;
}
+static void AccessMeta( input_thread_t * p_input, vlc_meta_t *p_meta )
+{
+ int i;
+
+ if( p_input->b_preparsing )
+ return;
+
+ if( p_input->p->input.p_access )
+ access_Control( p_input->p->input.p_access, ACCESS_GET_META,
+ p_meta );
+
+ /* Get meta data from slave input */
+ for( i = 0; i < p_input->p->i_slave; i++ )
+ {
+ DemuxMeta( p_input, p_meta, p_input->p->slave[i]->p_demux );
+ if( p_input->p->slave[i]->p_access )
+ {
+ access_Control( p_input->p->slave[i]->p_access,
+ ACCESS_GET_META, p_meta );
+ }
+ }
+}
+
static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_demux )
{
- vlc_bool_t b_bool;
+ bool b_bool;
module_t *p_id3;
vlc_mutex_unlock( &p_item->lock );
#endif
- demux2_Control( p_demux, DEMUX_GET_META, p_meta );
- if( demux2_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) )
+ demux_Control( p_demux, DEMUX_GET_META, p_meta );
+ if( demux_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) )
return;
if( !b_bool )
return;
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
{
/*****************************************************************************
* input_AddSubtitles: add a subtitles file and enable it
*****************************************************************************/
-vlc_bool_t input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle,
- vlc_bool_t b_check_extension )
+bool input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle,
+ bool b_check_extension )
{
input_source_t *sub;
vlc_value_t count;
if( b_check_extension && !subtitles_Filter( psz_subtitle ) )
{
- return VLC_FALSE;
+ return false;
}
/* if we are provided a subtitle.sub file,
}
else free( sub );
- return VLC_TRUE;
+ return true;
+}
+
+/*****************************************************************************
+ * input_get_event_manager
+ *****************************************************************************/
+vlc_event_manager_t *
+input_get_event_manager( input_thread_t *p_input )
+{
+ return &p_input->p->event_manager;
}
projects / vlc / blobdiff