#include "access.h"
#include "demux.h"
#include "stream.h"
+#include "item.h"
+#include "ressource.h"
#include <vlc_sout.h>
#include "../stream_output/stream_output.h"
static void *RunAndDestroy ( vlc_object_t *p_this );
static input_thread_t * Create ( vlc_object_t *, input_item_t *,
- const char *, bool, sout_instance_t * );
+ const char *, bool, input_ressource_t * );
static int Init ( input_thread_t *p_input );
-static void WaitDie ( 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 void ControlReduce( input_thread_t * );
static bool Control( input_thread_t *, int, vlc_value_t );
-static int UpdateFromAccess( input_thread_t * );
-static int UpdateFromDemux( input_thread_t * );
+static int UpdateTitleSeekpointFromAccess( input_thread_t * );
+static void UpdateGenericFromAccess( input_thread_t * );
+
+static int UpdateTitleSeekpointFromDemux( input_thread_t * );
+static void UpdateGenericFromDemux( input_thread_t * );
static void MRLSections( input_thread_t *, char *, int *, int *, int *, int *);
static int InputSourceInit( input_thread_t *, input_source_t *,
const char *, const char *psz_forced_demux );
static void InputSourceClean( input_source_t * );
+static void InputSourceMeta( input_thread_t *, input_source_t *, vlc_meta_t * );
+
/* TODO */
//static void InputGetAttachments( input_thread_t *, input_source_t * );
static void SlaveDemux( input_thread_t *p_input );
static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta );
static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta );
-static char *InputGetExtraFiles( input_thread_t *p_input,
- const char *psz_access, const char *psz_path );
+static void InputGetExtraFiles( input_thread_t *p_input,
+ int *pi_list, char ***pppsz_list,
+ const char *psz_access, const char *psz_path );
-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 );
*****************************************************************************/
static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
const char *psz_header, bool b_quick,
- sout_instance_t *p_sout )
+ input_ressource_t *p_ressource )
{
static const char input_name[] = "input";
input_thread_t *p_input = NULL; /* thread descriptor */
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 = false;
- p_input->b_can_pace_control = true;
+ p_input->p->b_can_pace_control = true;
p_input->p->i_start = 0;
- p_input->i_time = 0;
+ p_input->p->i_time = 0;
p_input->p->i_stop = 0;
p_input->p->i_run = 0;
p_input->p->i_title = 0;
p_input->p->title = NULL;
p_input->p->i_title_offset = p_input->p->i_seekpoint_offset = 0;
- p_input->i_state = INIT_S;
+ p_input->p->i_state = INIT_S;
p_input->p->i_rate = INPUT_RATE_DEFAULT;
p_input->p->b_recording = false;
- TAB_INIT( p_input->p->i_bookmark, p_input->p->bookmark );
+ memset( &p_input->p->bookmark, 0, sizeof(p_input->p->bookmark) );
+ TAB_INIT( p_input->p->i_bookmark, p_input->p->pp_bookmark );
TAB_INIT( p_input->p->i_attachment, p_input->p->attachment );
p_input->p->p_es_out_display = NULL;
p_input->p->p_es_out = NULL;
p_input->p->p_sout = NULL;
p_input->p->b_out_pace_control = false;
- p_input->i_pts_delay = 0;
+ p_input->p->i_pts_delay = 0;
+ p_input->p->i_cr_average = 0;
- /* Init Input fields */
vlc_gc_incref( p_item ); /* Released in Destructor() */
- p_input->p->input.p_item = p_item;
+ p_input->p->p_item = p_item;
+
+ /* Init Input fields */
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_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->i_slave = 0;
p_input->p->slave = NULL;
+ /* */
+ if( p_ressource )
+ p_input->p->p_ressource = p_ressource;
+ else
+ p_input->p->p_ressource = input_ressource_New();
+ input_ressource_SetInput( p_input->p->p_ressource, p_input );
+
/* Init control buffer */
vlc_mutex_init( &p_input->p->lock_control );
vlc_cond_init( &p_input->p->wait_control );
input_ControlVarInit( p_input );
/* */
- p_input->p->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
+ p_input->p->i_cr_average = var_GetInteger( p_input, "cr-average" );
if( !p_input->b_preparsing )
{
p_input->i_flags |= OBJECT_FLAGS_QUIET | OBJECT_FLAGS_NOINTERACT;
/* */
- if( p_sout )
- p_input->p->p_sout = p_sout;
-
memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) );
vlc_mutex_init( &p_input->p->counters.counters_lock );
static void Destructor( input_thread_t * p_input )
{
#ifndef NDEBUG
- char * psz_name = input_item_GetName( p_input->p->input.p_item );
+ char * psz_name = input_item_GetName( p_input->p->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( p_input->p->p_sout )
- sout_DeleteInstance( p_input->p->p_sout );
-#endif
- vlc_gc_decref( p_input->p->input.p_item );
+
+ if( p_input->p->p_ressource )
+ input_ressource_Delete( p_input->p->p_ressource );
+
+ vlc_gc_decref( p_input->p->p_item );
vlc_mutex_destroy( &p_input->p->counters.counters_lock );
/* */
input_thread_t *__input_CreateThreadExtended( vlc_object_t *p_parent,
input_item_t *p_item,
- const char *psz_log, sout_instance_t *p_sout )
+ const char *psz_log, input_ressource_t *p_ressource )
{
input_thread_t *p_input;
- p_input = Create( p_parent, p_item, psz_log, false, p_sout );
+ p_input = Create( p_parent, p_item, psz_log, false, p_ressource );
if( !p_input )
return NULL;
/* Create thread and wait for its readiness. */
if( vlc_thread_create( p_input, "input", Run,
- VLC_THREAD_PRIORITY_INPUT, false ) )
+ VLC_THREAD_PRIORITY_INPUT ) )
{
input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
else
{
if( vlc_thread_create( p_input, "input", RunAndDestroy,
- VLC_THREAD_PRIORITY_INPUT, false ) )
+ VLC_THREAD_PRIORITY_INPUT ) )
{
input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
*
* \param the input thread to stop
*/
+void input_StopThread( input_thread_t *p_input )
+{
+ /* 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) );
+
+ input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
+}
+
+input_ressource_t *input_DetachRessource( 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 );
+
+ p_input->p->p_ressource = NULL;
+ p_input->p->p_sout = NULL;
+
+ return p_ressource;
+}
+
+/**
+ * Get the item from an input thread
+ * FIXME it does not increase ref count of the item.
+ * if it is used after p_input is destroyed nothing prevent it from
+ * being freed.
+ */
+input_item_t *input_GetItem( input_thread_t *p_input )
+{
+ assert( p_input && p_input->p );
+ return p_input->p->p_item;
+}
+
+/*****************************************************************************
+ * ObjectKillChildrens
+ *****************************************************************************/
static void ObjectKillChildrens( input_thread_t *p_input, vlc_object_t *p_obj )
{
vlc_list_t *p_list;
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 ||
- p_obj == VLC_OBJECT(p_input->p->p_sout) )
+ 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 )
return;
vlc_object_kill( p_obj );
ObjectKillChildrens( p_input, p_list->p_values[i].p_object );
vlc_list_release( p_list );
}
-void input_StopThread( input_thread_t *p_input )
-{
- /* 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) );
-
- input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
-}
-
-sout_instance_t *input_DetachSout( input_thread_t *p_input )
-{
- assert( p_input->b_dead );
- sout_instance_t *p_sout = p_input->p->p_sout;
- vlc_object_detach( p_sout );
- p_input->p->p_sout = NULL;
- return p_sout;
-}
/*****************************************************************************
* Run: main thread loop
const int canc = vlc_savecancel();
if( Init( p_input ) )
- {
- /* If we failed, wait before we are killed, and exit */
- WaitDie( p_input );
goto exit;
- }
MainLoop( p_input );
- /* Wait until we are asked to die */
- if( !p_input->b_die )
- WaitDie( p_input );
-
/* Clean up */
End( p_input );
exit:
- p_input->b_dead = true;
+ /* Tell we're dead */
+ input_SendEventDead( p_input );
vlc_restorecancel( canc );
return NULL;
}
*pb_changed = false;
- if( ( p_input->p->i_stop > 0 && p_input->i_time >= p_input->p->i_stop ) ||
+ if( ( p_input->p->i_stop > 0 && p_input->p->i_time >= p_input->p->i_stop ) ||
( p_input->p->i_run > 0 && *pi_start_mdate+p_input->p->i_run < mdate() ) )
i_ret = 0; /* EOF */
else
- i_ret = p_input->p->input.p_demux->pf_demux(p_input->p->input.p_demux);
+ i_ret = demux_Demux( p_input->p->input.p_demux );
if( i_ret > 0 )
{
- /* TODO */
- if( p_input->p->input.b_title_demux &&
- p_input->p->input.p_demux->info.i_update )
+ if( p_input->p->input.p_demux->info.i_update )
{
- i_ret = UpdateFromDemux( p_input );
- *pb_changed = true;
+ if( p_input->p->input.b_title_demux )
+ {
+ i_ret = UpdateTitleSeekpointFromDemux( p_input );
+ *pb_changed = true;
+ }
+ UpdateGenericFromDemux( p_input );
}
- else if( !p_input->p->input.b_title_demux &&
- p_input->p->input.p_access &&
- p_input->p->input.p_access->info.i_update )
+ else if( p_input->p->input.p_access &&
+ p_input->p->input.p_access->info.i_update )
{
- i_ret = UpdateFromAccess( p_input );
- *pb_changed = true;
+ if( !p_input->p->input.b_title_demux )
+ {
+ i_ret = UpdateTitleSeekpointFromAccess( p_input );
+ *pb_changed = true;
+ }
+ UpdateGenericFromAccess( p_input );
}
}
*/
static void MainLoopInterface( input_thread_t *p_input )
{
- input_event_times_t ev;
-
- ev.f_position = 0.0;
- ev.i_time = 0;
- ev.i_length = 0;
+ double f_position = 0.0;
+ mtime_t i_time = 0;
+ mtime_t i_length = 0;
/* update input status variables */
if( demux_Control( p_input->p->input.p_demux,
- DEMUX_GET_POSITION, &ev.f_position ) )
- ev.f_position = 0.0;
+ DEMUX_GET_POSITION, &f_position ) )
+ f_position = 0.0;
if( demux_Control( p_input->p->input.p_demux,
- DEMUX_GET_TIME, &ev.i_time ) )
- ev.i_time = 0;
+ DEMUX_GET_TIME, &i_time ) )
+ i_time = 0;
+ p_input->p->i_time = i_time;
if( demux_Control( p_input->p->input.p_demux,
- DEMUX_GET_LENGTH, &ev.i_length ) )
- ev.i_length = 0;
+ DEMUX_GET_LENGTH, &i_length ) )
+ i_length = 0;
+
+ es_out_SetTimes( p_input->p->p_es_out, f_position, i_time, i_length );
- input_SendEventTimes( p_input, &ev );
+ /* update current bookmark */
+ vlc_mutex_lock( &p_input->p->p_item->lock );
+ p_input->p->bookmark.i_time_offset = i_time;
+ if( p_input->p->input.p_stream )
+ p_input->p->bookmark.i_byte_offset = stream_Tell( p_input->p->input.p_stream );
+ vlc_mutex_unlock( &p_input->p->p_item->lock );
}
/**
*/
static void MainLoopStatistic( input_thread_t *p_input )
{
- stats_ComputeInputStats( p_input, p_input->p->input.p_item->p_stats );
+ 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 )
{
/* Demux data */
b_force_update = false;
i_wakeup = 0;
- /* FIXME if p_input->i_state == PAUSE_S the access/access_demux
+ /* FIXME if p_input->p->i_state == PAUSE_S the access/access_demux
* is paused -> this may cause problem with some of them
* The same problem can be seen when seeking while paused */
- b_paused = p_input->i_state == PAUSE_S &&
+ b_paused = p_input->p->i_state == PAUSE_S &&
!es_out_GetBuffering( p_input->p->p_es_out );
if( !b_paused )
#ifdef ENABLE_SOUT
static int InitSout( input_thread_t * p_input )
{
- char *psz;
-
- if( p_input->b_preparsing ) return VLC_SUCCESS;
+ if( p_input->b_preparsing )
+ return VLC_SUCCESS;
/* 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 ) )
+ char *psz = var_GetNonEmptyString( p_input, "sout" );
+ if( psz && strncasecmp( p_input->p->p_item->psz_uri, "vlc:", 4 ) )
{
- /* Check the validity of the provided sout */
- if( p_input->p->p_sout )
+ p_input->p->p_sout = input_ressource_RequestSout( p_input->p->p_ressource, NULL, psz );
+ if( !p_input->p->p_sout )
{
- if( strcmp( p_input->p->p_sout->psz_sout, psz ) )
- {
- msg_Dbg( p_input, "destroying unusable sout" );
-
- sout_DeleteInstance( p_input->p->p_sout );
- p_input->p->p_sout = NULL;
- }
- }
-
- if( p_input->p->p_sout )
- {
- /* Reuse it */
- msg_Dbg( p_input, "sout keep: reusing sout" );
- msg_Dbg( p_input, "sout keep: you probably want to use "
- "gather stream_out" );
- vlc_object_attach( p_input->p->p_sout, p_input );
- }
- else
- {
- /* Create a new one */
- p_input->p->p_sout = sout_NewInstance( p_input, psz );
- if( !p_input->p->p_sout )
- {
- input_ChangeState( p_input, ERROR_S );
- msg_Err( p_input, "cannot start stream output instance, " \
- "aborting" );
- free( psz );
- return VLC_EGENERIC;
- }
+ input_ChangeState( p_input, ERROR_S );
+ msg_Err( p_input, "cannot start stream output instance, " \
+ "aborting" );
+ free( psz );
+ return VLC_EGENERIC;
}
if( libvlc_stats( p_input ) )
{
1000000;
}
}
- else if( p_input->p->p_sout )
+ else
{
- msg_Dbg( p_input, "destroying useless sout" );
-
- sout_DeleteInstance( p_input->p->p_sout );
- p_input->p->p_sout = NULL;
+ input_ressource_RequestSout( p_input->p->p_ressource, NULL, NULL );
}
free( psz );
static void InitTitle( input_thread_t * p_input )
{
- vlc_value_t val;
+ input_source_t *p_master = &p_input->p->input;
- if( p_input->b_preparsing ) return;
+ if( p_input->b_preparsing )
+ return;
/* 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;
+ p_input->p->i_title = p_master->i_title;
+ p_input->p->title = p_master->title;
+ p_input->p->i_title_offset = p_master->i_title_offset;
+ p_input->p->i_seekpoint_offset = p_master->i_seekpoint_offset;
if( p_input->p->i_title > 0 )
{
/* Setup variables */
}
/* 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;
+ 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->i_pts_delay < 0 )
- p_input->i_pts_delay = 0;
+ 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. */
- var_Get( p_input, "audio-desync", &val );
- if( val.i_int < 0 )
- p_input->i_pts_delay -= (val.i_int * 1000);
+ 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->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;
+ 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 )
{
- double f_fps;
vlc_value_t val;
- int i_delay;
- char *psz;
- char *psz_subtitle;
- int64_t i_length;
/* Start title/chapter */
-
- if( p_input->b_preparsing )
- {
- p_input->p->i_start = 0;
- return;
- }
-
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 */
+ /* Start/stop/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" );
p_input->p->i_run = 0;
}
+ const mtime_t i_length = var_GetTime( p_input, "length" );
if( p_input->p->i_start > 0 )
{
if( p_input->p->i_start >= i_length )
msg_Warn( p_input, "invalid stop-time ignored" );
p_input->p->i_stop = 0;
}
+}
+static void LoadSubtitles( input_thread_t *p_input )
+{
/* 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 )
+ const double f_fps = p_input->p->f_fps;
+ if( f_fps > 1.0 )
{
float f_requested_fps;
}
}
- i_delay = var_CreateGetInteger( p_input, "sub-delay" );
+ const int 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" );
+ char *psz_subtitle = var_GetNonEmptyString( p_input, "sub-file" );
if( psz_subtitle != NULL )
{
msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle );
SubtitleAdd( p_input, psz_subtitle, true );
}
- var_Get( p_input, "sub-autodetect-file", &val );
- if( val.b_bool )
+ if( var_GetBool( p_input, "sub-autodetect-file" ) )
{
char *psz_autopath = var_GetNonEmptyString( p_input, "sub-autodetect-path" );
char **ppsz_subs = subtitles_Detect( p_input, psz_autopath,
- p_input->p->input.p_item->psz_uri );
+ p_input->p->p_item->psz_uri );
free( psz_autopath );
for( int i = 0; ppsz_subs && ppsz_subs[i]; i++ )
free( ppsz_subs );
}
free( psz_subtitle );
+}
+
+static void LoadSlaves( input_thread_t *p_input )
+{
+ char *psz = var_GetNonEmptyString( p_input, "input-slave" );
+ if( !psz )
+ return;
- /* Look for slave */
- psz = var_GetNonEmptyString( p_input, "input-slave" );
- if( psz != NULL )
+ char *psz_org = psz;
+ while( psz && *psz )
{
- char *psz_delim;
- input_source_t *slave;
- while( psz && *psz )
- {
- while( *psz == ' ' || *psz == '#' )
- {
- psz++;
- }
- if( ( psz_delim = strchr( psz, '#' ) ) )
- {
- *psz_delim++ = '\0';
- }
- if( *psz == 0 )
- {
- break;
- }
+ while( *psz == ' ' || *psz == '#' )
+ psz++;
- msg_Dbg( p_input, "adding slave input '%s'", psz );
- slave = InputSourceNew( p_input );
- if( !InputSourceInit( p_input, slave, psz, NULL ) )
- {
- TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave );
- }
- else free( slave );
- psz = psz_delim;
- }
- free( psz );
+ char *psz_delim = strchr( psz, '#' );
+ if( psz_delim )
+ *psz_delim++ = '\0';
+
+ if( *psz == 0 )
+ break;
+
+ msg_Dbg( p_input, "adding slave input '%s'", psz );
+
+ input_source_t *p_slave = InputSourceNew( p_input );
+ if( p_slave && !InputSourceInit( p_input, p_slave, psz, NULL ) )
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, p_slave );
+ else
+ free( p_slave );
+
+ psz = psz_delim;
}
+ free( psz_org );
}
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 */
es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, true );
i_es_out_mode = ES_OUT_MODE_AUTO;
vlc_meta_t *p_meta;
int i, ret;
- for( i = 0; i < p_input->p->input.p_item->i_options; i++ )
+ for( i = 0; i < p_input->p->p_item->i_options; i++ )
{
- if( !strncmp( p_input->p->input.p_item->ppsz_options[i], "meta-file", 9 ) )
+ if( !strncmp( p_input->p->p_item->ppsz_options[i], "meta-file", 9 ) )
{
msg_Dbg( p_input, "Input is a meta file: disabling unneeded options" );
var_SetString( p_input, "sout", "" );
var_Create( p_input, "bit-rate", VLC_VAR_INTEGER );
var_Create( p_input, "sample-rate", VLC_VAR_INTEGER );
+ /* */
+ input_ChangeState( p_input, OPENING_S );
+ input_SendEventCache( p_input, 0.0 );
+
+ /* */
if( InputSourceInit( p_input, &p_input->p->input,
- p_input->p->input.p_item->psz_uri, NULL ) )
+ p_input->p->p_item->psz_uri, NULL ) )
{
goto error;
}
/* Load master infos */
/* Init length */
- input_event_times_t ev_times;
- ev_times.f_position = 0;
- ev_times.i_time = 0;
+ mtime_t i_length;
if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_LENGTH,
- &ev_times.i_length ) )
- ev_times.i_length = 0;
- if( ev_times.i_length <= 0 )
- ev_times.i_length = input_item_GetDuration( p_input->p->input.p_item );
- input_SendEventTimes( p_input, &ev_times );
-
- StartTitle( p_input );
+ &i_length ) )
+ i_length = 0;
+ if( i_length <= 0 )
+ i_length = input_item_GetDuration( p_input->p->p_item );
+ input_SendEventTimes( p_input, 0.0, 0, i_length );
- InitPrograms( p_input );
+ if( !p_input->b_preparsing )
+ {
+ StartTitle( p_input );
+ LoadSubtitles( p_input );
+ LoadSlaves( p_input );
+ InitPrograms( p_input );
+ }
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 )
+ if( p_input->p->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 */
}
p_meta = vlc_meta_New();
+ if( p_meta )
+ {
+ /* Get meta data from users */
+ InputMetaUser( p_input, p_meta );
- /* Get meta data from users */
- InputMetaUser( p_input, p_meta );
-
- /* Get meta data from master input */
- DemuxMeta( p_input, p_meta, p_input->p->input.p_demux );
+ /* Get meta data from master input */
+ InputSourceMeta( p_input, &p_input->p->input, p_meta );
- /* Access_file does not give any meta, and there are no slave */
- AccessMeta( p_input, p_meta );
+ /* And from slave */
+ for( int i = 0; i < p_input->p->i_slave; i++ )
+ InputSourceMeta( p_input, p_input->p->slave[i], p_meta );
- InputUpdateMeta( p_input, p_meta );
+ /* */
+ InputUpdateMeta( p_input, p_meta );
+ }
if( !p_input->b_preparsing )
{
msg_Dbg( p_input, "`%s' successfully opened",
- p_input->p->input.p_item->psz_uri );
+ p_input->p->p_item->psz_uri );
}
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 );
-#ifdef ENABLE_SOUT
- if( p_input->p->p_sout )
+ if( p_input->p->p_ressource )
{
- vlc_object_detach( p_input->p->p_sout );
- sout_DeleteInstance( p_input->p->p_sout );
+ if( p_input->p->p_sout )
+ input_ressource_RequestSout( p_input->p->p_ressource,
+ p_input->p->p_sout, NULL );
+ input_ressource_SetInput( p_input->p->p_ressource, NULL );
}
-#endif
if( !p_input->b_preparsing && libvlc_stats( p_input ) )
{
return VLC_EGENERIC;
}
-/*****************************************************************************
- * WaitDie: Wait until we are asked to die.
- *****************************************************************************
- * This function is called when an error occurred during thread main's loop.
- *****************************************************************************/
-static void WaitDie( input_thread_t *p_input )
-{
- input_ChangeState( p_input, p_input->b_error ? ERROR_S : END_S );
-
- /* Wait a die order */
- vlc_object_lock( p_input );
- while( vlc_object_alive( p_input ) )
- vlc_object_wait( p_input );
- vlc_object_unlock( p_input );
-}
-
/*****************************************************************************
* End: end the input thread
*****************************************************************************/
/* Clean control variables */
input_ControlVarStop( p_input );
+ /* Stop es out activity */
+ 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 );
+
/* Clean up master */
InputSourceClean( &p_input->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->input.p_item->p_stats );
+ 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( sout_sent_packets );
CL_CO( sout_sent_bytes );
CL_CO( sout_send_bitrate );
-
- vlc_object_detach( p_input->p->p_sout );
}
#undef CL_CO
}
TAB_CLEAN( p_input->p->i_attachment, p_input->p->attachment );
}
- /* Tell we're dead */
- p_input->b_dead = true;
+ /* */
+ input_ressource_RequestSout( p_input->p->p_ressource,
+ p_input->p->p_sout, NULL );
+ input_ressource_SetInput( p_input->p->p_ressource, NULL );
}
/*****************************************************************************
if( i_ret )
{
msg_Warn( p_input, "cannot set pause state" );
- i_state = p_input->i_state;
+ i_state = p_input->p->i_state;
}
}
if( i_ret )
{
msg_Warn( p_input, "cannot set pause state at es_out level" );
- i_state = p_input->i_state;
+ i_state = p_input->p->i_state;
}
}
msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) ignored while recording" );
break;
}
- if( i_type == INPUT_CONTROL_SET_POSITION )
- {
- f_pos = val.f_float;
- }
- else
- {
- /* Should not fail */
- demux_Control( p_input->p->input.p_demux,
- DEMUX_GET_POSITION, &f_pos );
- f_pos += val.f_float;
- }
- if( f_pos < 0.0 ) f_pos = 0.0;
- if( f_pos > 1.0 ) f_pos = 1.0;
+ f_pos = val.f_float;
+ if( i_type != INPUT_CONTROL_SET_POSITION )
+ f_pos += var_GetFloat( p_input, "position" );
+ if( f_pos < 0.0 )
+ f_pos = 0.0;
+ else if( f_pos > 1.0 )
+ f_pos = 1.0;
/* 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,
break;
}
- if( i_type == INPUT_CONTROL_SET_TIME )
- {
- i_time = val.i_time;
- }
- else
- {
- /* Should not fail */
- demux_Control( p_input->p->input.p_demux,
- DEMUX_GET_TIME, &i_time );
- i_time += val.i_time;
- }
- if( i_time < 0 ) i_time = 0;
+ i_time = val.i_time;
+ if( i_type != INPUT_CONTROL_SET_TIME )
+ i_time += var_GetTime( p_input, "time" );
+
+ if( i_time < 0 )
+ i_time = 0;
/* Reset the decoders states and clock sync (before calling the demuxer */
es_out_SetTime( p_input->p->p_es_out, -1 );
}
case INPUT_CONTROL_SET_STATE:
- if( ( val.i_int == PLAYING_S && p_input->i_state == PAUSE_S ) ||
- ( val.i_int == PAUSE_S && p_input->i_state == PAUSE_S ) )
+ if( ( val.i_int == PLAYING_S && p_input->p->i_state == PAUSE_S ) ||
+ ( val.i_int == PAUSE_S && p_input->p->i_state == PAUSE_S ) )
{
ControlUnpause( p_input, i_control_date );
b_force_update = true;
}
- else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S /* &&
+ else if( val.i_int == PAUSE_S && p_input->p->i_state == PLAYING_S /* &&
p_input->p->b_can_pause */ )
{
ControlPause( p_input, i_control_date );
b_force_update = true;
/* Correct "state" value */
- input_ChangeState( p_input, p_input->i_state );
+ input_ChangeState( p_input, p_input->p->i_state );
}
else if( val.i_int != PLAYING_S && val.i_int != PAUSE_S )
{
i_rate = INPUT_RATE_DEFAULT;
}
if( i_rate != p_input->p->i_rate &&
- !p_input->b_can_pace_control && p_input->p->b_can_rate_control )
+ !p_input->p->b_can_pace_control && p_input->p->b_can_rate_control )
{
int i_ret;
if( p_input->p->input.p_access )
if( p_input->p->input.b_rescale_ts )
{
- const int i_rate_source = (p_input->b_can_pace_control || p_input->p->b_can_rate_control ) ? i_rate : INPUT_RATE_DEFAULT;
+ const int i_rate_source = (p_input->p->b_can_pace_control || p_input->p->b_can_rate_control ) ? i_rate : INPUT_RATE_DEFAULT;
es_out_SetRate( p_input->p->p_es_out, i_rate_source, i_rate );
}
{
es_out_SetTime( p_input->p->p_es_out, -1 );
- access_Control( p_access, ACCESS_SET_TITLE, i_title );
- stream_AccessReset( p_input->p->input.p_stream );
+ stream_Control( p_input->p->input.p_stream, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_TITLE, i_title );
}
}
break;
{
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 &&
- !demux_Control( p_demux,
- DEMUX_GET_TIME, &i_input_time ) )
+ i_input_time = var_GetTime( p_input, "time" );
+ if( i_seekpoint_time >= 0 && i_input_time >= 0 )
{
if( i_input_time < i_seekpoint_time + 3000000 )
i_seekpoint--;
}
else if( p_input->p->input.i_title > 0 )
{
- demux_t *p_demux = p_input->p->input.p_demux;
access_t *p_access = p_input->p->input.p_access;
int i_seekpoint;
int64_t i_input_time;
{
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 &&
- demux_Control( p_demux,
- DEMUX_GET_TIME, &i_input_time ) )
+ i_input_time = var_GetTime( p_input, "time" );
+ if( i_seekpoint_time >= 0 && i_input_time >= 0 )
{
if( i_input_time < i_seekpoint_time + 3000000 )
i_seekpoint--;
{
es_out_SetTime( p_input->p->p_es_out, -1 );
- access_Control( p_access, ACCESS_SET_SEEKPOINT,
- i_seekpoint );
- stream_AccessReset( p_input->p->input.p_stream );
+ stream_Control( p_input->p->input.p_stream, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_SEEKPOINT, i_seekpoint );
}
}
break;
{
input_source_t *slave = InputSourceNew( p_input );
- if( !InputSourceInit( p_input, slave, val.psz_string, NULL ) )
+ if( slave && !InputSourceInit( p_input, slave, val.psz_string, NULL ) )
{
vlc_meta_t *p_meta;
int64_t i_time;
/* Get meta (access and demux) */
p_meta = vlc_meta_New();
- access_Control( slave->p_access, ACCESS_GET_META,
- p_meta );
- demux_Control( slave->p_demux, DEMUX_GET_META, p_meta );
- InputUpdateMeta( p_input, p_meta );
+ if( p_meta )
+ {
+ access_Control( slave->p_access, ACCESS_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 );
}
break;
case INPUT_CONTROL_SET_FRAME_NEXT:
- if( p_input->i_state == PAUSE_S )
+ if( p_input->p->i_state == PAUSE_S )
{
es_out_SetFrameNext( p_input->p->p_es_out );
}
- else if( p_input->i_state == PLAYING_S )
+ else if( p_input->p->i_state == PLAYING_S )
{
ControlPause( p_input, i_control_date );
}
break;
case INPUT_CONTROL_SET_BOOKMARK:
+ {
+ seekpoint_t bookmark;
+
+ bookmark.i_time_offset = -1;
+ bookmark.i_byte_offset = -1;
+
+ vlc_mutex_lock( &p_input->p->p_item->lock );
+ if( val.i_int >= 0 && val.i_int < p_input->p->i_bookmark )
+ {
+ const seekpoint_t *p_bookmark = p_input->p->pp_bookmark[val.i_int];
+ bookmark.i_time_offset = p_bookmark->i_time_offset;
+ bookmark.i_byte_offset = p_bookmark->i_byte_offset;
+ }
+ vlc_mutex_unlock( &p_input->p->p_item->lock );
+
+ if( bookmark.i_time_offset < 0 && bookmark.i_byte_offset < 0 )
+ {
+ msg_Err( p_input, "invalid bookmark %d", val.i_int );
+ break;
+ }
+
+ if( bookmark.i_time_offset >= 0 )
+ {
+ val.i_time = bookmark.i_time_offset;
+ b_force_update = Control( p_input, INPUT_CONTROL_SET_TIME, val );
+ }
+ else if( bookmark.i_byte_offset >= 0 &&
+ p_input->p->input.p_stream )
+ {
+ const int64_t i_size = stream_Size( p_input->p->input.p_stream );
+ if( i_size > 0 && bookmark.i_byte_offset <= i_size )
+ {
+ val.f_float = (double)bookmark.i_byte_offset / i_size;
+ b_force_update = Control( p_input, INPUT_CONTROL_SET_POSITION, val );
+ }
+ }
+ break;
+ }
+
default:
msg_Err( p_input, "not yet implemented" );
break;
}
/*****************************************************************************
- * UpdateFromDemux:
+ * UpdateTitleSeekpoint
*****************************************************************************/
static int UpdateTitleSeekpoint( input_thread_t *p_input,
int i_title, int i_seekpoint )
}
return 1;
}
-static int UpdateFromDemux( input_thread_t *p_input )
+/*****************************************************************************
+ * Update*FromDemux:
+ *****************************************************************************/
+static int UpdateTitleSeekpointFromDemux( input_thread_t *p_input )
{
demux_t *p_demux = p_input->p->input.p_demux;
p_demux->info.i_update &= ~INPUT_UPDATE_SEEKPOINT;
}
- p_demux->info.i_update &= ~INPUT_UPDATE_SIZE;
/* Hmmm only works with master input */
if( p_input->p->input.p_demux == p_demux )
return 1;
}
+static void UpdateGenericFromDemux( input_thread_t *p_input )
+{
+ demux_t *p_demux = p_input->p->input.p_demux;
+
+ if( p_demux->info.i_update & INPUT_UPDATE_META )
+ {
+ vlc_meta_t *p_meta = vlc_meta_New();
+ if( p_meta )
+ {
+ demux_Control( p_input->p->input.p_demux, DEMUX_GET_META, p_meta );
+ InputUpdateMeta( p_input, p_meta );
+ }
+ p_demux->info.i_update &= ~INPUT_UPDATE_META;
+ }
+
+ p_demux->info.i_update &= ~INPUT_UPDATE_SIZE;
+}
+
+
/*****************************************************************************
- * UpdateFromAccess:
+ * Update*FromAccess:
*****************************************************************************/
-static int UpdateFromAccess( input_thread_t *p_input )
+static int UpdateTitleSeekpointFromAccess( input_thread_t *p_input )
{
access_t *p_access = p_input->p->input.p_access;
{
input_SendEventTitle( p_input, p_access->info.i_title );
- stream_AccessUpdate( p_input->p->input.p_stream );
+ stream_Control( p_input->p->input.p_stream, STREAM_UPDATE_SIZE );
p_access->info.i_update &= ~INPUT_UPDATE_TITLE;
}
p_access->info.i_update &= ~INPUT_UPDATE_SEEKPOINT;
}
+ /* Hmmm only works with master input */
+ if( p_input->p->input.p_access == p_access )
+ return UpdateTitleSeekpoint( p_input,
+ p_access->info.i_title,
+ p_access->info.i_seekpoint );
+ return 1;
+}
+static void UpdateGenericFromAccess( input_thread_t *p_input )
+{
+ access_t *p_access = p_input->p->input.p_access;
+
if( p_access->info.i_update & INPUT_UPDATE_META )
{
/* TODO maybe multi - access ? */
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 );
+ if( p_meta )
+ {
+ access_Control( p_input->p->input.p_access, ACCESS_GET_META, p_meta );
+ InputUpdateMeta( p_input, p_meta );
+ }
p_access->info.i_update &= ~INPUT_UPDATE_META;
}
if( p_access->info.i_update & INPUT_UPDATE_SIGNAL )
}
p_access->info.i_update &= ~INPUT_UPDATE_SIZE;
-
- /* Hmmm only works with master input */
- if( p_input->p->input.p_access == p_access )
- return UpdateTitleSeekpoint( p_input,
- p_access->info.i_title,
- p_access->info.i_seekpoint );
- return 1;
}
/*****************************************************************************
static input_source_t *InputSourceNew( input_thread_t *p_input )
{
VLC_UNUSED(p_input);
- input_source_t *in = malloc( sizeof( input_source_t ) );
- if( in )
- memset( in, 0, sizeof( input_source_t ) );
- return in;
+
+ return calloc( 1, sizeof( input_source_t ) );
}
/*****************************************************************************
input_source_t *in, const char *psz_mrl,
const char *psz_forced_demux )
{
- const bool b_master = in == &p_input->p->input;
-
char psz_dup[strlen(psz_mrl) + 1];
const char *psz_access;
const char *psz_demux;
char *psz_path;
- char *psz_tmp;
- char *psz;
vlc_value_t val;
double f_fps;
strcpy( psz_dup, psz_mrl );
- if( !in ) return VLC_EGENERIC;
- if( !p_input ) return VLC_EGENERIC;
-
/* Split uri */
input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_dup );
/* Get infos from access_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 );
+ p_input->p->i_pts_delay = __MAX( p_input->p->i_pts_delay, i_pts_delay );
in->b_title_demux = true;
if( demux_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
{
int64_t i_pts_delay;
- if( b_master )
- input_ChangeState( p_input, OPENING_S );
-
/* Now try a real access */
in->p_access = access_New( p_input, psz_access, psz_demux, psz_path );
goto error;
}
- /* */
- psz_tmp = psz = var_GetNonEmptyString( p_input, "access-filter" );
- while( psz && *psz )
- {
- access_t *p_access = in->p_access;
- char *end = strchr( psz, ':' );
-
- if( end )
- *end++ = '\0';
-
- in->p_access = access_FilterNew( in->p_access, psz );
- if( in->p_access == NULL )
- {
- in->p_access = p_access;
- msg_Warn( p_input, "failed to insert access filter %s",
- psz );
- }
-
- psz = end;
- }
- free( psz_tmp );
-
/* Get infos from access */
if( !p_input->b_preparsing )
{
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 );
+ p_input->p->i_pts_delay = __MAX( p_input->p->i_pts_delay, i_pts_delay );
in->b_title_demux = false;
if( access_Control( in->p_access, ACCESS_GET_TITLE_INFO,
var_Set( p_input, "can-seek", val );
}
- if( b_master )
- input_ChangeState( p_input, BUFFERING_S );
+ /* */
+ int i_input_list;
+ char **ppsz_input_list;
+
+ TAB_INIT( i_input_list, ppsz_input_list );
+
+ /* On master stream only, use input-list */
+ if( &p_input->p->input == in )
+ {
+ char *psz_list;
+ char *psz_parser;
+
+ psz_list =
+ psz_parser = var_CreateGetNonEmptyString( p_input, "input-list" );
+
+ while( psz_parser && *psz_parser )
+ {
+ char *p = strchr( psz_parser, ',' );
+ if( p )
+ *p++ = '\0';
+
+ if( *psz_parser )
+ {
+ char *psz_name = strdup( psz_parser );
+ if( psz_name )
+ TAB_APPEND( i_input_list, ppsz_input_list, psz_name );
+ }
+ psz_parser = p;
+ }
+ free( psz_list );
+ }
/* Autodetect extra files if none specified */
- char *psz_input_list = var_CreateGetNonEmptyString( p_input, "input-list" );
- if( !psz_input_list )
+ if( i_input_list <= 0 )
{
- char *psz_extra_files = InputGetExtraFiles( p_input, psz_access, psz_path );
- if( psz_extra_files )
- var_SetString( p_input, "input-list", psz_extra_files );
- free( psz_extra_files );
+ InputGetExtraFiles( p_input, &i_input_list, &ppsz_input_list,
+ psz_access, psz_path );
}
+ if( i_input_list > 0 )
+ TAB_APPEND( i_input_list, ppsz_input_list, NULL );
/* Create the stream_t */
- in->p_stream = stream_AccessNew( in->p_access, p_input->b_preparsing );
-
- /* Restor old value */
- if( !psz_input_list )
- var_SetString( p_input, "input-list", "" );
- free( psz_input_list );
+ in->p_stream = stream_AccessNew( in->p_access, ppsz_input_list );
+ if( ppsz_input_list )
+ {
+ for( int i = 0; ppsz_input_list[i] != NULL; i++ )
+ free( ppsz_input_list[i] );
+ TAB_CLEAN( i_input_list, ppsz_input_list );
+ }
if( in->p_stream == NULL )
{
goto error;
}
+ /* Add stream filters */
+ char *psz_stream_filter = var_GetNonEmptyString( p_input,
+ "stream-filter" );
+ in->p_stream = stream_FilterChainNew( in->p_stream,
+ psz_stream_filter,
+ var_GetBool( p_input, "input-record-native" ) );
+ free( psz_stream_filter );
+
/* Open a demuxer */
if( *psz_demux == '\0' && *in->p_access->psz_demux )
{
if( demux_Control( in->p_demux, DEMUX_CAN_RECORD, &in->b_can_stream_record ) )
in->b_can_stream_record = false;
#ifdef ENABLE_SOUT
- if( !var_CreateGetBool( p_input, "input-record-native" ) )
+ if( !var_GetBool( p_input, "input-record-native" ) )
in->b_can_stream_record = false;
var_SetBool( p_input, "can-record", true );
#else
if( !demux_Control( in->p_demux, DEMUX_GET_ATTACHMENTS,
&attachment, &i_attachment ) )
{
- vlc_mutex_lock( &p_input->p->input.p_item->lock );
+ vlc_mutex_lock( &p_input->p->p_item->lock );
AppendAttachment( &p_input->p->i_attachment, &p_input->p->attachment,
i_attachment, attachment );
- vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ vlc_mutex_unlock( &p_input->p->p_item->lock );
}
}
- if( !demux_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) )
+ if( !demux_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) && f_fps > 0.0 )
{
- vlc_mutex_lock( &p_input->p->input.p_item->lock );
- in->f_fps = f_fps;
- vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ vlc_mutex_lock( &p_input->p->p_item->lock );
+ p_input->p->f_fps = f_fps;
+ vlc_mutex_unlock( &p_input->p->p_item->lock );
}
if( var_GetInteger( p_input, "clock-synchro" ) != -1 )
return VLC_SUCCESS;
error:
- if( b_master )
- input_ChangeState( p_input, ERROR_S );
-
if( in->p_demux )
demux_Delete( in->p_demux );
}
}
+/*****************************************************************************
+ * InputSourceMeta:
+ *****************************************************************************/
+static void InputSourceMeta( input_thread_t *p_input,
+ input_source_t *p_source, vlc_meta_t *p_meta )
+{
+ access_t *p_access = p_source->p_access;
+ demux_t *p_demux = p_source->p_demux;
+
+ /* XXX Remember that checking against p_item->p_meta->i_status & ITEM_PREPARSED
+ * is a bad idea */
+
+ /* Read access meta */
+ if( p_access )
+ access_Control( p_access, ACCESS_GET_META, p_meta );
+
+ /* Read demux meta */
+ demux_Control( p_demux, DEMUX_GET_META, p_meta );
+
+ /* If the demux report unsupported meta data, try an external "meta reader" */
+ bool b_bool;
+ if( demux_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) )
+ return;
+ if( !b_bool )
+ return;
+
+ demux_meta_t *p_demux_meta = p_demux->p_private = calloc( 1, sizeof(*p_demux_meta) );
+ if( !p_demux_meta )
+ return;
+
+ module_t *p_id3 = module_need( p_demux, "meta reader", NULL, false );
+ if( p_id3 )
+ {
+ if( p_demux_meta->p_meta )
+ {
+ vlc_meta_Merge( p_meta, p_demux_meta->p_meta );
+ vlc_meta_Delete( p_demux_meta->p_meta );
+ }
+
+ if( p_demux_meta->i_attachments > 0 )
+ {
+ vlc_mutex_lock( &p_input->p->p_item->lock );
+ AppendAttachment( &p_input->p->i_attachment, &p_input->p->attachment,
+ p_demux_meta->i_attachments, p_demux_meta->attachments );
+ vlc_mutex_unlock( &p_input->p->p_item->lock );
+ }
+ module_unneed( p_demux, p_id3 );
+ }
+ free( p_demux_meta );
+}
+
+
static void SlaveDemux( input_thread_t *p_input )
{
int64_t i_time;
int i;
- bool b_set_time = true;
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" ); */
- b_set_time = false;
+ msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
+ return;
}
for( i = 0; i < p_input->p->i_slave; i++ )
if( in->b_eof )
continue;
- if( b_set_time && demux_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( ;; )
{
if( i_stime >= i_time )
break;
- if( ( i_ret = in->p_demux->pf_demux( in->p_demux ) ) <= 0 )
+ if( ( i_ret = demux_Demux( in->p_demux ) ) <= 0 )
break;
}
}
else
{
- i_ret = in->p_demux->pf_demux( in->p_demux );
+ i_ret = demux_Demux( in->p_demux );
}
if( i_ret <= 0 )
int64_t i_time;
int i;
- if( !p_input ) return;
-
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" );
{
vlc_value_t val;
- if( !p_meta ) return;
-
/* Get meta information from user */
-#define GET_META( field, s ) \
+#define GET_META( field, s ) do { \
var_Get( p_input, (s), &val ); \
- if( *val.psz_string ) \
+ if( val.psz_string && *val.psz_string ) \
vlc_meta_Set( p_meta, vlc_meta_ ## field, val.psz_string ); \
- free( val.psz_string )
+ free( val.psz_string ); } while(0)
GET_META( Title, "meta-title" );
GET_META( Artist, "meta-artist" );
#undef GET_META
}
-/*****************************************************************************
- * InputGetExtraFiles
- * Autodetect extra input list
- *****************************************************************************/
-static char *InputGetExtraFiles( input_thread_t *p_input,
- const char *psz_access, const char *psz_path )
-{
- char *psz_list = NULL;
-
- if( ( psz_access && *psz_access && strcmp( psz_access, "file" ) ) || !psz_path )
- return NULL;
-
-
- const char *psz_ext = strrchr( psz_path, '.' );
- if( !psz_ext || strcmp( psz_ext, ".001" ) )
- return NULL;
-
- char *psz_file = strdup( psz_path );
- if( !psz_file )
- return NULL;
-
- /* Try to list .xyz files */
- for( int i = 2; i < 999; i++ )
- {
- char *psz_ext = strrchr( psz_file, '.' );
- struct stat st;
-
- snprintf( psz_ext, 5, ".%.3d", i );
-
- if( utf8_stat( psz_file, &st )
- || !S_ISREG( st.st_mode ) || !st.st_size )
- continue;
-
- msg_Dbg( p_input, "Detected extra file `%s'", psz_file );
-
- if( psz_list )
- {
- char *psz_old = psz_list;
- /* FIXME how to handle file with ',' ?*/
- if( asprintf( &psz_list, "%s,%s", psz_old, psz_file ) < 0 )
- {
- psz_list = psz_old;
- break;
- }
- }
- else
- {
- psz_list = strdup( psz_file );
- }
- }
- free( psz_file );
-
- return psz_list;
-}
-
/*****************************************************************************
* InputUpdateMeta: merge p_item meta data with p_meta taking care of
* arturl and locking issue.
*****************************************************************************/
static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta )
{
- input_item_t *p_item = p_input->p->input.p_item;
- char * psz_arturl = NULL;
- char *psz_title = NULL;
-
- if( !p_meta )
- return;
+ input_item_t *p_item = p_input->p->p_item;
- psz_arturl = input_item_GetArtURL( p_item );
+ char *psz_title = NULL;
+ char *psz_arturl = input_item_GetArtURL( p_item );
vlc_mutex_lock( &p_item->lock );
/** \todo handle sout meta */
}
-
static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment,
int i_new, input_attachment_t **pp_new )
{
*pi_attachment = i_attachment;
*ppp_attachment = attachment;
}
-
-static void AccessMeta( input_thread_t * p_input, vlc_meta_t *p_meta )
+/*****************************************************************************
+ * InputGetExtraFiles
+ * Autodetect extra input list
+ *****************************************************************************/
+static void InputGetExtraFilesPattern( input_thread_t *p_input,
+ int *pi_list, char ***pppsz_list,
+ const char *psz_path,
+ const char *psz_match,
+ const char *psz_format,
+ int i_start, int i_stop )
{
- int i;
+ int i_list;
+ char **ppsz_list;
- if( p_input->b_preparsing )
- return;
+ TAB_INIT( i_list, ppsz_list );
- if( p_input->p->input.p_access )
- access_Control( p_input->p->input.p_access, ACCESS_GET_META,
- p_meta );
+ char *psz_base = strdup( psz_path );
+ if( !psz_base )
+ goto exit;
- /* Get meta data from slave input */
- for( i = 0; i < p_input->p->i_slave; i++ )
+ /* Remove the extension */
+ char *psz_end = &psz_base[strlen(psz_base)-strlen(psz_match)];
+ assert( psz_end >= psz_base);
+ *psz_end = '\0';
+
+ /* Try to list files */
+ for( int i = i_start; i <= i_stop; i++ )
{
- DemuxMeta( p_input, p_meta, p_input->p->slave[i]->p_demux );
- if( p_input->p->slave[i]->p_access )
+ struct stat st;
+ char *psz_file;
+
+ if( asprintf( &psz_file, psz_format, psz_base, i ) < 0 )
+ break;
+
+ if( utf8_stat( psz_file, &st ) || !S_ISREG( st.st_mode ) || !st.st_size )
{
- access_Control( p_input->p->slave[i]->p_access,
- ACCESS_GET_META, p_meta );
+ free( psz_file );
+ break;
}
+
+ msg_Dbg( p_input, "Detected extra file `%s'", psz_file );
+ TAB_APPEND( i_list, ppsz_list, psz_file );
}
+ free( psz_base );
+exit:
+ *pi_list = i_list;
+ *pppsz_list = ppsz_list;
}
-static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_demux )
+static void InputGetExtraFiles( input_thread_t *p_input,
+ int *pi_list, char ***pppsz_list,
+ const char *psz_access, const char *psz_path )
{
- bool b_bool;
- module_t *p_id3;
+ static const struct
+ {
+ const char *psz_match;
+ const char *psz_format;
+ int i_start;
+ int i_stop;
+ } p_pattern[] = {
+ /* XXX the order is important */
+ { ".001", "%s.%.3d", 2, 999 },
+ { ".part1.rar", "%s.part%.1d.rar",2, 9 },
+ { ".part01.rar", "%s.part%.2d.rar",2, 99, },
+ { ".part001.rar", "%s.part%.3d.rar",2, 999 },
+ { ".rar", "%s.r%.2d", 1, 99 },
+ { NULL, NULL, 0, 0 }
+ };
+
+ TAB_INIT( *pi_list, *pppsz_list );
-#if 0
- /* XXX I am not sure it is a great idea, besides, there is more than that
- * if we want to do it right */
- vlc_mutex_lock( &p_item->lock );
- if( p_item->p_meta && (p_item->p_meta->i_status & ITEM_PREPARSED ) )
- {
- vlc_mutex_unlock( &p_item->lock );
- return;
- }
- vlc_mutex_unlock( &p_item->lock );
-#endif
-
- demux_Control( p_demux, DEMUX_GET_META, p_meta );
- if( demux_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) )
- return;
- if( !b_bool )
+ if( ( psz_access && *psz_access && strcmp( psz_access, "file" ) ) || !psz_path )
return;
- p_demux->p_private = malloc( sizeof( demux_meta_t ) );
- if(! p_demux->p_private )
- return;
+ const size_t i_path = strlen(psz_path);
- p_id3 = module_need( p_demux, "meta reader", NULL, 0 );
- if( p_id3 )
+ for( int i = 0; p_pattern[i].psz_match != NULL; i++ )
{
- demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
+ const size_t i_ext = strlen(p_pattern[i].psz_match );
- if( p_demux_meta->p_meta )
- {
- vlc_meta_Merge( p_meta, p_demux_meta->p_meta );
- vlc_meta_Delete( p_demux_meta->p_meta );
- }
-
- if( p_demux_meta->i_attachments > 0 )
+ if( i_path < i_ext )
+ continue;
+ if( !strcmp( &psz_path[i_path-i_ext], p_pattern[i].psz_match ) )
{
- vlc_mutex_lock( &p_input->p->input.p_item->lock );
- AppendAttachment( &p_input->p->i_attachment, &p_input->p->attachment,
- p_demux_meta->i_attachments, p_demux_meta->attachments );
- vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ InputGetExtraFilesPattern( p_input, pi_list, pppsz_list,
+ psz_path,
+ p_pattern[i].psz_match, p_pattern[i].psz_format,
+ p_pattern[i].i_start, p_pattern[i].i_stop );
+ return;
}
- module_unneed( p_demux, p_id3 );
}
- free( p_demux->p_private );
}
+/* */
static void input_ChangeState( input_thread_t *p_input, int i_state )
{
- const bool b_changed = p_input->i_state != i_state;
+ const bool b_changed = p_input->p->i_state != i_state;
- p_input->i_state = i_state;
+ p_input->p->i_state = i_state;
if( i_state == ERROR_S )
p_input->b_error = true;
else if( i_state == END_S )
if( b_changed )
{
- input_item_SetErrorWhenReading( p_input->p->input.p_item, p_input->b_error );
+ input_item_SetErrorWhenReading( p_input->p->p_item, p_input->b_error );
input_SendEventState( p_input, i_state );
}
}
var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL );
sub = InputSourceNew( p_input );
- if( InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) )
+ if( !sub || InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) )
{
free( sub );
return;
}
}
-bool input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle,
- bool b_check_extension )
-{
- vlc_value_t val;
-
- if( b_check_extension && !subtitles_Filter( psz_subtitle ) )
- return false;
-
- assert( psz_subtitle != NULL );
-
- val.psz_string = strdup( psz_subtitle );
- if( val.psz_string )
- input_ControlPush( p_input, INPUT_CONTROL_ADD_SUBTITLE, &val );
- return true;
-}
-
/*****************************************************************************
* Statistics
*****************************************************************************/
void input_UpdateStatistic( input_thread_t *p_input,
input_statistic_t i_type, int i_delta )
{
- assert( p_input->i_state != INIT_S );
+ assert( p_input->p->i_state != INIT_S );
vlc_mutex_lock( &p_input->p->counters.counters_lock);
switch( i_type )
}
vlc_mutex_unlock( &p_input->p->counters.counters_lock);
}
-/*****************************************************************************
- * input_get_event_manager
- *****************************************************************************/
-vlc_event_manager_t *input_get_event_manager( input_thread_t *p_input )
-{
- return &p_input->p->event_manager;
-}
/**/
/* TODO FIXME nearly the same logic that snapshot code */
projects / vlc / blobdiff