/*****************************************************************************
* input.c: input thread
*****************************************************************************
- * Copyright (C) 1998-2004 VideoLAN
+ * Copyright (C) 1998-2004 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
#include "input_internal.h"
#include "stream_output.h"
-
+#include "vlc_playlist.h"
#include "vlc_interface.h"
+#include "vlc_interaction.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Run ( input_thread_t *p_input );
+static int RunAndClean ( input_thread_t *p_input );
-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 input_thread_t * Create ( vlc_object_t *, input_item_t *, vlc_bool_t );
+static int Init ( input_thread_t *p_input, vlc_bool_t b_quick );
+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 inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t * );
static void ControlReduce( input_thread_t * );
static int UpdateFromAccess( input_thread_t * );
static int UpdateFromDemux( input_thread_t * );
-static int UpdateMeta( input_thread_t * );
+static int UpdateMeta( input_thread_t *, vlc_bool_t );
-static void UpdateItemLength( input_thread_t *, int64_t i_length );
+static void UpdateItemLength( input_thread_t *, int64_t i_length, vlc_bool_t );
static void ParseOption( input_thread_t *p_input, const char *psz_option );
-static void DecodeUrl ( char * );
-static void MRLSplit( input_thread_t *, char *, char **, char **, char ** );
+static void DecodeUrl( char * );
static void MRLSections( input_thread_t *, char *, int *, int *, int *, int *);
static input_source_t *InputSourceNew( input_thread_t *);
static int InputSourceInit( input_thread_t *, input_source_t *,
- char *, char *psz_forced_demux );
+ char *, char *psz_forced_demux,
+ vlc_bool_t b_quick );
static void InputSourceClean( input_thread_t *, input_source_t * );
static void SlaveDemux( input_thread_t *p_input );
static vlc_meta_t *InputMetaUser( input_thread_t *p_input );
/*****************************************************************************
- * input_CreateThread: creates a new input thread
- *****************************************************************************
* This function creates a new input, and returns a pointer
* to its description. On error, it returns NULL.
*
* TODO explain when Callback is called
* TODO complete this list (?)
*****************************************************************************/
-input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
- input_item_t *p_item )
-
+static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
+ vlc_bool_t b_quick )
{
input_thread_t *p_input; /* thread descriptor */
vlc_value_t val;
p_input->input.b_eof = VLC_FALSE;
p_input->input.i_cr_average = 0;
+ stats_ReinitInputStats( p_item->p_stats );
+
/* No slave */
p_input->i_slave = 0;
p_input->slave = NULL;
vlc_mutex_lock( &p_item->lock );
for( i = 0; i < p_item->i_options; i++ )
{
-// msg_Dbg( p_input, "option: %s", p_item->ppsz_options[i] );
ParseOption( p_input, p_item->ppsz_options[i] );
}
vlc_mutex_unlock( &p_item->lock );
input_ControlVarInit( p_input );
p_input->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
- /* TODO */
- var_Get( p_input, "bookmarks", &val );
- if( val.psz_string )
- {
- /* FIXME: have a common cfg parsing routine used by sout and others */
- char *psz_parser, *psz_start, *psz_end;
- psz_parser = val.psz_string;
- while( (psz_start = strchr( psz_parser, '{' ) ) )
- {
- seekpoint_t seekpoint;
- char backup;
- psz_start++;
- psz_end = strchr( psz_start, '}' );
- if( !psz_end ) break;
- psz_parser = psz_end + 1;
- backup = *psz_parser;
- *psz_parser = 0;
- *psz_end = ',';
-
- seekpoint.psz_name = 0;
- seekpoint.i_byte_offset = 0;
- seekpoint.i_time_offset = 0;
- while( (psz_end = strchr( psz_start, ',' ) ) )
+ if( !b_quick )
+ {
+ var_Get( p_input, "bookmarks", &val );
+ if( val.psz_string )
+ {
+ /* FIXME: have a common cfg parsing routine used by sout and others */
+ char *psz_parser, *psz_start, *psz_end;
+ psz_parser = val.psz_string;
+ while( (psz_start = strchr( psz_parser, '{' ) ) )
{
- *psz_end = 0;
- if( !strncmp( psz_start, "name=", 5 ) )
- {
- seekpoint.psz_name = psz_start + 5;
- }
- else if( !strncmp( psz_start, "bytes=", 6 ) )
- {
- seekpoint.i_byte_offset = atoll(psz_start + 6);
+ seekpoint_t *p_seekpoint = vlc_seekpoint_New();
+ char backup;
+ psz_start++;
+ psz_end = strchr( psz_start, '}' );
+ if( !psz_end ) break;
+ psz_parser = psz_end + 1;
+ backup = *psz_parser;
+ *psz_parser = 0;
+ *psz_end = ',';
+ while( (psz_end = strchr( psz_start, ',' ) ) )
+ {
+ *psz_end = 0;
+ if( !strncmp( psz_start, "name=", 5 ) )
+ {
+ p_seekpoint->psz_name = psz_start + 5;
+ }
+ else if( !strncmp( psz_start, "bytes=", 6 ) )
+ {
+ p_seekpoint->i_byte_offset = atoll(psz_start + 6);
+ }
+ else if( !strncmp( psz_start, "time=", 5 ) )
+ {
+ p_seekpoint->i_time_offset = atoll(psz_start + 5) * 1000000;
+ }
+ psz_start = psz_end + 1;
}
- else if( !strncmp( psz_start, "time=", 5 ) )
- {
- seekpoint.i_time_offset = atoll(psz_start + 5) * 1000000;
- }
- psz_start = psz_end + 1;
+ msg_Dbg( p_input, "adding bookmark: %s, bytes="I64Fd", time="I64Fd,
+ p_seekpoint->psz_name, p_seekpoint->i_byte_offset,
+ p_seekpoint->i_time_offset );
+ input_Control( p_input, INPUT_ADD_BOOKMARK, p_seekpoint );
+ vlc_seekpoint_Delete( p_seekpoint );
+ *psz_parser = backup;
}
- msg_Dbg( p_input, "adding bookmark: %s, bytes="I64Fd", time="I64Fd,
- seekpoint.psz_name, seekpoint.i_byte_offset,
- seekpoint.i_time_offset );
- input_Control( p_input, INPUT_ADD_BOOKMARK, &seekpoint );
- *psz_parser = backup;
+ free( val.psz_string );
}
- free( val.psz_string );
}
+ /* Remove 'Now playing' info as it is probably outdated */
+ input_Control( p_input, INPUT_DEL_INFO, _("Meta-information"),
+ VLC_META_NOW_PLAYING );
+
+ return p_input;
+}
+
+/**
+ * Initialize an input thread and run it. You will need to monitor the thread to clean
+ * up after it is done
+ *
+ * \param p_parent a vlc_object
+ * \param p_item an input item
+ * \return a pointer to the spawned input thread
+ */
+input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
+ input_item_t *p_item )
+
+{
+ input_thread_t *p_input; /* thread descriptor */
+
+ p_input = Create( p_parent, p_item, VLC_FALSE );
/* Now we can attach our new input */
vlc_object_attach( p_input, p_parent );
/* Create thread and wait for its readiness. */
if( vlc_thread_create( p_input, "input", Run,
- VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
+ VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
{
msg_Err( p_input, "cannot create input thread" );
vlc_object_detach( p_input );
return p_input;
}
-/*****************************************************************************
- * input_StopThread: mark an input thread as zombie
- *****************************************************************************
- * This function should not return until the thread is effectively cancelled.
- *****************************************************************************/
+
+/**
+ * Initialize an input thread and run it. This thread will clean after himself,
+ * you can forget about it. It can work either in blocking or non-blocking mode
+ *
+ * \param p_parent a vlc_object
+ * \param p_item an input item
+ * \param b_block should we block until read is finished ?
+ * \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 )
+{
+ input_thread_t *p_input; /* thread descriptor */
+
+ p_input = Create( p_parent, p_item, VLC_FALSE );
+ /* Now we can attach our new input */
+ vlc_object_attach( p_input, p_parent );
+
+ if( b_block )
+ {
+ RunAndClean( p_input );
+ return VLC_SUCCESS;
+ }
+ else
+ {
+ if( vlc_thread_create( p_input, "input", RunAndClean,
+ VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
+ {
+ msg_Err( p_input, "cannot create input thread" );
+ vlc_object_detach( p_input );
+ vlc_object_destroy( p_input );
+ return VLC_EGENERIC;
+ }
+ }
+ return p_input->i_object_id;
+}
+
+/**
+ * Initialize an input and initialize it to preparse the item
+ * This function is blocking. It will only accept to parse files
+ *
+ * \param p_parent a vlc_object_t
+ * \param p_item an input item
+ * \return VLC_SUCCESS or an error
+ */
+int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item )
+{
+ input_thread_t *p_input; /* thread descriptor */
+
+ /* Allocate descriptor */
+ p_input = Create( p_parent, p_item, VLC_TRUE );
+
+ /* Now we can attach our new input */
+ vlc_object_attach( p_input, p_parent );
+
+ Init( p_input, VLC_TRUE );
+
+ /* Clean up master */
+ InputSourceClean( p_input, &p_input->input );
+
+ /* Kill access and demux */
+ if( p_input->input.p_access ) p_input->input.p_access->b_die = VLC_TRUE;
+ if( p_input->input.p_demux ) p_input->input.p_access->b_die = VLC_TRUE;
+
+ /* Unload all modules */
+ if( p_input->p_es_out ) input_EsOutDelete( p_input->p_es_out );
+
+ /* Delete meta */
+ if( p_input->p_meta ) vlc_meta_Delete( p_input->p_meta );
+
+ vlc_object_detach( p_input );
+ vlc_object_destroy( p_input );
+
+ return VLC_SUCCESS;
+}
+
+/**
+ * Request a running input thread to stop and die
+ *
+ * \param the input thread to stop
+ */
void input_StopThread( input_thread_t *p_input )
{
vlc_list_t *p_list;
input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
}
-/*****************************************************************************
- * input_DestroyThread: mark an input thread as zombie
- *****************************************************************************
- * This function should not return until the thread is effectively cancelled.
- *****************************************************************************/
+/**
+ * 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 )
{
/* Join the thread */
/*****************************************************************************
* Run: main thread loop
- *****************************************************************************
- * Thread in charge of processing the network packets and demultiplexing.
- *
- * TODO:
- * read subtitle support (XXX take care of spu-delay in the right way).
- * multi-input support (XXX may be done with subs)
+ * This is the "normal" thread that spawns the input processing chain,
+ * reads the stream, cleans up and waits
*****************************************************************************/
static int Run( input_thread_t *p_input )
{
- int64_t i_intf_update = 0;
/* Signal that the thread is launched */
vlc_thread_ready( p_input );
- if( Init( p_input ) )
+ if( Init( p_input, VLC_FALSE ) )
{
/* If we failed, wait before we are killed, and exit */
p_input->b_error = VLC_TRUE;
return 0;
}
- /* Main loop */
+ MainLoop( p_input );
+
+ if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof )
+ {
+ /* We have finish to demux data but not to play them */
+ while( !p_input->b_die )
+ {
+ if( input_EsOutDecodersEmpty( p_input->p_es_out ) )
+ break;
+
+ msg_Dbg( p_input, "waiting decoder fifos to empty" );
+
+ msleep( INPUT_IDLE_SLEEP );
+ }
+
+ /* We have finished */
+ p_input->b_eof = VLC_TRUE;
+ }
+
+ /* Wait we are asked to die */
+ if( !p_input->b_die )
+ {
+ Error( p_input );
+ }
+
+ /* Clean up */
+ End( p_input );
+
+ return 0;
+}
+
+/*****************************************************************************
+ * RunAndClean: main thread loop
+ * This is the "just forget me" thread that spawns the input processing chain,
+ * reads the stream, cleans up and releases memory
+ *****************************************************************************/
+static int RunAndClean( input_thread_t *p_input )
+{
+ /* Signal that the thread is launched */
+ vlc_thread_ready( p_input );
+
+ if( Init( p_input, VLC_FALSE ) )
+ {
+ /* If we failed, just exit */
+ return 0;
+ }
+
+ MainLoop( p_input );
+
+ if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof )
+ {
+ /* We have finish to demux data but not to play them */
+ while( !p_input->b_die )
+ {
+ if( input_EsOutDecodersEmpty( p_input->p_es_out ) )
+ break;
+
+ msg_Dbg( p_input, "waiting decoder fifos to empty" );
+
+ msleep( INPUT_IDLE_SLEEP );
+ }
+ /* We have finished */
+ p_input->b_eof = VLC_TRUE;
+ }
+
+ /* Clean up */
+ End( p_input );
+
+ /* Release memory */
+ vlc_object_detach( p_input );
+ vlc_object_destroy( p_input );
+
+ return 0;
+}
+
+
+/*****************************************************************************
+ * Main loop: Fill buffers from access, and demux
+ *****************************************************************************/
+static void MainLoop( input_thread_t *p_input )
+{
+ int64_t i_intf_update = 0;
while( !p_input->b_die && !p_input->b_error && !p_input->input.b_eof )
{
vlc_bool_t b_force_update = VLC_FALSE;
if( old_val.i_time != val.i_time )
{
- UpdateItemLength( p_input, i_length );
+ UpdateItemLength( p_input, i_length, VLC_TRUE );
}
}
i_intf_update = mdate() + I64C(150000);
}
}
-
- if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof )
- {
- /* We have finish to demux data but not to play them */
- while( !p_input->b_die )
- {
- if( input_EsOutDecodersEmpty( p_input->p_es_out ) )
- break;
-
- msg_Dbg( p_input, "waiting decoder fifos to empty" );
-
- msleep( INPUT_IDLE_SLEEP );
- }
-
- /* We have finished */
- p_input->b_eof = VLC_TRUE;
- }
-
- /* Wait we are asked to die */
- if( !p_input->b_die )
- {
- Error( p_input );
- }
-
- /* Clean up */
- End( p_input );
-
- return 0;
}
-/*****************************************************************************
- * Init: init the input Thread
- *****************************************************************************/
-static int Init( input_thread_t * p_input )
+
+static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
{
char *psz;
char *psz_subtitle;
int i_es_out_mode;
int i, i_delay;
- /* Initialize optional stream output. (before access/demuxer) */
- psz = var_GetString( p_input, "sout" );
- if( *psz )
- {
- p_input->p_sout = sout_NewInstance( p_input, psz );
- if( p_input->p_sout == NULL )
+ /* 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 ;)
+ */
+ if( !b_quick )
+ {
+ counter_t *p_counter;
+ stats_Create( p_input, "read_bytes", VLC_VAR_INTEGER, STATS_COUNTER );
+ stats_Create( p_input, "read_packets", VLC_VAR_INTEGER, STATS_COUNTER );
+ stats_Create( p_input, "input_bitrate", VLC_VAR_FLOAT,
+ STATS_DERIVATIVE );
+ p_counter = stats_CounterGet( p_input, p_input->i_object_id,
+ "input_bitrate" );
+ if( p_counter ) p_counter->update_interval = 1000000;
+
+ psz = var_GetString( p_input, "sout" );
+ if( *psz && strncasecmp( p_input->input.p_item->psz_uri, "vlc:", 4 ) )
{
- msg_Err( p_input, "cannot start stream output instance, aborting" );
- free( psz );
- return VLC_EGENERIC;
+ p_input->p_sout = sout_NewInstance( p_input, psz );
+ if( p_input->p_sout == NULL )
+ {
+ msg_Err( p_input, "cannot start stream output instance, " \
+ "aborting" );
+ free( psz );
+ return VLC_EGENERIC;
+ }
}
+ free( psz );
}
- free( psz );
/* Create es out */
p_input->p_es_out = input_EsOutNew( p_input );
es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE );
if( InputSourceInit( p_input, &p_input->input,
- p_input->input.p_item->psz_uri, NULL ) )
+ p_input->input.p_item->psz_uri, NULL, b_quick ) )
{
goto error;
}
/* Create global title (from master) */
- p_input->i_title = p_input->input.i_title;
- p_input->title = p_input->input.title;
- p_input->i_title_offset = p_input->input.i_title_offset;
- p_input->i_seekpoint_offset = p_input->input.i_seekpoint_offset;
- if( p_input->i_title > 0 )
+ if( !b_quick )
{
- /* Setup variables */
- input_ControlVarNavigation( p_input );
- input_ControlVarTitle( p_input, 0 );
- }
+ p_input->i_title = p_input->input.i_title;
+ p_input->title = p_input->input.title;
+ p_input->i_title_offset = p_input->input.i_title_offset;
+ p_input->i_seekpoint_offset = p_input->input.i_seekpoint_offset;
+ if( p_input->i_title > 0 )
+ {
+ /* Setup variables */
+ input_ControlVarNavigation( p_input );
+ input_ControlVarTitle( p_input, 0 );
+ }
- /* Global flag */
- p_input->b_can_pace_control = p_input->input.b_can_pace_control;
- p_input->b_can_pause = p_input->input.b_can_pause;
+ /* Global flag */
+ p_input->b_can_pace_control = p_input->input.b_can_pace_control;
+ p_input->b_can_pause = p_input->input.b_can_pause;
- /* Fix pts delay */
- if( p_input->i_pts_delay <= 0 )
- p_input->i_pts_delay = DEFAULT_PTS_DELAY;
+ /* 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);
+ /* 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->input.i_cr_average *= (10 * p_input->i_pts_delay / 200000);
- p_input->input.i_cr_average /= 10;
- if( p_input->input.i_cr_average <= 0 ) p_input->input.i_cr_average = 1;
+ /* Update cr_average depending on the caching */
+ p_input->input.i_cr_average *= (10 * p_input->i_pts_delay / 200000);
+ p_input->input.i_cr_average /= 10;
+ if( p_input->input.i_cr_average < 10 ) p_input->input.i_cr_average = 10;
+ }
/* Load master infos */
/* Init length */
&val.i_time ) && val.i_time > 0 )
{
var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
-
- UpdateItemLength( p_input, val.i_time );
+ UpdateItemLength( p_input, val.i_time, b_quick );
p_input->input.p_item->i_duration = val.i_time;
}
/* Start title/chapter */
- val.i_int = p_input->input.i_title_start -
- p_input->input.i_title_offset;
- if( val.i_int > 0 && val.i_int < p_input->input.i_title )
- input_ControlPush( p_input, INPUT_CONTROL_SET_TITLE, &val );
- val.i_int = p_input->input.i_seekpoint_start -
- p_input->input.i_seekpoint_offset;
- if( val.i_int > 0 /* TODO: check upper boundary */ )
- input_ControlPush( p_input, INPUT_CONTROL_SET_SEEKPOINT, &val );
+ if( !b_quick )
+ {
+ val.i_int = p_input->input.i_title_start -
+ p_input->input.i_title_offset;
+ if( val.i_int > 0 && val.i_int < p_input->input.i_title )
+ input_ControlPush( p_input, INPUT_CONTROL_SET_TITLE, &val );
+ val.i_int = p_input->input.i_seekpoint_start -
+ p_input->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->i_start = (int64_t)var_GetInteger( p_input, "start-time" ) *
+ I64C(1000000);
+ p_input->i_stop = (int64_t)var_GetInteger( p_input, "stop-time" ) *
+ I64C(1000000);
+
+ if( p_input->i_start > 0 )
+ {
+ if( p_input->i_start >= val.i_time )
+ {
+ msg_Warn( p_input, "invalid start-time ignored" );
+ }
+ else
+ {
+ vlc_value_t s;
- /* Start time*/
- /* Set start time */
- p_input->i_start = (int64_t)var_GetInteger( p_input, "start-time" ) *
- I64C(1000000);
- p_input->i_stop = (int64_t)var_GetInteger( p_input, "stop-time" ) *
- I64C(1000000);
+ msg_Dbg( p_input, "starting at time: %ds",
+ (int)( p_input->i_start / I64C(1000000) ) );
- if( p_input->i_start > 0 )
- {
- if( p_input->i_start >= val.i_time )
- {
- msg_Warn( p_input, "invalid start-time ignored" );
+ s.i_time = p_input->i_start;
+ input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s );
+ }
}
- else
+ if( p_input->i_stop > 0 && p_input->i_stop <= p_input->i_start )
{
- vlc_value_t s;
-
- msg_Dbg( p_input, "start-time: %ds",
- (int)( p_input->i_start / I64C(1000000) ) );
-
- s.i_time = p_input->i_start;
- input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s );
+ msg_Warn( p_input, "invalid stop-time ignored" );
+ p_input->i_stop = 0;
}
- }
- if( p_input->i_stop > 0 && p_input->i_stop <= p_input->i_start )
- {
- msg_Warn( p_input, "invalid stop-time ignored" );
- p_input->i_stop = 0;
- }
- /* Load subtitles */
- /* Get fps and set it if not already set */
- if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) &&
- f_fps > 1.0 )
- {
- vlc_value_t fps;
- float f_requested_fps;
+ /* Load subtitles */
+ /* Get fps and set it if not already set */
+ if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) &&
+ f_fps > 1.0 )
+ {
+ float f_requested_fps;
- var_Create( p_input, "sub-original-fps", VLC_VAR_FLOAT );
- var_SetFloat( p_input, "sub-original-fps", f_fps );
+ var_Create( p_input, "sub-original-fps", VLC_VAR_FLOAT );
+ var_SetFloat( p_input, "sub-original-fps", f_fps );
- f_requested_fps = var_CreateGetFloat( p_input, "sub-fps" );
- if( f_requested_fps != f_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 );
+ }
+ }
+
+ i_delay = var_CreateGetInteger( p_input, "sub-delay" );
+ if( i_delay != 0 )
{
- var_Create( p_input, "sub-fps", VLC_VAR_FLOAT| VLC_VAR_DOINHERIT );
- var_SetFloat( p_input, "sub-fps", f_requested_fps );
+ var_SetTime( p_input, "spu-delay", (mtime_t)i_delay * 100000 );
}
- }
- 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_GetString( p_input, "sub-file" );
+ if( *psz_subtitle )
+ {
+ input_source_t *sub;
+ vlc_value_t count;
+ vlc_value_t list;
+ msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle );
- /* Look for and add subtitle files */
- psz_subtitle = var_GetString( p_input, "sub-file" );
- if( *psz_subtitle )
- {
- input_source_t *sub;
- vlc_value_t count;
- vlc_value_t list;
+ var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL );
- msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle );
+ /* */
+ sub = InputSourceNew( p_input );
+ if( !InputSourceInit( p_input, sub, psz_subtitle, "subtitle",
+ VLC_FALSE ) )
+ {
+ TAB_APPEND( p_input->i_slave, p_input->slave, sub );
- var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL );
+ /* Select the ES */
+ if( !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list,
+ NULL ) )
+ {
+ if( count.i_int == 0 )
+ count.i_int++;
+ /* if it was first one, there is disable too */
- /* */
- sub = InputSourceNew( p_input );
- if( !InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) )
+ if( count.i_int < list.p_list->i_count )
+ {
+ input_ControlPush( p_input, INPUT_CONTROL_SET_ES,
+ &list.p_list->p_values[count.i_int] );
+ }
+ var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list,
+ NULL );
+ }
+ }
+ }
+
+ var_Get( p_input, "sub-autodetect-file", &val );
+ if( val.b_bool )
{
- TAB_APPEND( p_input->i_slave, p_input->slave, sub );
+ char *psz_autopath = var_GetString( p_input, "sub-autodetect-path" );
+ char **subs = subtitles_Detect( p_input, psz_autopath,
+ p_input->input.p_item->psz_uri );
+ input_source_t *sub;
- /* Select the ES */
- if( !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) )
+ for( i = 0; subs && subs[i]; i++ )
{
- if( count.i_int == 0 )
- count.i_int++; /* if it was first one, there is disable too */
-
- if( count.i_int < list.p_list->i_count )
+ if( strcmp( psz_subtitle, subs[i] ) )
{
- input_ControlPush( p_input, INPUT_CONTROL_SET_ES,
- &list.p_list->p_values[count.i_int] );
+ sub = InputSourceNew( p_input );
+ if( !InputSourceInit( p_input, sub, subs[i], "subtitle",
+ VLC_FALSE ) )
+ {
+ TAB_APPEND( p_input->i_slave, p_input->slave, sub );
+ }
}
- var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, NULL );
+ free( subs[i] );
}
+ if( subs ) free( subs );
+ if( psz_autopath ) free( psz_autopath );
}
- }
-
- var_Get( p_input, "sub-autodetect-file", &val );
- if( val.b_bool )
- {
- char *psz_autopath = var_GetString( p_input, "sub-autodetect-path" );
- char **subs = subtitles_Detect( p_input, psz_autopath,
- p_input->input.p_item->psz_uri );
- input_source_t *sub;
+ free( psz_subtitle );
- for( i = 0; subs[i] != NULL; i++ )
+ /* Look for slave */
+ psz = var_GetString( p_input, "input-slave" );
+ if( *psz )
{
- if( strcmp( psz_subtitle, subs[i] ) )
+ char *psz_delim;
+ input_source_t *slave;
+ while( psz && *psz )
{
- sub = InputSourceNew( p_input );
- if( !InputSourceInit( p_input, sub, subs[i], "subtitle" ) )
+ while( *psz == ' ' || *psz == '#' )
+ {
+ 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, VLC_FALSE ) )
{
- TAB_APPEND( p_input->i_slave, p_input->slave, sub );
+ TAB_APPEND( p_input->i_slave, p_input->slave, slave );
}
+ psz = psz_delim;
}
- free( subs[i] );
}
- free( subs );
- free( psz_autopath );
+ if( psz ) free( psz );
}
- free( psz_subtitle );
-
- /* Look for slave */
- psz = var_GetString( p_input, "input-slave" );
- if( *psz )
+ else
{
- char *psz_delim = strchr( psz, '#' );
+ p_input->i_start = 0;
+ p_input->i_start = 0;
+ }
- for( ;; )
+ /* Set up es_out */
+ if( !b_quick )
+ {
+ es_out_Control( p_input->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_sout )
{
- input_source_t *slave;
-
- if( psz_delim )
+ var_Get( p_input, "sout-all", &val );
+ if ( val.b_bool )
{
- *psz_delim++ = '\0';
+ i_es_out_mode = ES_OUT_MODE_ALL;
+ val.p_list = NULL;
}
-
- if( *psz == '\0' )
+ else
{
- if( psz_delim )
- continue;
+ 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
- break;
+ var_Change( p_input, "programs", VLC_VAR_FREELIST, &val,
+ NULL );
}
-
- msg_Dbg( p_input, "adding slave '%s'", psz );
- slave = InputSourceNew( p_input );
- if( !InputSourceInit( p_input, slave, psz, NULL ) )
- {
- TAB_APPEND( p_input->i_slave, p_input->slave, slave );
- }
- if( !psz_delim )
- break;
}
- }
- free( psz );
+ es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE, i_es_out_mode );
- /* Set up es_out */
- es_out_Control( p_input->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_sout )
- {
- var_Get( p_input, "sout-all", &val );
- if ( val.b_bool )
+ /* Inform the demuxer about waited group (needed only for DVB) */
+ if( i_es_out_mode == ES_OUT_MODE_ALL )
{
- i_es_out_mode = ES_OUT_MODE_ALL;
- val.p_list = NULL;
+ demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP, -1, NULL );
+ }
+ else if( i_es_out_mode == ES_OUT_MODE_PARTIAL )
+ {
+ demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP, -1,
+ val.p_list );
}
else
{
- var_Get( p_input, "programs", &val );
- if ( val.p_list && val.p_list->i_count )
+ demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP,
+ (int) var_GetInteger( p_input, "program" ), NULL );
+ }
+
+ if( p_input->p_sout )
+ {
+ if( p_input->p_sout->i_out_pace_nocontrol > 0 )
{
- i_es_out_mode = ES_OUT_MODE_PARTIAL;
- /* Note : we should remove the "program" callback. */
+ p_input->b_out_pace_control = VLC_FALSE;
}
else
- var_Change( p_input, "programs", VLC_VAR_FREELIST, &val, NULL );
- }
- }
- es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE, i_es_out_mode );
+ {
+ p_input->b_out_pace_control = VLC_TRUE;
+ }
- /* Inform the demuxer about waited group (needed only for DVB) */
- if( i_es_out_mode == ES_OUT_MODE_ALL )
- {
- demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP, -1, NULL );
- }
- else if( i_es_out_mode == ES_OUT_MODE_PARTIAL )
- {
- demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP, -1,
- val.p_list );
- }
- else
- {
- demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP,
- (int) var_GetInteger( p_input, "program" ), NULL );
- }
+ if( p_input->b_can_pace_control && p_input->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 );
+ }
- if( p_input->p_sout )
- {
- if( p_input->p_sout->i_out_pace_nocontrol > 0 )
- {
- p_input->b_out_pace_control = VLC_FALSE;
+ msg_Dbg( p_input, "starting in %s mode",
+ p_input->b_out_pace_control ? "asynch" : "synch" );
}
- else
- {
- p_input->b_out_pace_control = VLC_TRUE;
- }
- msg_Dbg( p_input, "starting in %s mode",
- p_input->b_out_pace_control ? "asynch" : "synch" );
}
/* Get meta data from users */
vlc_meta_Delete( p_meta_tmp );
}
- if( !p_input->input.p_access ||
- access2_Control( p_input->input.p_access, ACCESS_GET_META, &p_meta_tmp))
- p_meta_tmp = NULL;
-
- if( p_meta == NULL )
- {
- p_meta = p_meta_tmp;
- }
- else if( p_meta_tmp )
- {
- vlc_meta_Merge( p_meta, p_meta_tmp );
- vlc_meta_Delete( p_meta_tmp );
- }
-
- /* Get meta data from slave input */
- for( i = 0; i < p_input->i_slave; i++ )
+ /* Access_file does not give any meta, and there are no slave */
+ if( !b_quick )
{
- vlc_meta_t *p_meta_slave;
+ if( !p_input->input.p_access ||
+ access2_Control( p_input->input.p_access, ACCESS_GET_META,
+ &p_meta_tmp))
+ p_meta_tmp = NULL;
- if( !demux2_Control( p_input->slave[i]->p_demux,
- DEMUX_GET_META, &p_meta_slave ) )
+ if( p_meta == NULL )
{
- if( p_meta == NULL )
- {
- p_meta = p_meta_slave;
- }
- else if( p_meta_slave )
- {
- vlc_meta_Merge( p_meta, p_meta_slave );
- vlc_meta_Delete( p_meta_slave );
- }
+ p_meta = p_meta_tmp;
+ }
+ else if( p_meta_tmp )
+ {
+ vlc_meta_Merge( p_meta, p_meta_tmp );
+ vlc_meta_Delete( p_meta_tmp );
}
- if( p_input->slave[i]->p_access &&
- !access2_Control( p_input->slave[i]->p_access,
- ACCESS_GET_META, &p_meta_slave ) )
+ /* Get meta data from slave input */
+ for( i = 0; i < p_input->i_slave; i++ )
{
- if( p_meta == NULL )
+ vlc_meta_t *p_meta_slave;
+
+ if( !demux2_Control( p_input->slave[i]->p_demux,
+ DEMUX_GET_META, &p_meta_slave ) )
{
- p_meta = p_meta_slave;
+ if( p_meta == NULL )
+ {
+ p_meta = p_meta_slave;
+ }
+ else if( p_meta_slave )
+ {
+ vlc_meta_Merge( p_meta, p_meta_slave );
+ vlc_meta_Delete( p_meta_slave );
+ }
}
- else if( p_meta_slave )
+
+ if( p_input->slave[i]->p_access &&
+ !access2_Control( p_input->slave[i]->p_access,
+ ACCESS_GET_META, &p_meta_slave ) )
{
- vlc_meta_Merge( p_meta, p_meta_slave );
- vlc_meta_Delete( p_meta_slave );
+ if( p_meta == NULL )
+ {
+ p_meta = p_meta_slave;
+ }
+ else if( p_meta_slave )
+ {
+ vlc_meta_Merge( p_meta, p_meta_slave );
+ vlc_meta_Delete( p_meta_slave );
+ }
}
}
-
}
p_input->p_meta = p_meta;
- UpdateMeta( p_input );
+ UpdateMeta( p_input, b_quick );
- msg_Dbg( p_input, "`%s' sucessfully opened",
- p_input->input.p_item->psz_uri );
+ if( !b_quick )
+ {
+ msg_Dbg( p_input, "`%s' successfully opened",
+ p_input->input.p_item->psz_uri );
- /* Trigger intf update for this item */
- /* Playlist has a callback on this variable and will forward
- * it to intf */
- var_SetInteger( p_input, "item-change", p_input->input.p_item->i_id );
+ }
/* initialization is complete */
p_input->i_state = PLAYING_S;
if( var_Get( p_input, "sout-keep", &keep ) >= 0 && keep.b_bool && p_pl )
{
/* attach sout to the playlist */
- msg_Warn( p_input, "keeping sout" );
+ msg_Dbg( p_input, "keeping sout" );
vlc_object_detach( p_input->p_sout );
vlc_object_attach( p_input->p_sout, p_pl );
}
else
{
- msg_Warn( p_input, "destroying sout" );
+ msg_Dbg( p_input, "destroying sout" );
sout_DeleteInstance( p_input->p_sout );
}
if( p_pl )
const int i_ct = p_input->control[i].i_type;
/* XXX We can't merge INPUT_CONTROL_SET_ES */
- msg_Dbg( p_input, "[%d/%d] l=%d c=%d", i, p_input->i_control,
+/* msg_Dbg( p_input, "[%d/%d] l=%d c=%d", i, p_input->i_control,
i_lt, i_ct );
+*/
if( i_lt == i_ct &&
( i_ct == INPUT_CONTROL_SET_STATE ||
i_ct == INPUT_CONTROL_SET_RATE ||
i_ct == INPUT_CONTROL_SET_BOOKMARK ) )
{
int j;
- msg_Dbg( p_input, "merged at %d", i );
+// msg_Dbg( p_input, "merged at %d", i );
/* Remove the i-1 */
for( j = i; j < p_input->i_control; j++ )
p_input->control[j-1] = p_input->control[j];
{
vlc_bool_t b_force_update = VLC_FALSE;
+ if( !p_input ) return b_force_update;
+
switch( i_type )
{
case INPUT_CONTROL_SET_DIE:
- msg_Dbg( p_input, "control: INPUT_CONTROL_SET_DIE proceed" );
+ msg_Dbg( p_input, "control: stopping input" );
/* Mark all submodules to die */
if( p_input->input.p_access )
p_input->input.p_access->b_die = VLC_TRUE;
}
if( f_pos < 0.0 ) f_pos = 0.0;
if( f_pos > 1.0 ) f_pos = 1.0;
+ /* Reset the decoders states and clock synch (before calling the demuxer */
+ es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
if( demux2_Control( p_input->input.p_demux, DEMUX_SET_POSITION,
f_pos ) )
{
if( p_input->i_slave > 0 )
SlaveSeek( p_input );
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
b_force_update = VLC_TRUE;
}
break;
i_time += val.i_time;
}
if( i_time < 0 ) i_time = 0;
+
+ /* Reset the decoders states and clock synch (before calling the demuxer */
+ es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
+
i_ret = demux2_Control( p_input->input.p_demux,
DEMUX_SET_TIME, i_time );
if( i_ret )
{
int64_t i_length;
- /* Emulate it with a SET_POS */
+ /* Emulate it with a SET_POS */
demux2_Control( p_input->input.p_demux,
DEMUX_GET_LENGTH, &i_length );
if( i_length > 0 )
}
if( i_ret )
{
- msg_Err( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) "I64Fd
- " failed", i_time );
+ msg_Warn( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) "I64Fd
+ " failed or not possible", i_time );
}
else
{
if( p_input->i_slave > 0 )
SlaveSeek( p_input );
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
-
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
b_force_update = VLC_TRUE;
}
break;
{
/* FIXME What to do ? */
msg_Warn( p_input, "cannot unset pause -> EOF" );
+ vlc_mutex_unlock( &p_input->lock_control );
input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
+ vlc_mutex_lock( &p_input->lock_control );
}
b_force_update = VLC_TRUE;
/* Reset clock */
es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
}
else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S &&
p_input->b_can_pause )
if( i_title >= 0 && i_title < p_input->input.i_title )
{
- demux2_Control( p_demux, DEMUX_SET_TITLE, i_title );
-
input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ demux2_Control( p_demux, DEMUX_SET_TITLE, i_title );
input_ControlVarTitle( p_input, i_title );
}
}
if( i_title >= 0 && i_title < p_input->input.i_title )
{
- access2_Control( p_access, ACCESS_SET_TITLE, i_title );
- stream_AccessReset( p_input->input.p_stream );
-
input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+
+ access2_Control( p_access, ACCESS_SET_TITLE, i_title );
+ stream_AccessReset( p_input->input.p_stream );
}
}
break;
{
demux_t *p_demux = p_input->input.p_demux;
int i_seekpoint;
+ int64_t i_input_time;
+ int64_t i_seekpoint_time;
if( i_type == INPUT_CONTROL_SET_SEEKPOINT_PREV )
- i_seekpoint = p_demux->info.i_seekpoint - 1;
+ {
+ i_seekpoint = p_demux->info.i_seekpoint;
+ i_seekpoint_time = p_input->input.title[p_demux->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
+ if( i_seekpoint_time >= 0 &&
+ !demux2_Control( p_demux,
+ DEMUX_GET_TIME, &i_input_time ) )
+ {
+ if ( i_input_time < i_seekpoint_time + 3000000 )
+ i_seekpoint--;
+ }
+ else
+ i_seekpoint--;
+ }
else if( i_type == INPUT_CONTROL_SET_SEEKPOINT_NEXT )
i_seekpoint = p_demux->info.i_seekpoint + 1;
else
if( i_seekpoint >= 0 && i_seekpoint <
p_input->input.title[p_demux->info.i_title]->i_seekpoint )
{
- demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
-
input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+
+ demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
}
}
else if( p_input->input.i_title > 0 )
{
+ demux_t *p_demux = p_input->input.p_demux;
access_t *p_access = p_input->input.p_access;
int i_seekpoint;
+ int64_t i_input_time;
+ int64_t i_seekpoint_time;
if( i_type == INPUT_CONTROL_SET_SEEKPOINT_PREV )
- i_seekpoint = p_access->info.i_seekpoint - 1;
- else if( i_type == INPUT_CONTROL_SET_TITLE_NEXT )
+ {
+ i_seekpoint = p_access->info.i_seekpoint;
+ i_seekpoint_time = p_input->input.title[p_access->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
+ if( i_seekpoint_time >= 0 &&
+ demux2_Control( p_demux,
+ DEMUX_GET_TIME, &i_input_time ) )
+ {
+ if ( i_input_time < i_seekpoint_time + 3000000 )
+ i_seekpoint--;
+ }
+ else
+ i_seekpoint--;
+ }
+ else if( i_type == INPUT_CONTROL_SET_SEEKPOINT_NEXT )
i_seekpoint = p_access->info.i_seekpoint + 1;
else
i_seekpoint = val.i_int;
if( i_seekpoint >= 0 && i_seekpoint <
p_input->input.title[p_access->info.i_title]->i_seekpoint )
{
+ input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
+ es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+
access2_Control( p_access, ACCESS_SET_SEEKPOINT, i_seekpoint );
stream_AccessReset( p_input->input.p_stream );
+ }
+ }
+ break;
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ case INPUT_CONTROL_ADD_SLAVE:
+ if( val.psz_string )
+ {
+ input_source_t *slave = InputSourceNew( p_input );
+
+ if( !InputSourceInit( p_input, slave, val.psz_string, NULL,
+ VLC_FALSE ) )
+ {
+ vlc_meta_t *p_meta_new = NULL;
+ vlc_meta_t *p_meta;
+ int64_t i_time;
+
+ /* Add the slave */
+ msg_Dbg( p_input, "adding %s as slave on the fly",
+ val.psz_string );
+
+ /* Set position */
+ if( demux2_Control( p_input->input.p_demux,
+ DEMUX_GET_TIME, &i_time ) )
+ {
+ msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
+ InputSourceClean( p_input, slave );
+ free( slave );
+ break;
+ }
+ if( demux2_Control( slave->p_demux,
+ DEMUX_SET_TIME, i_time ) )
+ {
+ msg_Err( p_input, "seek failed for new slave" );
+ InputSourceClean( p_input, slave );
+ free( slave );
+ break;
+ }
+
+
+ /* Get meta (access and demux) */
+ if( access2_Control( slave->p_access,
+ ACCESS_GET_META, &p_meta_new ) )
+ p_meta_new = NULL;
+ if( !demux2_Control( slave->p_demux,
+ DEMUX_GET_META, &p_meta ) )
+ {
+ if( p_meta_new )
+ {
+ vlc_meta_Merge( p_meta_new, p_meta );
+ vlc_meta_Delete( p_meta );
+ }
+ else
+ {
+ p_meta_new = p_meta;
+ }
+ }
+ /* Update meta */
+ if( p_meta_new )
+ {
+ if( p_input->p_meta )
+ {
+ vlc_meta_Merge( p_input->p_meta, p_meta_new );
+ vlc_meta_Delete( p_meta_new );
+ }
+ else
+ {
+ p_input->p_meta = p_meta_new;
+ }
+ UpdateMeta( p_input, VLC_FALSE );
+ }
+
+ TAB_APPEND( p_input->i_slave, p_input->slave, slave );
}
+ else
+ {
+ msg_Warn( p_input, "failed to add %s as slave",
+ val.psz_string );
+ }
+
+ free( val.psz_string );
}
break;
p_input->p_meta = p_meta;
}
- UpdateMeta( p_input );
+ UpdateMeta( p_input, VLC_FALSE );
+ var_SetBool( p_input, "item-change", p_input->input.p_item->i_id );
}
p_access->info.i_update &= ~INPUT_UPDATE_META;
}
/*****************************************************************************
* UpdateMeta:
*****************************************************************************/
-static int UpdateMeta( input_thread_t *p_input )
+static int UpdateMeta( input_thread_t *p_input, vlc_bool_t b_quick )
{
vlc_meta_t *p_meta = p_input->p_meta;
int i;
if( !p_meta || p_meta->i_meta == 0 )
return VLC_SUCCESS;
- msg_Dbg( p_input, "meta information:" );
+ if( !b_quick ) msg_Dbg( p_input, "meta information:" );
for( i = 0; i < p_meta->i_meta; i++ )
{
- msg_Dbg( p_input, " - '%s' = '%s'",
- _(p_meta->name[i]), p_meta->value[i] );
+ if( !b_quick )
+ msg_Dbg( p_input, " - '%s' = '%s'",
+ _(p_meta->name[i]), p_meta->value[i] );
- if( !strcmp(p_meta->name[i], VLC_META_TITLE) && p_meta->value[i] )
+ if( !strcmp(p_meta->name[i], VLC_META_TITLE) && p_meta->value[i] &&
+ !p_input->input.p_item->b_fixed_name )
input_Control( p_input, INPUT_SET_NAME, p_meta->value[i] );
if( !strcmp( p_meta->name[i], VLC_META_AUTHOR ) )
/*****************************************************************************
* UpdateItemLength:
*****************************************************************************/
-static void UpdateItemLength( input_thread_t *p_input, int64_t i_length )
+static void UpdateItemLength( input_thread_t *p_input, int64_t i_length,
+ vlc_bool_t b_quick )
{
+ playlist_t *p_playlist;
char psz_buffer[MSTRTIME_MAX_SIZE];
vlc_mutex_lock( &p_input->input.p_item->lock );
p_input->input.p_item->i_duration = i_length;
vlc_mutex_unlock( &p_input->input.p_item->lock );
+ p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST,
+ FIND_PARENT);
+ if( p_playlist )
+ {
+ var_SetInteger( p_playlist, "item-change",
+ p_input->input.p_item->i_id );
+ vlc_object_release( p_playlist );
+ }
+
input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Duration"),
msecstotimestr( psz_buffer, i_length / 1000 ) );
}
*****************************************************************************/
static input_source_t *InputSourceNew( input_thread_t *p_input )
{
- input_source_t *in = malloc( sizeof( input_source_t ) );
+ 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;
*****************************************************************************/
static int InputSourceInit( input_thread_t *p_input,
input_source_t *in, char *psz_mrl,
- char *psz_forced_demux )
+ char *psz_forced_demux, vlc_bool_t b_quick )
{
char *psz_dup = strdup( psz_mrl );
char *psz_access;
char *psz_demux;
char *psz_path;
+ char *psz_tmp;
+ char *psz;
vlc_value_t val;
+ if( !in ) return VLC_EGENERIC;
+
/* Split uri */
- MRLSplit( p_input, psz_dup, &psz_access, &psz_demux, &psz_path );
+ if( !b_quick )
+ {
+ MRLSplit( VLC_OBJECT(p_input), 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 );
+ 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 ) && strncmp( psz_access, "rtp", 3 )) )
+ /* Hack to allow udp://@:port syntax */
+ if( !psz_access ||
+ (strncmp( psz_access, "udp", 3 ) &&
+ strncmp( psz_access, "rtp", 3 )) )
- /* Find optional titles and seekpoints */
- MRLSections( p_input, psz_path, &in->i_title_start, &in->i_title_end,
- &in->i_seekpoint_start, &in->i_seekpoint_end );
+ /* Find optional titles and seekpoints */
+ MRLSections( p_input, psz_path, &in->i_title_start, &in->i_title_end,
+ &in->i_seekpoint_start, &in->i_seekpoint_end );
- if( psz_forced_demux && *psz_forced_demux )
- psz_demux = psz_forced_demux;
+ if( psz_forced_demux && *psz_forced_demux )
+ {
+ psz_demux = psz_forced_demux;
+ }
+ else if( !psz_demux || *psz_demux == '\0' )
+ {
+ /* special hack for forcing a demuxer with --demux=module
+ * (and do nothing with a list) */
+ char *psz_var_demux = var_GetString( p_input, "demux" );
+
+ if( *psz_var_demux != '\0' &&
+ !strchr(psz_var_demux, ',' ) &&
+ !strchr(psz_var_demux, ':' ) )
+ {
+ psz_demux = psz_var_demux;
+
+ msg_Dbg( p_input, "Enforce demux ` %s'", psz_demux );
+ }
+ else if( psz_var_demux )
+ {
+ free( psz_var_demux );
+ }
+ }
- /* Try access_demux if no demux given */
- if( *psz_demux == '\0' )
+ /* 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_es_out, VLC_FALSE );
+ }
+ }
+ else
{
- in->p_demux = demux2_New( p_input, psz_access, psz_demux, psz_path,
- NULL, p_input->p_es_out );
+ psz_path = psz_mrl;
+ msg_Dbg( p_input, "trying to preparse %s", psz_path );
+ psz_demux = strdup( "" );
+ psz_access = strdup( "file" );
}
if( in->p_demux )
int64_t i_pts_delay;
/* Now try a real access */
- in->p_access = access2_New( p_input, psz_access, psz_demux, psz_path );
+ in->p_access = access2_New( p_input, psz_access, psz_demux, psz_path,
+ b_quick );
/* Access failed, URL encoded ? */
if( in->p_access == NULL && strchr( psz_path, '%' ) )
{
DecodeUrl( psz_path );
- msg_Dbg( p_input, "retying with access `%s' demux `%s' path `%s'",
+ 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 );
+ psz_access, psz_demux, psz_path,
+ b_quick );
}
#ifndef WIN32 /* Remove this gross hack from the win32 build as colons
* are forbidden in filenames on Win32. */
if( in->p_access == NULL &&
*psz_access == '\0' && ( *psz_demux || *psz_path ) )
{
- free( psz_dup );
+ if( psz_dup ) free( psz_dup );
psz_dup = strdup( psz_mrl );
psz_access = "";
psz_demux = "";
psz_path = psz_dup;
in->p_access = access2_New( p_input,
- psz_access, psz_demux, psz_path );
+ psz_access, psz_demux, psz_path,
+ b_quick );
}
#endif
if( in->p_access == NULL )
{
msg_Err( p_input, "no suitable access module for `%s'", psz_mrl );
+ intf_UserFatal( VLC_OBJECT( p_input),
+ _("Errors"),"Unable to open '%s'", psz_mrl );
goto error;
}
- /* Get infos from access */
- access2_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 );
+ /* */
+ psz_tmp = psz = var_GetString( p_input, "access-filter" );
+ while( psz && *psz )
+ {
+ access_t *p_access = in->p_access;
+ char *end = strchr( psz, ':' );
- in->b_title_demux = VLC_FALSE;
- if( access2_Control( in->p_access, ACCESS_GET_TITLE_INFO,
- &in->title, &in->i_title,
- &in->i_title_offset, &in->i_seekpoint_offset ) )
+ if( end )
+ *end++ = '\0';
+
+ in->p_access = access2_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;
+ }
+ if( psz_tmp ) free( psz_tmp );
+ /* Get infos from access */
+ if( !b_quick )
{
- in->i_title = 0;
- in->title = NULL;
+ access2_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->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,
+ &in->b_can_pace_control );
+ access2_Control( in->p_access, ACCESS_CAN_PAUSE,
+ &in->b_can_pause );
+ access2_Control( in->p_access, ACCESS_CAN_SEEK,
+ &val.b_bool );
+ var_Set( p_input, "seekable", val );
}
- access2_Control( in->p_access, ACCESS_CAN_CONTROL_PACE,
- &in->b_can_pace_control );
- access2_Control( in->p_access, ACCESS_CAN_PAUSE,
- &in->b_can_pause );
- access2_Control( in->p_access, ACCESS_CAN_SEEK,
- &val.b_bool );
- var_Set( p_input, "seekable", val );
/* Create the stream_t */
- in->p_stream = stream_AccessNew( in->p_access );
+ in->p_stream = stream_AccessNew( in->p_access, b_quick );
if( in->p_stream == NULL )
{
msg_Warn( p_input, "cannot create a stream_t from access" );
psz_demux = in->p_access->psz_demux;
}
in->p_demux = demux2_New( p_input, psz_access, psz_demux, psz_path,
- in->p_stream, p_input->p_es_out );
+ in->p_stream, p_input->p_es_out, b_quick );
if( in->p_demux == NULL )
{
msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
psz_access, psz_demux, psz_path );
+ intf_UserFatal( VLC_OBJECT( p_input), _("Errors"),
+ "Unrecognized format for '%s'", psz_mrl );
goto error;
}
/* TODO get title from demux */
- if( in->i_title <= 0 )
+ if( !b_quick && in->i_title <= 0 )
{
if( demux2_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
&in->title, &in->i_title,
}
}
}
- free( psz_dup );
+
+ if( var_GetInteger( p_input, "clock-synchro" ) != -1 )
+ in->b_can_pace_control = !var_GetInteger( p_input, "clock-synchro" );
+
+ if( psz_dup ) free( psz_dup );
return VLC_SUCCESS;
error:
demux2_Delete( in->p_demux );
if( in->p_stream )
- stream_AccessDelete( in->p_stream );
+ stream_Delete( in->p_stream );
if( in->p_access )
access2_Delete( in->p_access );
- free( psz_dup );
+ if( psz_dup ) free( psz_dup );
return VLC_EGENERIC;
}
demux2_Delete( in->p_demux );
if( in->p_stream )
- stream_AccessDelete( in->p_stream );
+ stream_Delete( in->p_stream );
if( in->p_access )
access2_Delete( in->p_access );
{
int64_t i_time;
int i;
+
if( demux2_Control( p_input->input.p_demux, DEMUX_GET_TIME, &i_time ) )
{
msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
*psz++ = *p++;
}
}
- *psz++ ='\0';
- free( dup );
+ if( psz ) *psz++ ='\0';
+ if( dup ) free( dup );
}
/*****************************************************************************
psz_name = strndup( psz_name, i_name_len );
if( psz_value ) psz_value++;
- i_type = config_GetType( p_input, psz_name );
+ /* FIXME: :programs should be handled generically */
+ if( !strcmp( psz_name, "programs" ) )
+ i_type = VLC_VAR_LIST;
+ else
+ i_type = config_GetType( p_input, psz_name );
if( !i_type && !psz_value )
{
break;
case VLC_VAR_INTEGER:
- val.i_int = atoi( psz_value );
+ val.i_int = strtol( psz_value, NULL, 0 );
break;
case VLC_VAR_FLOAT:
val.psz_string = psz_value;
break;
+ case VLC_VAR_LIST:
+ {
+ char *psz_orig, *psz_var;
+ vlc_list_t *p_list = malloc(sizeof(vlc_list_t));
+ val.p_list = p_list;
+ p_list->i_count = 0;
+
+ psz_var = psz_orig = strdup(psz_value);
+ while( psz_var && *psz_var )
+ {
+ char *psz_item = psz_var;
+ vlc_value_t val2;
+ while( *psz_var && *psz_var != ',' ) psz_var++;
+ if( *psz_var == ',' )
+ {
+ *psz_var = '\0';
+ psz_var++;
+ }
+ val2.i_int = strtol( psz_item, NULL, 0 );
+ INSERT_ELEM( p_list->p_values, p_list->i_count,
+ p_list->i_count, val2 );
+ /* p_list->i_count is incremented twice by INSERT_ELEM */
+ p_list->i_count--;
+ INSERT_ELEM( p_list->pi_types, p_list->i_count,
+ p_list->i_count, VLC_VAR_INTEGER );
+ }
+ if( psz_orig ) free( psz_orig );
+ break;
+ }
+
default:
goto cleanup;
break;
var_Set( p_input, psz_name, val );
- msg_Dbg( p_input, "set input option: %s to %s", psz_name, psz_value ? psz_value : ( val.b_bool ? "true" : "false") );
+ msg_Dbg( p_input, "set input option: %s to %s", psz_name,
+ psz_value ? psz_value : ( val.b_bool ? "true" : "false") );
cleanup:
if( psz_name ) free( psz_name );
* MRLSplit: parse the access, demux and url part of the
* Media Resource Locator.
*****************************************************************************/
-static void MRLSplit( input_thread_t *p_input, char *psz_dup,
- char **ppsz_access, char **ppsz_demux, char **ppsz_path )
+void MRLSplit( vlc_object_t *p_input, char *psz_dup,
+ char **ppsz_access, char **ppsz_demux, char **ppsz_path )
{
char *psz_access = NULL;
char *psz_demux = NULL;
psz_source, *pi_title_start, *pi_chapter_start,
*pi_title_end, *pi_chapter_end );
}
+
+
+/***********************************************************************
+ * Info management functions
+ ***********************************************************************/
+/**
+ * Get a info item from a given category in a given input item.
+ *
+ * \param p_i The input item to get info from
+ * \param psz_cat String representing the category for the info
+ * \param psz_name String representing the name of the desired info
+ * \return A pointer to the string with the given info if found, or an
+ * empty string otherwise. The caller should free the returned
+ * pointer.
+ */
+char *vlc_input_item_GetInfo( input_item_t *p_i,
+ const char *psz_cat,
+ const char *psz_name )
+{
+ int i,j;
+
+ vlc_mutex_lock( &p_i->lock );
+
+ for( i = 0 ; i< p_i->i_categories ; i++ )
+ {
+ info_category_t *p_cat = p_i->pp_categories[i];
+
+ if( !psz_cat || strcmp( p_cat->psz_name, psz_cat ) )
+ continue;
+
+ for( j = 0; j < p_cat->i_infos ; j++ )
+ {
+ if( !strcmp( p_cat->pp_infos[j]->psz_name, psz_name ) )
+ {
+ char *psz_ret = strdup( p_cat->pp_infos[j]->psz_value );
+ vlc_mutex_unlock( &p_i->lock );
+ return psz_ret;
+ }
+ }
+ }
+ vlc_mutex_unlock( &p_i->lock );
+ return strdup( "" );
+}
+
+int vlc_input_item_AddInfo( input_item_t *p_i,
+ const char *psz_cat,
+ const char *psz_name,
+ const char *psz_format, ... )
+{
+ va_list args;
+ int i;
+ info_t *p_info = NULL;
+ info_category_t *p_cat = NULL ;
+
+ vlc_mutex_lock( &p_i->lock );
+
+ for( i = 0 ; i < p_i->i_categories ; i ++ )
+ {
+ if( !strcmp( p_i->pp_categories[i]->psz_name, psz_cat ) )
+ {
+ p_cat = p_i->pp_categories[i];
+ break;
+ }
+ }
+ if( !p_cat )
+ {
+ if( !(p_cat = (info_category_t *)malloc( sizeof(info_category_t) )) )
+ {
+ vlc_mutex_unlock( &p_i->lock );
+ return VLC_EGENERIC;
+ }
+ p_cat->psz_name = strdup( psz_cat );
+ p_cat->i_infos = 0;
+ p_cat->pp_infos = 0;
+ INSERT_ELEM( p_i->pp_categories, p_i->i_categories, p_i->i_categories,
+ p_cat );
+ }
+
+ for( i = 0; i< p_cat->i_infos; i++ )
+ {
+ if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) )
+ {
+ p_info = p_cat->pp_infos[i];
+ break;
+ }
+ }
+
+ if( !p_info )
+ {
+ if( ( p_info = (info_t *)malloc( sizeof( info_t ) ) ) == NULL )
+ {
+ vlc_mutex_unlock( &p_i->lock );
+ return VLC_EGENERIC;
+ }
+ INSERT_ELEM( p_cat->pp_infos, p_cat->i_infos, p_cat->i_infos, p_info );
+ p_info->psz_name = strdup( psz_name );
+ }
+ else
+ {
+ if( p_info->psz_value ) free( p_info->psz_value );
+ }
+
+ va_start( args, psz_format );
+ vasprintf( &p_info->psz_value, psz_format, args);
+ va_end( args );
+
+ vlc_mutex_unlock( &p_i->lock );
+
+ return VLC_SUCCESS;
+}
+
projects / vlc / blobdiff