/*****************************************************************************
* input.c: input thread
*****************************************************************************
- * Copyright (C) 1998-2004 VideoLAN
+ * Copyright (C) 1998-2007 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <ctype.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/decoder.h>
-#include <vlc/vout.h>
+
+#include <ctype.h>
+#include <limits.h>
+#include <assert.h>
#include "input_internal.h"
-#include "stream_output.h"
-#include "vlc_playlist.h"
-#include "vlc_interface.h"
+#include <vlc_sout.h>
+#include "../stream_output/stream_output.h"
+
+#include <vlc_playlist.h>
+#include <vlc_interface.h>
+#include <vlc_url.h>
+#include <vlc_charset.h>
+
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+static void Destructor( input_thread_t * p_input );
+
static int Run ( input_thread_t *p_input );
+static int RunAndDestroy ( input_thread_t *p_input );
-static 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 input_thread_t * Create ( vlc_object_t *, input_item_t *,
+ const char *, vlc_bool_t, sout_instance_t * );
+static int Init ( input_thread_t *p_input );
+static void Error ( input_thread_t *p_input );
+static void End ( input_thread_t *p_input );
+static void MainLoop( input_thread_t *p_input );
static inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t * );
static void ControlReduce( input_thread_t * );
static vlc_bool_t Control( input_thread_t *, int, vlc_value_t );
-
static int UpdateFromAccess( input_thread_t * );
static int UpdateFromDemux( input_thread_t * );
-static int UpdateMeta( input_thread_t *, vlc_bool_t );
-static void UpdateItemLength( input_thread_t *, int64_t i_length, vlc_bool_t );
+static void UpdateItemLength( input_thread_t *, int64_t i_length );
-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 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,
- vlc_bool_t b_quick );
-static void InputSourceClean( input_thread_t *, input_source_t * );
-
+ const char *, const char *psz_forced_demux );
+static void InputSourceClean( input_source_t * );
+/* TODO */
+//static void InputGetAttachments( input_thread_t *, input_source_t * );
static void SlaveDemux( input_thread_t *p_input );
static void SlaveSeek( input_thread_t *p_input );
-static vlc_meta_t *InputMetaUser( 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 sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, vlc_bool_t * );
+static void SoutKeep( sout_instance_t * );
+
+static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_demux );
+static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment,
+ int i_new, input_attachment_t **pp_new );
/*****************************************************************************
- * 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.
*
* * Get only:
* - length
* - bookmarks
- * - seekable (if you can seek, it doesn't say if 'bar display' has be shown or not, for that check position != 0.0)
+ * - seekable (if you can seek, it doesn't say if 'bar display' has be shown
+ * or not, for that check position != 0.0)
+ * - can-pause
* * For intf callback upon changes
* - intf-change
+ * - rate-change for when playback rate changes
* 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,
+ const char *psz_header, vlc_bool_t b_quick,
+ sout_instance_t *p_sout )
{
- input_thread_t *p_input; /* thread descriptor */
+ static const char input_name[] = "input";
+ input_thread_t *p_input = NULL; /* thread descriptor */
vlc_value_t val;
int i;
/* Allocate descriptor */
- p_input = vlc_object_create( p_parent, VLC_OBJECT_INPUT );
+ p_input = vlc_custom_create( p_parent, sizeof( *p_input ),
+ VLC_OBJECT_INPUT, input_name );
if( p_input == NULL )
{
msg_Err( p_parent, "out of memory" );
return NULL;
}
+ MALLOC_NULL( p_input->p, input_thread_private_t );
+
+ /* One "randomly" selected input thread is responsible for computing
+ * the global stats. Check if there is already someone doing this */
+ if( p_input->p_libvlc->p_stats && !b_quick )
+ {
+ vlc_mutex_lock( &p_input->p_libvlc->p_stats->lock );
+ if( p_input->p_libvlc->p_stats_computer == NULL )
+ {
+ p_input->p_libvlc->p_stats_computer = p_input;
+ }
+ vlc_mutex_unlock( &p_input->p_libvlc->p_stats->lock );
+ }
+
+ p_input->b_preparsing = b_quick;
+ p_input->psz_header = psz_header ? strdup( psz_header ) : NULL;
/* Init Common fields */
p_input->b_eof = VLC_FALSE;
p_input->b_can_pace_control = VLC_TRUE;
- p_input->i_start = 0;
+ p_input->p->i_start = 0;
p_input->i_time = 0;
- p_input->i_stop = 0;
- p_input->i_title = 0;
- p_input->title = NULL;
- p_input->i_title_offset = p_input->i_seekpoint_offset = 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->i_rate = INPUT_RATE_DEFAULT;
- p_input->i_bookmark = 0;
- p_input->bookmark = NULL;
- p_input->p_meta = NULL;
- p_input->p_es_out = NULL;
- p_input->p_sout = NULL;
- p_input->b_out_pace_control = VLC_FALSE;
+ p_input->p->i_rate = INPUT_RATE_DEFAULT;
+ TAB_INIT( p_input->p->i_bookmark, p_input->p->bookmark );
+ TAB_INIT( p_input->p->i_attachment, p_input->p->attachment );
+ p_input->p->p_es_out = NULL;
+ p_input->p->p_sout = NULL;
+ p_input->p->b_owns_its_sout = VLC_TRUE;
+ p_input->p->b_sout_keep = VLC_FALSE;
+ p_input->p->b_out_pace_control = VLC_FALSE;
p_input->i_pts_delay = 0;
/* Init Input fields */
- p_input->input.p_item = p_item;
- p_input->input.p_access = NULL;
- p_input->input.p_stream = NULL;
- p_input->input.p_demux = NULL;
- p_input->input.b_title_demux = VLC_FALSE;
- p_input->input.i_title = 0;
- p_input->input.title = NULL;
- p_input->input.i_title_offset = p_input->input.i_seekpoint_offset = 0;
- p_input->input.b_can_pace_control = VLC_TRUE;
- p_input->input.b_eof = VLC_FALSE;
- p_input->input.i_cr_average = 0;
+ p_input->p->input.p_item = p_item;
+ p_input->p->input.p_access = NULL;
+ p_input->p->input.p_stream = NULL;
+ p_input->p->input.p_demux = NULL;
+ p_input->p->input.b_title_demux = VLC_FALSE;
+ p_input->p->input.i_title = 0;
+ p_input->p->input.title = NULL;
+ p_input->p->input.i_title_offset = p_input->p->input.i_seekpoint_offset = 0;
+ p_input->p->input.b_can_pace_control = VLC_TRUE;
+ p_input->p->input.b_can_rate_control = VLC_TRUE;
+ p_input->p->input.b_rescale_ts = VLC_TRUE;
+ p_input->p->input.b_eof = VLC_FALSE;
+ p_input->p->input.i_cr_average = 0;
+
+ vlc_mutex_lock( &p_item->lock );
+
+ if( !p_item->p_stats )
+ p_item->p_stats = stats_NewInputStats( p_input );
+ vlc_mutex_unlock( &p_item->lock );
/* No slave */
- p_input->i_slave = 0;
- p_input->slave = NULL;
+ p_input->p->i_slave = 0;
+ p_input->p->slave = NULL;
/* Init control buffer */
- vlc_mutex_init( p_input, &p_input->lock_control );
- p_input->i_control = 0;
+ vlc_mutex_init( p_input, &p_input->p->lock_control );
+ p_input->p->i_control = 0;
/* Parse input options */
vlc_mutex_lock( &p_item->lock );
+ assert( p_item->optflagc == p_item->i_options );
for( i = 0; i < p_item->i_options; i++ )
- {
-// msg_Dbg( p_input, "option: %s", p_item->ppsz_options[i] );
- ParseOption( p_input, p_item->ppsz_options[i] );
- }
+ var_OptionParse( VLC_OBJECT(p_input), p_item->ppsz_options[i],
+ !!(p_item->optflagv[i] & VLC_INPUT_OPTION_TRUSTED) );
vlc_mutex_unlock( &p_item->lock );
/* Create Object Variables for private use only */
/* Create Objects variables for public Get and Set */
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, ',' ) ) )
- {
- *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);
- }
- else if( !strncmp( psz_start, "time=", 5 ) )
- {
- seekpoint.i_time_offset = atoll(psz_start + 5) * 1000000;
+
+ p_input->p->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
+
+ if( !p_input->b_preparsing )
+ {
+ 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 *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 = strdup(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;
}
- 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 );
}
- /* Now we can attach our new input */
- vlc_object_attach( p_input, p_parent );
+ /* Remove 'Now playing' info as it is probably outdated */
+ input_Control( p_input, INPUT_DEL_INFO,
+ _(VLC_META_INFO_CAT),
+ _(VLC_META_NOW_PLAYING) );
+ input_item_SetNowPlaying( p_item, NULL );
- /* Create thread and wait for its readiness. */
- if( vlc_thread_create( p_input, "input", Run,
- VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
+ /* */
+ if( p_input->b_preparsing )
+ p_input->i_flags |= OBJECT_FLAGS_QUIET | OBJECT_FLAGS_NOINTERACT;
+
+ /* */
+ if( p_sout )
{
- msg_Err( p_input, "cannot create input thread" );
- vlc_object_detach( p_input );
- vlc_object_destroy( p_input );
- return NULL;
+ p_input->p->p_sout = p_sout;
+ p_input->p->b_owns_its_sout = VLC_FALSE;
}
+ memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) );
+ vlc_mutex_init( p_input, &p_input->p->counters.counters_lock );
+
+ /* Attach only once we are ready */
+ vlc_object_attach( p_input, p_parent );
+
+ /* Set the destructor when we are sure we are initialized */
+ vlc_object_set_destructor( p_input, (vlc_destructor_t)Destructor );
+
return p_input;
}
-/*****************************************************************************
- * input_PreParse: Lightweight input for playlist item preparsing
- *****************************************************************************/
-int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item )
+/**
+ * Input destructor (called when the object's refcount reaches 0).
+ */
+static void Destructor( input_thread_t * p_input )
{
- input_thread_t *p_input; /* thread descriptor */
- int i;
+ input_thread_private_t *priv = p_input->p;
- /* Allocate descriptor */
- p_input = vlc_object_create( p_parent, VLC_OBJECT_INPUT );
- if( p_input == NULL )
+ if( priv->b_owns_its_sout && priv->p_sout )
{
- msg_Err( p_parent, "out of memory" );
- return VLC_EGENERIC;
+ if( priv->b_sout_keep )
+ SoutKeep( priv->p_sout );
+ else
+ sout_DeleteInstance( priv->p_sout );
}
- /* Init Common fields */
- p_input->b_eof = VLC_FALSE;
- p_input->b_can_pace_control = VLC_TRUE;
- p_input->i_start = 0;
- p_input->i_time = 0;
- p_input->i_stop = 0;
- p_input->i_title = 0;
- p_input->title = NULL;
- p_input->i_title_offset = p_input->i_seekpoint_offset = 0;
- p_input->i_state = INIT_S;
- p_input->i_rate = INPUT_RATE_DEFAULT;
- p_input->i_bookmark = 0;
- p_input->bookmark = NULL;
- p_input->p_meta = NULL;
- p_input->p_es_out = NULL;
- p_input->p_sout = NULL;
- p_input->b_out_pace_control = VLC_FALSE;
- p_input->i_pts_delay = 0;
+ vlc_mutex_destroy( &p_input->p->counters.counters_lock );
- /* Init Input fields */
- p_input->input.p_item = p_item;
- p_input->input.p_access = NULL;
- p_input->input.p_stream = NULL;
- p_input->input.p_demux = NULL;
- p_input->input.b_title_demux = VLC_FALSE;
- p_input->input.i_title = 0;
- p_input->input.title = NULL;
- p_input->input.i_title_offset = p_input->input.i_seekpoint_offset = 0;
- p_input->input.b_can_pace_control = VLC_TRUE;
- p_input->input.b_eof = VLC_FALSE;
- p_input->input.i_cr_average = 0;
+ vlc_mutex_destroy( &priv->lock_control );
+ free( priv );
+}
- /* No slave */
- p_input->i_slave = 0;
- p_input->slave = NULL;
+/**
+ * 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 )
+{
+ vlc_bool_t b_sout_keep;
+ sout_instance_t *p_sout = SoutFind( p_parent, p_item, &b_sout_keep );
+ input_thread_t *p_input = __input_CreateThreadExtended( p_parent, p_item, NULL, p_sout );
- /* Init control buffer */
- vlc_mutex_init( p_input, &p_input->lock_control );
- p_input->i_control = 0;
+ if( !p_input && p_sout )
+ SoutKeep( p_sout );
- /* Parse input options */
- vlc_mutex_lock( &p_item->lock );
- for( i = 0; i < p_item->i_options; i++ )
+ p_input->p->b_sout_keep = b_sout_keep;
+ return p_input;
+}
+
+/* */
+input_thread_t *__input_CreateThreadExtended( vlc_object_t *p_parent,
+ input_item_t *p_item,
+ const char *psz_log, sout_instance_t *p_sout )
+{
+ input_thread_t *p_input;
+
+ p_input = Create( p_parent, p_item, psz_log, VLC_FALSE, p_sout );
+ if( !p_input )
+ return NULL;
+
+ /* Create thread and wait for its readiness. */
+ if( vlc_thread_create( p_input, "input", Run,
+ VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
{
- ParseOption( p_input, p_item->ppsz_options[i] );
+ input_ChangeState( p_input, ERROR_S );
+ msg_Err( p_input, "cannot create input thread" );
+ vlc_object_detach( p_input );
+ vlc_object_release( p_input );
+ return NULL;
}
- vlc_mutex_unlock( &p_item->lock );
-
- /* Create Object Variables for private use only */
- input_ConfigVarInit( p_input );
- input_ControlVarInit( p_input );
- p_input->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
+ return p_input;
+}
- /* Now we can attach our new input */
- vlc_object_attach( p_input, p_parent );
+/**
+ * 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 )
+{
+ vlc_bool_t b_sout_keep;
+ sout_instance_t *p_sout = SoutFind( p_parent, p_item, &b_sout_keep );
+ input_thread_t *p_input;
- Init( p_input, VLC_TRUE );
+ p_input = Create( p_parent, p_item, NULL, VLC_FALSE, p_sout );
+ if( !p_input && p_sout )
+ {
+ SoutKeep( p_sout );
+ return VLC_EGENERIC;
+ }
+ p_input->p->b_sout_keep = b_sout_keep;
- /* Clean up master */
- InputSourceClean( p_input, &p_input->input );
+ if( b_block )
+ {
+ RunAndDestroy( p_input );
+ return VLC_SUCCESS;
+ }
+ else
+ {
+ if( vlc_thread_create( p_input, "input", RunAndDestroy,
+ VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
+ {
+ input_ChangeState( p_input, ERROR_S );
+ msg_Err( p_input, "cannot create input thread" );
+ vlc_object_release( p_input );
+ return VLC_EGENERIC;
+ }
+ }
+ return p_input->i_object_id;
+}
- /* 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;
+/**
+ * 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;
- /* Unload all modules */
- if( p_input->p_es_out ) input_EsOutDelete( p_input->p_es_out );
+ /* Allocate descriptor */
+ p_input = Create( p_parent, p_item, NULL, VLC_TRUE, NULL );
+ if( !p_input )
+ return VLC_EGENERIC;
- /* Delete meta */
- if( p_input->p_meta ) vlc_meta_Delete( p_input->p_meta );
+ if( !Init( p_input ) )
+ End( p_input );
vlc_object_detach( p_input );
- vlc_object_destroy( p_input );
+ vlc_object_release( p_input );
return VLC_SUCCESS;
}
-/*****************************************************************************
- * input_StopThread: mark an input thread as zombie
- *****************************************************************************
- * This function should not return until the thread is effectively cancelled.
- *****************************************************************************/
+/**
+ * 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;
int i;
/* Set die for input */
- p_input->b_die = VLC_TRUE;
+ vlc_object_kill( p_input );
+ /* FIXME: seems to be duplicated in ControlPush(INPUT_CONTROL_SET_DIE) */
- /* We cannot touch p_input fields directly (we can from another thread),
+ /* We cannot touch p_input fields directly (we come from another thread),
* so use the vlc_object_find way, it's perfectly safe */
/* Set die for all access */
p_list = vlc_list_find( p_input, VLC_OBJECT_ACCESS, FIND_CHILD );
for( i = 0; i < p_list->i_count; i++ )
{
- p_list->p_values[i].p_object->b_die = VLC_TRUE;
+ vlc_object_kill( p_list->p_values[i].p_object );
}
vlc_list_release( p_list );
p_list = vlc_list_find( p_input, VLC_OBJECT_STREAM, FIND_CHILD );
for( i = 0; i < p_list->i_count; i++ )
{
- p_list->p_values[i].p_object->b_die = VLC_TRUE;
+ vlc_object_kill( p_list->p_values[i].p_object );
}
vlc_list_release( p_list );
p_list = vlc_list_find( p_input, VLC_OBJECT_DEMUX, FIND_CHILD );
for( i = 0; i < p_list->i_count; i++ )
{
- p_list->p_values[i].p_object->b_die = VLC_TRUE;
+ vlc_object_kill( p_list->p_values[i].p_object );
}
vlc_list_release( 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.
- *****************************************************************************/
-void input_DestroyThread( input_thread_t *p_input )
+sout_instance_t * input_DetachSout( input_thread_t *p_input )
{
- /* Join the thread */
- vlc_thread_join( p_input );
-
- /* Delete input lock (only after thread joined) */
- vlc_mutex_destroy( &p_input->lock_control );
-
- /* TODO: maybe input_DestroyThread should also delete p_input instead
- * of the playlist but I'm not sure if it's possible */
+ p_input->p->b_owns_its_sout = VLC_FALSE;
+ return p_input->p->p_sout;
}
/*****************************************************************************
* 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, VLC_FALSE ) )
+ if( Init( p_input ) )
{
/* If we failed, wait before we are killed, and exit */
p_input->b_error = VLC_TRUE;
+ playlist_Signal( pl_Get( p_input ) );
Error( p_input );
return 0;
}
- /* Main loop */
- while( !p_input->b_die && !p_input->b_error && !p_input->input.b_eof )
+ MainLoop( p_input );
+
+ if( !p_input->b_eof && !p_input->b_error && p_input->p->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->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;
+ playlist_Signal( pl_Get( p_input ) );
+ }
+
+ /* Wait until we are asked to die */
+ if( !p_input->b_die )
+ {
+ Error( p_input );
+ }
+
+ /* Clean up */
+ End( p_input );
+
+ return 0;
+}
+
+/*****************************************************************************
+ * RunAndDestroy: 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 RunAndDestroy( input_thread_t *p_input )
+{
+ /* Signal that the thread is launched */
+ vlc_thread_ready( p_input );
+
+ if( Init( p_input ) )
+ goto exit;
+
+ MainLoop( p_input );
+
+ if( !p_input->b_eof && !p_input->b_error && p_input->p->input.b_eof )
+ {
+ /* We have finished demuxing data but not playing it */
+ while( !p_input->b_die )
+ {
+ if( input_EsOutDecodersEmpty( p_input->p->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 );
+
+exit:
+ /* Release memory */
+ vlc_object_release( p_input );
+ return 0;
+}
+
+/*****************************************************************************
+ * Main loop: Fill buffers from access, and demux
+ *****************************************************************************/
+static void MainLoop( input_thread_t *p_input )
+{
+ int64_t i_start_mdate = mdate();
+ int64_t i_intf_update = 0;
+ int i_updates = 0;
+
+ while( !p_input->b_die && !p_input->b_error && !p_input->p->input.b_eof )
{
vlc_bool_t b_force_update = VLC_FALSE;
int i_ret;
/* Do the read */
if( p_input->i_state != PAUSE_S )
{
- if( p_input->i_stop <= 0 || p_input->i_time < p_input->i_stop )
- i_ret=p_input->input.p_demux->pf_demux(p_input->input.p_demux);
+ if( ( p_input->p->i_stop > 0 && p_input->i_time >= p_input->p->i_stop ) ||
+ ( p_input->p->i_run > 0 && i_start_mdate+p_input->p->i_run < mdate() ) )
+ i_ret = 0; /* EOF */
else
- i_ret = 0; /* EOF */
+ i_ret = p_input->p->input.p_demux->pf_demux(p_input->p->input.p_demux);
if( i_ret > 0 )
{
/* TODO */
- if( p_input->input.b_title_demux &&
- p_input->input.p_demux->info.i_update )
+ if( p_input->p->input.b_title_demux &&
+ p_input->p->input.p_demux->info.i_update )
{
i_ret = UpdateFromDemux( p_input );
b_force_update = VLC_TRUE;
}
- else if( !p_input->input.b_title_demux &&
- p_input->input.p_access &&
- p_input->input.p_access->info.i_update )
+ else if( !p_input->p->input.b_title_demux &&
+ p_input->p->input.p_access &&
+ p_input->p->input.p_access->info.i_update )
{
i_ret = UpdateFromAccess( p_input );
b_force_update = VLC_TRUE;
{
/* End of file - we do not set b_die because only the
* playlist is allowed to do so. */
+ input_ChangeState( p_input, END_S );
msg_Dbg( p_input, "EOF reached" );
- p_input->input.b_eof = VLC_TRUE;
+ p_input->p->input.b_eof = VLC_TRUE;
}
else
{
}
/* Seek to start title/seekpoint */
- 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 )
+ 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 )
val.i_int = 0;
input_ControlPush( p_input,
INPUT_CONTROL_SET_TITLE, &val );
- val.i_int = p_input->input.i_seekpoint_start -
- p_input->input.i_seekpoint_offset;
+ 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 );
/* Seek to start position */
- if( p_input->i_start > 0 )
+ if( p_input->p->i_start > 0 )
{
- val.i_time = p_input->i_start;
+ val.i_time = p_input->p->i_start;
input_ControlPush( p_input, INPUT_CONTROL_SET_TIME,
&val );
}
input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION,
&val );
}
+
+ /* */
+ i_start_mdate = mdate();
}
}
else if( i_ret < 0 )
p_input->b_error = VLC_TRUE;
}
- if( i_ret > 0 && p_input->i_slave > 0 )
+ if( i_ret > 0 && p_input->p->i_slave > 0 )
{
SlaveDemux( p_input );
}
}
/* Handle control */
- vlc_mutex_lock( &p_input->lock_control );
+ vlc_mutex_lock( &p_input->p->lock_control );
ControlReduce( p_input );
while( !ControlPopNoLock( p_input, &i_type, &val ) )
{
if( Control( p_input, i_type, val ) )
b_force_update = VLC_TRUE;
}
- vlc_mutex_unlock( &p_input->lock_control );
+ vlc_mutex_unlock( &p_input->p->lock_control );
if( b_force_update || i_intf_update < mdate() )
{
double f_pos;
int64_t i_time, i_length;
/* update input status variables */
- if( !demux2_Control( p_input->input.p_demux,
+ if( !demux2_Control( p_input->p->input.p_demux,
DEMUX_GET_POSITION, &f_pos ) )
{
val.f_float = (float)f_pos;
var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
}
- if( !demux2_Control( p_input->input.p_demux,
+ if( !demux2_Control( p_input->p->input.p_demux,
DEMUX_GET_TIME, &i_time ) )
{
p_input->i_time = i_time;
val.i_time = i_time;
var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
}
- if( !demux2_Control( p_input->input.p_demux,
+ if( !demux2_Control( p_input->p->input.p_demux,
DEMUX_GET_LENGTH, &i_length ) )
{
vlc_value_t old_val;
if( old_val.i_time != val.i_time )
{
- UpdateItemLength( p_input, i_length, VLC_TRUE );
+ UpdateItemLength( p_input, i_length );
}
}
var_SetBool( p_input, "intf-change", 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 )
+ /* 150ms * 8 = ~ 1 second */
+ if( ++i_updates % 8 == 0 )
{
- if( input_EsOutDecodersEmpty( p_input->p_es_out ) )
- break;
-
- msg_Dbg( p_input, "waiting decoder fifos to empty" );
-
- msleep( INPUT_IDLE_SLEEP );
+ stats_ComputeInputStats( p_input, p_input->p->input.p_item->p_stats );
+ /* Are we the thread responsible for computing global stats ? */
+ if( p_input->p_libvlc->p_stats_computer == p_input )
+ {
+ stats_ComputeGlobalStats( p_input->p_libvlc,
+ p_input->p_libvlc->p_stats );
+ }
}
-
- /* 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;
}
-
-static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
+static int Init( input_thread_t * p_input )
{
char *psz;
char *psz_subtitle;
vlc_value_t val;
double f_fps;
- vlc_meta_t *p_meta, *p_meta_tmp;
+ vlc_meta_t *p_meta;
int i_es_out_mode;
int i, i_delay;
- /* Initialize optional stream output. (before access/demuxer) */
- if( !b_quick )
- {
- psz = var_GetString( p_input, "sout" );
- if( *psz )
- {
- p_input->p_sout = sout_NewInstance( p_input, psz );
- if( p_input->p_sout == NULL )
+ for( i = 0; i < p_input->p->input.p_item->i_options; i++ )
+ {
+ if( !strncmp( p_input->p->input.p_item->ppsz_options[i], "meta-file", 9 ) )
+ {
+ msg_Dbg( p_input, "Input is a meta file: disabling unneeded options" );
+ var_SetString( p_input, "sout", "" );
+ var_SetBool( p_input, "sout-all", VLC_FALSE );
+ var_SetString( p_input, "input-slave", "" );
+ var_SetInteger( p_input, "input-repeat", 0 );
+ var_SetString( p_input, "sub-file", "" );
+ var_SetBool( p_input, "sub-autodetect-file", VLC_FALSE );
+ }
+ }
+
+ if( !p_input->b_preparsing )
+ {
+ /* Prepare statistics */
+#define INIT_COUNTER( c, type, compute ) p_input->p->counters.p_##c = \
+ stats_CounterCreate( p_input, VLC_VAR_##type, STATS_##compute);
+ if( p_input->p_libvlc->b_stats )
+ {
+ INIT_COUNTER( read_bytes, INTEGER, COUNTER );
+ INIT_COUNTER( read_packets, INTEGER, COUNTER );
+ INIT_COUNTER( demux_read, INTEGER, COUNTER );
+ INIT_COUNTER( input_bitrate, FLOAT, DERIVATIVE );
+ INIT_COUNTER( demux_bitrate, FLOAT, DERIVATIVE );
+ INIT_COUNTER( played_abuffers, INTEGER, COUNTER );
+ INIT_COUNTER( lost_abuffers, INTEGER, COUNTER );
+ INIT_COUNTER( displayed_pictures, INTEGER, COUNTER );
+ INIT_COUNTER( lost_pictures, INTEGER, COUNTER );
+ INIT_COUNTER( decoded_audio, INTEGER, COUNTER );
+ INIT_COUNTER( decoded_video, INTEGER, COUNTER );
+ INIT_COUNTER( decoded_sub, INTEGER, COUNTER );
+ p_input->p->counters.p_sout_send_bitrate = NULL;
+ p_input->p->counters.p_sout_sent_packets = NULL;
+ p_input->p->counters.p_sout_sent_bytes = NULL;
+ if( p_input->p->counters.p_demux_bitrate )
+ p_input->p->counters.p_demux_bitrate->update_interval = 1000000;
+ if( p_input->p->counters.p_input_bitrate )
+ p_input->p->counters.p_input_bitrate->update_interval = 1000000;
+ }
+
+ /* Find a usable sout and attach it to p_input */
+ psz = var_GetNonEmptyString( p_input, "sout" );
+ if( psz && strncasecmp( p_input->p->input.p_item->psz_uri, "vlc:", 4 ) )
+ {
+ /* Check the validity of the provided sout */
+ if( p_input->p->p_sout )
+ {
+ if( strcmp( p_input->p->p_sout->psz_sout, psz ) )
+ {
+ 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;
+ }
+ }
+
+ if( p_input->p_libvlc->b_stats )
{
- msg_Err( p_input, "cannot start stream output instance, " \
- "aborting" );
- free( psz );
- return VLC_EGENERIC;
+ INIT_COUNTER( sout_sent_packets, INTEGER, COUNTER );
+ INIT_COUNTER (sout_sent_bytes, INTEGER, COUNTER );
+ INIT_COUNTER( sout_send_bitrate, FLOAT, DERIVATIVE );
+ if( p_input->p->counters.p_sout_send_bitrate )
+ p_input->p->counters.p_sout_send_bitrate->update_interval =
+ 1000000;
}
}
+ else if( p_input->p->p_sout )
+ {
+ msg_Dbg( p_input, "destroying useless sout" );
+
+ sout_DeleteInstance( p_input->p->p_sout );
+ p_input->p->p_sout = NULL;
+ }
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_ACTIVE, VLC_FALSE );
- es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE );
+ p_input->p->p_es_out = input_EsOutNew( p_input, p_input->p->i_rate );
+ es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, VLC_FALSE );
+ es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE );
- if( InputSourceInit( p_input, &p_input->input,
- p_input->input.p_item->psz_uri, NULL, b_quick ) )
+ var_Create( p_input, "bit-rate", VLC_VAR_INTEGER );
+ var_Create( p_input, "sample-rate", VLC_VAR_INTEGER );
+
+ if( InputSourceInit( p_input, &p_input->p->input,
+ p_input->p->input.p_item->psz_uri, NULL ) )
{
goto error;
}
/* Create global title (from master) */
- if( !b_quick )
+ if( !p_input->b_preparsing )
{
- 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 )
+ p_input->p->i_title = p_input->p->input.i_title;
+ p_input->p->title = p_input->p->input.title;
+ p_input->p->i_title_offset = p_input->p->input.i_title_offset;
+ p_input->p->i_seekpoint_offset = p_input->p->input.i_seekpoint_offset;
+ if( p_input->p->i_title > 0 )
{
/* Setup variables */
input_ControlVarNavigation( p_input );
}
/* 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;
+ p_input->b_can_pace_control = p_input->p->input.b_can_pace_control;
+ p_input->p->b_can_pause = p_input->p->input.b_can_pause;
+ p_input->p->b_can_rate_control = p_input->p->input.b_can_rate_control;
/* Fix pts delay */
- if( p_input->i_pts_delay <= 0 )
- p_input->i_pts_delay = DEFAULT_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. */
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;
+ 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;
}
/* Load master infos */
/* Init length */
- if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_LENGTH,
+ if( !demux2_Control( p_input->p->input.p_demux, DEMUX_GET_LENGTH,
&val.i_time ) && val.i_time > 0 )
{
var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
- UpdateItemLength( p_input, val.i_time, b_quick );
- p_input->input.p_item->i_duration = val.i_time;
+ UpdateItemLength( p_input, val.i_time );
+ }
+ else
+ {
+ val.i_time = input_item_GetDuration( p_input->p->input.p_item );
+ if( val.i_time > 0 )
+ { /* fallback: gets length from metadata */
+ var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
+ UpdateItemLength( p_input, val.i_time );
+ }
}
/* Start title/chapter */
- if( !b_quick )
+ if( !p_input->b_preparsing )
{
- 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 )
+ 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->input.i_seekpoint_start -
- p_input->input.i_seekpoint_offset;
+ val.i_int = p_input->p->input.i_seekpoint_start -
+ p_input->p->input.i_seekpoint_offset;
if( val.i_int > 0 /* TODO: check upper boundary */ )
input_ControlPush( p_input, INPUT_CONTROL_SET_SEEKPOINT, &val );
/* Start time*/
/* Set start time */
- p_input->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);
+ p_input->p->i_start = I64C(1000000) * var_GetInteger( p_input, "start-time" );
+ p_input->p->i_stop = I64C(1000000) * var_GetInteger( p_input, "stop-time" );
+ p_input->p->i_run = I64C(1000000) * var_GetInteger( p_input, "run-time" );
+ if( p_input->p->i_run < 0 )
+ {
+ msg_Warn( p_input, "invalid run-time ignored" );
+ p_input->p->i_run = 0;
+ }
- if( p_input->i_start > 0 )
+ if( p_input->p->i_start > 0 )
{
- if( p_input->i_start >= val.i_time )
+ if( p_input->p->i_start >= val.i_time )
{
msg_Warn( p_input, "invalid start-time ignored" );
}
{
vlc_value_t s;
- msg_Dbg( p_input, "start-time: %ds",
- (int)( p_input->i_start / I64C(1000000) ) );
+ msg_Dbg( p_input, "starting at time: %ds",
+ (int)( p_input->p->i_start / I64C(1000000) ) );
- s.i_time = p_input->i_start;
+ s.i_time = p_input->p->i_start;
input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s );
}
}
- if( p_input->i_stop > 0 && p_input->i_stop <= p_input->i_start )
+ if( p_input->p->i_stop > 0 && p_input->p->i_stop <= p_input->p->i_start )
{
msg_Warn( p_input, "invalid stop-time ignored" );
- p_input->i_stop = 0;
+ p_input->p->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 ) &&
+ if( !demux2_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) &&
f_fps > 1.0 )
{
float f_requested_fps;
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 )
+ psz_subtitle = var_GetNonEmptyString( p_input, "sub-file" );
+ if( psz_subtitle != NULL )
{
- input_source_t *sub;
- vlc_value_t count;
- vlc_value_t list;
-
msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle );
-
- var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL );
-
- /* */
- sub = InputSourceNew( p_input );
- if( !InputSourceInit( p_input, sub, psz_subtitle, "subtitle",
- VLC_FALSE ) )
- {
- TAB_APPEND( p_input->i_slave, p_input->slave, sub );
-
- /* 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 */
-
- 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 );
- }
- }
+ input_AddSubtitles( p_input, psz_subtitle, VLC_FALSE );
}
var_Get( p_input, "sub-autodetect-file", &val );
if( val.b_bool )
{
- char *psz_autopath = var_GetString( p_input, "sub-autodetect-path" );
+ char *psz_autopath = var_GetNonEmptyString( p_input, "sub-autodetect-path" );
char **subs = subtitles_Detect( p_input, psz_autopath,
- p_input->input.p_item->psz_uri );
+ p_input->p->input.p_item->psz_uri );
input_source_t *sub;
+ i = 0;
+ if( psz_autopath == NULL )
+ psz_autopath = strdup("");
+
+ /* Try to autoselect the first autodetected subtitles file
+ * if no subtitles file was specified */
+ if( ( psz_subtitle == NULL ) && subs && subs[0] )
+ {
+ input_AddSubtitles( p_input, subs[0], VLC_FALSE );
+ free( subs[0] );
+ i = 1;
+ }
- for( i = 0; subs[i] != NULL; i++ )
+ /* Then, just add the following subtitles files */
+ for( ; subs && subs[i]; i++ )
{
- if( strcmp( psz_subtitle, subs[i] ) )
+ if( !psz_subtitle || strcmp( psz_subtitle, subs[i] ) )
{
sub = InputSourceNew( p_input );
- if( !InputSourceInit( p_input, sub, subs[i], "subtitle",
- VLC_FALSE ) )
+ if( !InputSourceInit( p_input, sub, subs[i], "subtitle" ) )
{
- TAB_APPEND( p_input->i_slave, p_input->slave, sub );
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub );
}
+ else free( sub );
}
free( subs[i] );
}
free( psz_subtitle );
/* Look for slave */
- psz = var_GetString( p_input, "input-slave" );
- if( *psz )
+ psz = var_GetNonEmptyString( p_input, "input-slave" );
+ if( psz != NULL )
{
char *psz_delim;
input_source_t *slave;
break;
}
- msg_Dbg( p_input, "adding slave '%s'", psz );
+ msg_Dbg( p_input, "adding slave input '%s'", psz );
slave = InputSourceNew( p_input );
- if( !InputSourceInit( p_input, slave, psz, NULL, VLC_FALSE ) )
+ if( !InputSourceInit( p_input, slave, psz, NULL ) )
{
- TAB_APPEND( p_input->i_slave, p_input->slave, slave );
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave );
}
+ else free( slave );
psz = psz_delim;
}
+ free( psz );
}
- if( psz ) free( psz );
}
else
{
- p_input->i_start = 0;
- p_input->i_start = 0;
+ p_input->p->i_start = 0;
+ p_input->p->i_start = 0;
}
/* Set up es_out */
- if( !b_quick )
+ if( !p_input->b_preparsing )
{
- es_out_Control( p_input->p_es_out, ES_OUT_SET_ACTIVE, VLC_TRUE );
+ es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, VLC_TRUE );
i_es_out_mode = ES_OUT_MODE_AUTO;
val.p_list = NULL;
- if( p_input->p_sout )
+ if( p_input->p->p_sout )
{
var_Get( p_input, "sout-all", &val );
if ( val.b_bool )
NULL );
}
}
- es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE, i_es_out_mode );
+ es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, i_es_out_mode );
/* Inform the demuxer about waited group (needed only for DVB) */
if( i_es_out_mode == ES_OUT_MODE_ALL )
{
- demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP, -1, NULL );
+ demux2_Control( p_input->p->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,
+ demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1,
val.p_list );
}
else
{
- demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP,
+ demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP,
(int) var_GetInteger( p_input, "program" ), NULL );
}
- if( p_input->p_sout )
+ if( p_input->p->p_sout )
{
- if( p_input->p_sout->i_out_pace_nocontrol > 0 )
+ if( p_input->p->p_sout->i_out_pace_nocontrol > 0 )
{
- p_input->b_out_pace_control = VLC_FALSE;
+ p_input->p->b_out_pace_control = VLC_FALSE;
}
else
{
- p_input->b_out_pace_control = VLC_TRUE;
+ p_input->p->b_out_pace_control = VLC_TRUE;
+ }
+
+ if( p_input->b_can_pace_control && p_input->p->b_out_pace_control )
+ {
+ /* We don't want a high input priority here or we'll
+ * end-up sucking up all the CPU time */
+ vlc_thread_set_priority( p_input, VLC_THREAD_PRIORITY_LOW );
}
+
msg_Dbg( p_input, "starting in %s mode",
- p_input->b_out_pace_control ? "asynch" : "synch" );
+ p_input->p->b_out_pace_control ? "async" : "sync" );
}
}
+ p_meta = vlc_meta_New();
/* Get meta data from users */
- p_meta_tmp = InputMetaUser( p_input );
+ InputMetaUser( p_input, p_meta );
/* Get meta data from master input */
- if( demux2_Control( p_input->input.p_demux, DEMUX_GET_META, &p_meta ) )
- p_meta = NULL;
-
- /* Merge them */
- 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 );
- }
+ DemuxMeta( p_input, p_meta, p_input->p->input.p_demux );
/* Access_file does not give any meta, and there are no slave */
- if( !b_quick )
+ if( !p_input->b_preparsing )
{
- 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 );
- }
+ if( p_input->p->input.p_access )
+ access2_Control( p_input->p->input.p_access, ACCESS_GET_META,
+ p_meta );
/* Get meta data from slave input */
- for( i = 0; i < p_input->i_slave; i++ )
+ for( i = 0; i < p_input->p->i_slave; i++ )
{
- vlc_meta_t *p_meta_slave;
-
- if( !demux2_Control( p_input->slave[i]->p_demux,
- DEMUX_GET_META, &p_meta_slave ) )
+ DemuxMeta( p_input, p_meta, p_input->p->slave[i]->p_demux );
+ if( p_input->p->slave[i]->p_access )
{
- 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 );
- }
- }
-
- if( p_input->slave[i]->p_access &&
- !access2_Control( p_input->slave[i]->p_access,
- ACCESS_GET_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 );
- }
+ access2_Control( p_input->p->slave[i]->p_access,
+ ACCESS_GET_META, p_meta );
}
}
}
- p_input->p_meta = p_meta;
- UpdateMeta( p_input, b_quick );
+ InputUpdateMeta( p_input, p_meta );
- if( !b_quick )
+ if( !p_input->b_preparsing )
{
- msg_Dbg( p_input, "`%s' sucessfully opened",
- p_input->input.p_item->psz_uri );
+ msg_Dbg( p_input, "`%s' successfully opened",
+ p_input->p->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;
-
- val.i_int = PLAYING_S;
- var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+ input_ChangeState( p_input, PLAYING_S );
return VLC_SUCCESS;
error:
- if( p_input->p_es_out )
- input_EsOutDelete( p_input->p_es_out );
+ input_ChangeState( p_input, ERROR_S );
+
+ if( p_input->p->p_es_out )
+ input_EsOutDelete( p_input->p->p_es_out );
+
+ if( p_input->p->p_sout )
+ {
+ vlc_object_detach( p_input->p->p_sout );
+ sout_DeleteInstance( p_input->p->p_sout );
+ }
+
- if( p_input->p_sout )
- sout_DeleteInstance( p_input->p_sout );
+ if( !p_input->b_preparsing && p_input->p_libvlc->b_stats )
+ {
+#define EXIT_COUNTER( c ) do { if( p_input->p->counters.p_##c ) \
+ stats_CounterClean( p_input->p->counters.p_##c );\
+ p_input->p->counters.p_##c = NULL; } while(0)
+ EXIT_COUNTER( read_bytes );
+ EXIT_COUNTER( read_packets );
+ EXIT_COUNTER( demux_read );
+ EXIT_COUNTER( input_bitrate );
+ EXIT_COUNTER( demux_bitrate );
+ EXIT_COUNTER( played_abuffers );
+ EXIT_COUNTER( lost_abuffers );
+ EXIT_COUNTER( displayed_pictures );
+ EXIT_COUNTER( lost_pictures );
+ EXIT_COUNTER( decoded_audio );
+ EXIT_COUNTER( decoded_video );
+ EXIT_COUNTER( decoded_sub );
+
+ if( p_input->p->p_sout )
+ {
+ EXIT_COUNTER( sout_sent_packets );
+ EXIT_COUNTER (sout_sent_bytes );
+ EXIT_COUNTER( sout_send_bitrate );
+ }
+#undef EXIT_COUNTER
+ }
/* Mark them deleted */
- p_input->input.p_demux = NULL;
- p_input->input.p_stream = NULL;
- p_input->input.p_access = NULL;
- p_input->p_es_out = NULL;
- p_input->p_sout = NULL;
+ p_input->p->input.p_demux = NULL;
+ p_input->p->input.p_stream = NULL;
+ p_input->p->input.p_access = NULL;
+ p_input->p->p_es_out = NULL;
+ p_input->p->p_sout = NULL;
return VLC_EGENERIC;
}
*****************************************************************************/
static void Error( input_thread_t *p_input )
{
+ input_ChangeState( p_input, ERROR_S );
while( !p_input->b_die )
{
/* Sleep a while */
*****************************************************************************/
static void End( input_thread_t * p_input )
{
- vlc_value_t val;
int i;
- msg_Dbg( p_input, "closing input" );
-
/* We are at the end */
- p_input->i_state = END_S;
-
- val.i_int = END_S;
- var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+ input_ChangeState( p_input, END_S );
/* Clean control variables */
input_ControlVarClean( p_input );
/* Clean up master */
- InputSourceClean( p_input, &p_input->input );
+ InputSourceClean( &p_input->p->input );
/* Delete slave */
- for( i = 0; i < p_input->i_slave; i++ )
+ for( i = 0; i < p_input->p->i_slave; i++ )
{
- InputSourceClean( p_input, p_input->slave[i] );
- free( p_input->slave[i] );
+ InputSourceClean( p_input->p->slave[i] );
+ free( p_input->p->slave[i] );
}
- if( p_input->slave ) free( p_input->slave );
+ free( p_input->p->slave );
/* Unload all modules */
- if( p_input->p_es_out )
- input_EsOutDelete( p_input->p_es_out );
+ if( p_input->p->p_es_out )
+ input_EsOutDelete( p_input->p->p_es_out );
- /* Close optional stream output instance */
- if( p_input->p_sout )
+ if( !p_input->b_preparsing )
{
- vlc_object_t *p_pl =
- vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- vlc_value_t keep;
-
- if( var_Get( p_input, "sout-keep", &keep ) >= 0 && keep.b_bool && p_pl )
+#define CL_CO( c ) stats_CounterClean( p_input->p->counters.p_##c ); p_input->p->counters.p_##c = NULL;
+ if( p_input->p_libvlc->b_stats )
{
- /* attach sout to the playlist */
- msg_Warn( p_input, "keeping sout" );
- vlc_object_detach( p_input->p_sout );
- vlc_object_attach( p_input->p_sout, p_pl );
+ /* make sure we are up to date */
+ stats_ComputeInputStats( p_input, p_input->p->input.p_item->p_stats );
+ if( p_input->p_libvlc->p_stats_computer == p_input )
+ {
+ stats_ComputeGlobalStats( p_input->p_libvlc,
+ p_input->p_libvlc->p_stats );
+ p_input->p_libvlc->p_stats_computer = NULL;
+ }
+ CL_CO( read_bytes );
+ CL_CO( read_packets );
+ CL_CO( demux_read );
+ CL_CO( input_bitrate );
+ CL_CO( demux_bitrate );
+ CL_CO( played_abuffers );
+ CL_CO( lost_abuffers );
+ CL_CO( displayed_pictures );
+ CL_CO( lost_pictures );
+ CL_CO( decoded_audio) ;
+ CL_CO( decoded_video );
+ CL_CO( decoded_sub) ;
}
- else
+
+ /* Close optional stream output instance */
+ if( p_input->p->p_sout )
{
- msg_Warn( p_input, "destroying sout" );
- sout_DeleteInstance( p_input->p_sout );
+ CL_CO( sout_sent_packets );
+ CL_CO( sout_sent_bytes );
+ CL_CO( sout_send_bitrate );
+
+ vlc_object_detach( p_input->p->p_sout );
}
- if( p_pl )
- vlc_object_release( p_pl );
+#undef CL_CO
}
- /* Delete meta */
- if( p_input->p_meta )
- vlc_meta_Delete( p_input->p_meta );
+ if( p_input->p->i_attachment > 0 )
+ {
+ for( i = 0; i < p_input->p->i_attachment; i++ )
+ vlc_input_attachment_Delete( p_input->p->attachment[i] );
+ TAB_CLEAN( p_input->p->i_attachment, p_input->p->attachment );
+ }
/* Tell we're dead */
p_input->b_dead = VLC_TRUE;
}
+static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, vlc_bool_t *pb_sout_keep )
+{
+ vlc_bool_t b_keep_sout = var_CreateGetBool( p_parent, "sout-keep" );
+ sout_instance_t *p_sout = NULL;
+ int i;
+
+ /* Search sout-keep options
+ * XXX it has to be done here, but it is duplicated work :( */
+ vlc_mutex_lock( &p_item->lock );
+ for( i = 0; i < p_item->i_options; i++ )
+ {
+ const char *psz_option = p_item->ppsz_options[i];
+ if( !psz_option )
+ continue;
+ if( *psz_option == ':' )
+ psz_option++;
+
+ if( !strcmp( psz_option, "sout-keep" ) )
+ b_keep_sout = VLC_TRUE;
+ else if( !strcmp( psz_option, "no-sout-keep" ) || !strcmp( psz_option, "nosout-keep" ) )
+ b_keep_sout = VLC_FALSE;
+ }
+ vlc_mutex_unlock( &p_item->lock );
+
+ /* Find a potential sout to reuse
+ * XXX it might be unusable but this will be checked later */
+ if( b_keep_sout )
+ {
+ /* Remove the sout from the playlist garbage collector */
+ playlist_t *p_playlist = pl_Yield( p_parent );
+
+ vlc_mutex_lock( &p_playlist->gc_lock );
+ p_sout = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, FIND_CHILD );
+ if( p_sout )
+ {
+ if( p_sout->p_parent != VLC_OBJECT(p_playlist) )
+ {
+ vlc_object_release( p_sout );
+ p_sout = NULL;
+ }
+ else
+ {
+ vlc_object_detach( p_sout ); /* Remove it from the GC */
+
+ vlc_object_release( p_sout );
+ }
+ }
+ vlc_mutex_unlock( &p_playlist->gc_lock );
+
+ pl_Release( p_parent );
+ }
+
+ if( pb_sout_keep )
+ *pb_sout_keep = b_keep_sout;
+
+ return p_sout;
+}
+static void SoutKeep( sout_instance_t *p_sout )
+{
+ /* attach sout to the playlist */
+ playlist_t *p_playlist = pl_Yield( p_sout );
+
+ msg_Dbg( p_sout, "sout has been kept" );
+ vlc_object_attach( p_sout, p_playlist );
+
+ pl_Release( p_sout );
+}
+
/*****************************************************************************
* Control
*****************************************************************************/
static inline int ControlPopNoLock( input_thread_t *p_input,
int *pi_type, vlc_value_t *p_val )
{
- if( p_input->i_control <= 0 )
+ if( p_input->p->i_control <= 0 )
{
return VLC_EGENERIC;
}
- *pi_type = p_input->control[0].i_type;
- *p_val = p_input->control[0].val;
+ *pi_type = p_input->p->control[0].i_type;
+ *p_val = p_input->p->control[0].val;
- p_input->i_control--;
- if( p_input->i_control > 0 )
+ p_input->p->i_control--;
+ if( p_input->p->i_control > 0 )
{
int i;
- for( i = 0; i < p_input->i_control; i++ )
+ for( i = 0; i < p_input->p->i_control; i++ )
{
- p_input->control[i].i_type = p_input->control[i+1].i_type;
- p_input->control[i].val = p_input->control[i+1].val;
+ p_input->p->control[i].i_type = p_input->p->control[i+1].i_type;
+ p_input->p->control[i].val = p_input->p->control[i+1].val;
}
}
static void ControlReduce( input_thread_t *p_input )
{
int i;
- for( i = 1; i < p_input->i_control; i++ )
+
+ if( !p_input )
+ return;
+
+ for( i = 1; i < p_input->p->i_control; i++ )
{
- const int i_lt = p_input->control[i-1].i_type;
- const int i_ct = p_input->control[i].i_type;
+ const int i_lt = p_input->p->control[i-1].i_type;
+ const int i_ct = p_input->p->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->p->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];
- p_input->i_control--;
+ for( j = i; j < p_input->p->i_control; j++ )
+ p_input->p->control[j-1] = p_input->p->control[j];
+ p_input->p->i_control--;
}
else
{
{
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( p_input->input.p_stream )
- p_input->input.p_stream->b_die = VLC_TRUE;
- p_input->input.p_demux->b_die = VLC_TRUE;
+ if( p_input->p->input.p_access )
+ vlc_object_kill( p_input->p->input.p_access );
+ if( p_input->p->input.p_stream )
+ vlc_object_kill( p_input->p->input.p_stream );
+ vlc_object_kill( p_input->p->input.p_demux );
- p_input->b_die = VLC_TRUE;
+ vlc_object_kill( p_input );
break;
case INPUT_CONTROL_SET_POSITION:
else
{
/* Should not fail */
- demux2_Control( p_input->input.p_demux,
+ demux2_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;
- /* 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,
+ /* Reset the decoders states and clock sync (before calling the demuxer */
+ input_EsOutChangePosition( p_input->p->p_es_out );
+ if( demux2_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION,
f_pos ) )
{
msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) "
}
else
{
- if( p_input->i_slave > 0 )
+ if( p_input->p->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;
else
{
/* Should not fail */
- demux2_Control( p_input->input.p_demux,
+ demux2_Control( p_input->p->input.p_demux,
DEMUX_GET_TIME, &i_time );
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 );
+ /* Reset the decoders states and clock sync (before calling the demuxer */
+ input_EsOutChangePosition( p_input->p->p_es_out );
- i_ret = demux2_Control( p_input->input.p_demux,
+ i_ret = demux2_Control( p_input->p->input.p_demux,
DEMUX_SET_TIME, i_time );
if( i_ret )
{
int64_t i_length;
- /* Emulate it with a SET_POS */
- demux2_Control( p_input->input.p_demux,
+ /* Emulate it with a SET_POS */
+ demux2_Control( p_input->p->input.p_demux,
DEMUX_GET_LENGTH, &i_length );
if( i_length > 0 )
{
double f_pos = (double)i_time / (double)i_length;
- i_ret = demux2_Control( p_input->input.p_demux,
+ i_ret = demux2_Control( p_input->p->input.p_demux,
DEMUX_SET_POSITION, f_pos );
}
}
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 )
+ if( p_input->p->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;
( val.i_int == PAUSE_S && p_input->i_state == PAUSE_S ) )
{
int i_ret;
- if( p_input->input.p_access )
- i_ret = access2_Control( p_input->input.p_access,
+ if( p_input->p->input.p_access )
+ i_ret = access2_Control( p_input->p->input.p_access,
ACCESS_SET_PAUSE_STATE, VLC_FALSE );
else
- i_ret = demux2_Control( p_input->input.p_demux,
+ i_ret = demux2_Control( p_input->p->input.p_demux,
DEMUX_SET_PAUSE_STATE, VLC_FALSE );
if( i_ret )
{
/* FIXME What to do ? */
msg_Warn( p_input, "cannot unset pause -> EOF" );
- vlc_mutex_unlock( &p_input->lock_control );
+ vlc_mutex_unlock( &p_input->p->lock_control );
input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
- vlc_mutex_lock( &p_input->lock_control );
+ vlc_mutex_lock( &p_input->p->lock_control );
}
b_force_update = VLC_TRUE;
val.i_int = PLAYING_S;
var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
- /* Reset clock */
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ /* */
+ if( !i_ret )
+ input_EsOutChangeState( p_input->p->p_es_out );
}
else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S &&
- p_input->b_can_pause )
+ p_input->p->b_can_pause )
{
int i_ret;
- if( p_input->input.p_access )
- i_ret = access2_Control( p_input->input.p_access,
+ if( p_input->p->input.p_access )
+ i_ret = access2_Control( p_input->p->input.p_access,
ACCESS_SET_PAUSE_STATE, VLC_TRUE );
else
- i_ret = demux2_Control( p_input->input.p_demux,
+ i_ret = demux2_Control( p_input->p->input.p_demux,
DEMUX_SET_PAUSE_STATE, VLC_TRUE );
b_force_update = VLC_TRUE;
/* Switch to new state */
p_input->i_state = val.i_int;
var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+
+ /* */
+ if( !i_ret )
+ input_EsOutChangeState( p_input->p->p_es_out );
}
- else if( val.i_int == PAUSE_S && !p_input->b_can_pause )
+ else if( val.i_int == PAUSE_S && !p_input->p->b_can_pause )
{
b_force_update = VLC_TRUE;
{
int i_rate;
- if( i_type == INPUT_CONTROL_SET_RATE_SLOWER )
- i_rate = p_input->i_rate * 2;
- else if( i_type == INPUT_CONTROL_SET_RATE_FASTER )
- i_rate = p_input->i_rate / 2;
- else
+ if( i_type == INPUT_CONTROL_SET_RATE )
+ {
i_rate = val.i_int;
+ }
+ else
+ {
+ static const int ppi_factor[][2] = {
+ {1,64}, {1,32}, {1,16}, {1,8}, {1,4}, {1,3}, {1,2}, {2,3},
+ {1,1},
+ {3,2}, {2,1}, {3,1}, {4,1}, {8,1}, {16,1}, {32,1}, {64,1},
+ {0,0}
+ };
+ int i_error;
+ int i_idx;
+ int i;
+
+ i_error = INT_MAX;
+ i_idx = -1;
+ for( i = 0; ppi_factor[i][0] != 0; i++ )
+ {
+ const int i_test_r = INPUT_RATE_DEFAULT * ppi_factor[i][0] / ppi_factor[i][1];
+ const int i_test_e = abs(p_input->p->i_rate - i_test_r);
+ if( i_test_e < i_error )
+ {
+ i_idx = i;
+ i_error = i_test_e;
+ }
+ }
+ assert( i_idx >= 0 && ppi_factor[i_idx][0] != 0 );
+
+ if( i_type == INPUT_CONTROL_SET_RATE_SLOWER )
+ {
+ if( ppi_factor[i_idx+1][0] > 0 )
+ i_rate = INPUT_RATE_DEFAULT * ppi_factor[i_idx+1][0] / ppi_factor[i_idx+1][1];
+ else
+ i_rate = INPUT_RATE_MAX+1;
+ }
+ else
+ {
+ assert( i_type == INPUT_CONTROL_SET_RATE_FASTER );
+ if( i_idx > 0 )
+ i_rate = INPUT_RATE_DEFAULT * ppi_factor[i_idx-1][0] / ppi_factor[i_idx-1][1];
+ else
+ i_rate = INPUT_RATE_MIN-1;
+ }
+ }
if( i_rate < INPUT_RATE_MIN )
{
i_rate = INPUT_RATE_MAX;
}
if( i_rate != INPUT_RATE_DEFAULT &&
- ( !p_input->b_can_pace_control ||
- ( p_input->p_sout && !p_input->b_out_pace_control ) ) )
+ ( ( !p_input->b_can_pace_control && !p_input->p->b_can_rate_control ) ||
+ ( p_input->p->p_sout && !p_input->p->b_out_pace_control ) ) )
{
msg_Dbg( p_input, "cannot change rate" );
i_rate = INPUT_RATE_DEFAULT;
}
- if( i_rate != p_input->i_rate )
+ if( i_rate != p_input->p->i_rate &&
+ !p_input->b_can_pace_control && p_input->p->b_can_rate_control )
+ {
+ int i_ret;
+ if( p_input->p->input.p_access )
+ i_ret = VLC_EGENERIC;
+ else
+ i_ret = demux2_Control( p_input->p->input.p_demux,
+ DEMUX_SET_RATE, &i_rate );
+ if( i_ret )
+ {
+ msg_Warn( p_input, "ACCESS/DEMUX_SET_RATE failed" );
+ i_rate = p_input->p->i_rate;
+ }
+ }
+
+ /* */
+ if( i_rate != p_input->p->i_rate )
{
- p_input->i_rate = i_rate;
val.i_int = i_rate;
var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
+ var_SetBool( p_input, "rate-change", VLC_TRUE );
- /* We haven't send data to decoder when rate != default */
- if( i_rate == INPUT_RATE_DEFAULT )
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_TRUE );
+ p_input->p->i_rate = i_rate;
- /* Reset clock */
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ /* FIXME do we need a RESET_PCR when !p_input->p->input.b_rescale_ts ? */
+ if( p_input->p->input.b_rescale_ts )
+ input_EsOutChangeRate( p_input->p->p_es_out, i_rate );
b_force_update = VLC_TRUE;
}
case INPUT_CONTROL_SET_PROGRAM:
/* No need to force update, es_out does it if needed */
- es_out_Control( p_input->p_es_out,
+ es_out_Control( p_input->p->p_es_out,
ES_OUT_SET_GROUP, val.i_int );
- demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP, val.i_int,
+ demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, val.i_int,
NULL );
break;
case INPUT_CONTROL_SET_ES:
/* No need to force update, es_out does it if needed */
- es_out_Control( p_input->p_es_out, ES_OUT_SET_ES,
- input_EsOutGetFromID( p_input->p_es_out,
+ es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ES,
+ input_EsOutGetFromID( p_input->p->p_es_out,
val.i_int ) );
break;
case INPUT_CONTROL_SET_AUDIO_DELAY:
- input_EsOutSetDelay( p_input->p_es_out,
+ input_EsOutSetDelay( p_input->p->p_es_out,
AUDIO_ES, val.i_time );
var_Change( p_input, "audio-delay", VLC_VAR_SETVALUE, &val, NULL );
break;
case INPUT_CONTROL_SET_SPU_DELAY:
- input_EsOutSetDelay( p_input->p_es_out,
+ input_EsOutSetDelay( p_input->p->p_es_out,
SPU_ES, val.i_time );
var_Change( p_input, "spu-delay", VLC_VAR_SETVALUE, &val, NULL );
break;
case INPUT_CONTROL_SET_TITLE:
case INPUT_CONTROL_SET_TITLE_NEXT:
case INPUT_CONTROL_SET_TITLE_PREV:
- if( p_input->input.b_title_demux &&
- p_input->input.i_title > 0 )
+ if( p_input->p->input.b_title_demux &&
+ p_input->p->input.i_title > 0 )
{
/* TODO */
/* FIXME handle demux title */
- demux_t *p_demux = p_input->input.p_demux;
+ demux_t *p_demux = p_input->p->input.p_demux;
int i_title;
if( i_type == INPUT_CONTROL_SET_TITLE_PREV )
else
i_title = val.i_int;
- if( i_title >= 0 && i_title < p_input->input.i_title )
+ if( i_title >= 0 && i_title < p_input->p->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 );
+ input_EsOutChangePosition( p_input->p->p_es_out );
+ demux2_Control( p_demux, DEMUX_SET_TITLE, i_title );
input_ControlVarTitle( p_input, i_title );
}
}
- else if( p_input->input.i_title > 0 )
+ else if( p_input->p->input.i_title > 0 )
{
- access_t *p_access = p_input->input.p_access;
+ access_t *p_access = p_input->p->input.p_access;
int i_title;
if( i_type == INPUT_CONTROL_SET_TITLE_PREV )
else
i_title = val.i_int;
- if( i_title >= 0 && i_title < p_input->input.i_title )
+ if( i_title >= 0 && i_title < p_input->p->input.i_title )
{
- access2_Control( p_access, ACCESS_SET_TITLE, i_title );
- stream_AccessReset( p_input->input.p_stream );
+ input_EsOutChangePosition( p_input->p->p_es_out );
- 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->p->input.p_stream );
}
}
break;
case INPUT_CONTROL_SET_SEEKPOINT:
case INPUT_CONTROL_SET_SEEKPOINT_NEXT:
case INPUT_CONTROL_SET_SEEKPOINT_PREV:
- if( p_input->input.b_title_demux &&
- p_input->input.i_title > 0 )
+ if( p_input->p->input.b_title_demux &&
+ p_input->p->input.i_title > 0 )
{
- demux_t *p_demux = p_input->input.p_demux;
+ demux_t *p_demux = p_input->p->input.p_demux;
int i_seekpoint;
- mtime_t i_input_time;
- mtime_t i_seekpoint_time;
+ 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;
- if (demux2_Control( p_demux, DEMUX_GET_SEEKPOINT_TIME, p_demux->info.i_seekpoint, &i_seekpoint_time) == VLC_SUCCESS)
+ i_seekpoint_time = p_input->p->input.title[p_demux->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
+ if( i_seekpoint_time >= 0 &&
+ !demux2_Control( p_demux,
+ DEMUX_GET_TIME, &i_input_time ) )
{
- demux2_Control( p_demux, INPUT_GET_TIME, &i_input_time );
if ( i_input_time < i_seekpoint_time + 3000000 )
i_seekpoint--;
}
i_seekpoint = val.i_int;
if( i_seekpoint >= 0 && i_seekpoint <
- p_input->input.title[p_demux->info.i_title]->i_seekpoint )
+ p_input->p->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 );
+ input_EsOutChangePosition( p_input->p->p_es_out );
+
+ demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
}
}
- else if( p_input->input.i_title > 0 )
+ else if( p_input->p->input.i_title > 0 )
{
- access_t *p_access = p_input->input.p_access;
+ 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;
+ 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_SEEKPOINT_NEXT )
+ {
+ i_seekpoint = p_access->info.i_seekpoint;
+ i_seekpoint_time = p_input->p->input.title[p_access->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
+ if( i_seekpoint_time >= 0 &&
+ demux2_Control( p_demux,
+ DEMUX_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 )
+ p_input->p->input.title[p_access->info.i_title]->i_seekpoint )
{
- access2_Control( p_access, ACCESS_SET_SEEKPOINT, i_seekpoint );
- stream_AccessReset( p_input->input.p_stream );
+ input_EsOutChangePosition( p_input->p->p_es_out );
- 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->p->input.p_stream );
}
}
break;
{
input_source_t *slave = InputSourceNew( p_input );
- if( !InputSourceInit( p_input, slave, val.psz_string, NULL,
- VLC_FALSE ) )
+ if( !InputSourceInit( p_input, slave, val.psz_string, NULL ) )
{
- vlc_meta_t *p_meta_new = NULL;
vlc_meta_t *p_meta;
int64_t i_time;
val.psz_string );
/* Set position */
- if( demux2_Control( p_input->input.p_demux,
+ if( demux2_Control( p_input->p->input.p_demux,
DEMUX_GET_TIME, &i_time ) )
{
msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
- InputSourceClean( p_input, slave );
+ InputSourceClean( slave );
free( slave );
break;
}
DEMUX_SET_TIME, i_time ) )
{
msg_Err( p_input, "seek failed for new slave" );
- InputSourceClean( p_input, slave );
+ InputSourceClean( 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 );
- }
+ p_meta = vlc_meta_New();
+ access2_Control( slave->p_access, ACCESS_GET_META,
+ p_meta );
+ demux2_Control( slave->p_demux, DEMUX_GET_META, p_meta );
+ InputUpdateMeta( p_input, p_meta );
- TAB_APPEND( p_input->i_slave, p_input->slave, slave );
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave );
}
else
{
+ free( slave );
msg_Warn( p_input, "failed to add %s as slave",
val.psz_string );
}
*****************************************************************************/
static int UpdateFromDemux( input_thread_t *p_input )
{
- demux_t *p_demux = p_input->input.p_demux;
+ demux_t *p_demux = p_input->p->input.p_demux;
vlc_value_t v;
if( p_demux->info.i_update & INPUT_UPDATE_TITLE )
p_demux->info.i_update &= ~INPUT_UPDATE_SIZE;
/* Hmmm only works with master input */
- if( p_input->input.p_demux == p_demux )
+ if( p_input->p->input.p_demux == p_demux )
{
- int i_title_end = p_input->input.i_title_end -
- p_input->input.i_title_offset;
- int i_seekpoint_end = p_input->input.i_seekpoint_end -
- p_input->input.i_seekpoint_offset;
+ int i_title_end = p_input->p->input.i_title_end -
+ p_input->p->input.i_title_offset;
+ int i_seekpoint_end = p_input->p->input.i_seekpoint_end -
+ p_input->p->input.i_seekpoint_offset;
if( i_title_end >= 0 && i_seekpoint_end >= 0 )
{
*****************************************************************************/
static int UpdateFromAccess( input_thread_t *p_input )
{
- access_t *p_access = p_input->input.p_access;
+ access_t *p_access = p_input->p->input.p_access;
vlc_value_t v;
if( p_access->info.i_update & INPUT_UPDATE_TITLE )
input_ControlVarTitle( p_input, p_access->info.i_title );
- stream_AccessUpdate( p_input->input.p_stream );
+ stream_AccessUpdate( p_input->p->input.p_stream );
p_access->info.i_update &= ~INPUT_UPDATE_TITLE;
}
{
v.i_int = p_access->info.i_seekpoint;
var_Change( p_input, "chapter", VLC_VAR_SETVALUE, &v, NULL);
-
p_access->info.i_update &= ~INPUT_UPDATE_SEEKPOINT;
}
if( p_access->info.i_update & INPUT_UPDATE_META )
{
/* TODO maybe multi - access ? */
- vlc_meta_t *p_meta;
- if( !access2_Control( p_input->input.p_access,ACCESS_GET_META,&p_meta))
- {
- if( p_input->p_meta )
- {
- vlc_meta_Merge( p_input->p_meta, p_meta );
- vlc_meta_Delete( p_meta );
- }
- else
- {
- p_input->p_meta = p_meta;
- }
-
- UpdateMeta( p_input, VLC_FALSE );
- var_SetBool( p_input, "item-change", p_input->input.p_item->i_id );
- }
+ vlc_meta_t *p_meta = vlc_meta_New();
+ access2_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta );
+ InputUpdateMeta( p_input, p_meta );
+ var_SetInteger( pl_Get( p_input ), "item-change", p_input->p->input.p_item->i_id );
p_access->info.i_update &= ~INPUT_UPDATE_META;
}
p_access->info.i_update &= ~INPUT_UPDATE_SIZE;
/* Hmmm only works with master input */
- if( p_input->input.p_access == p_access )
+ if( p_input->p->input.p_access == p_access )
{
- int i_title_end = p_input->input.i_title_end -
- p_input->input.i_title_offset;
- int i_seekpoint_end = p_input->input.i_seekpoint_end -
- p_input->input.i_seekpoint_offset;
+ int i_title_end = p_input->p->input.i_title_end -
+ p_input->p->input.i_title_offset;
+ int i_seekpoint_end = p_input->p->input.i_seekpoint_end -
+ p_input->p->input.i_seekpoint_offset;
if( i_title_end >= 0 && i_seekpoint_end >=0 )
{
return 1;
}
-/*****************************************************************************
- * UpdateMeta:
- *****************************************************************************/
-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;
-
- if( !b_quick ) msg_Dbg( p_input, "meta information:" );
- for( i = 0; i < p_meta->i_meta; 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] &&
- !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 ) )
- input_Control( p_input, INPUT_ADD_INFO, _("General"),
- _("Author"), p_meta->value[i] );
-
- input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"),
- _(p_meta->name[i]), "%s", p_meta->value[i] );
- }
-
- for( i = 0; i < p_meta->i_track; i++ )
- {
- vlc_meta_t *tk = p_meta->track[i];
- int j;
-
- if( tk->i_meta > 0 )
- {
- char *psz_cat = malloc( strlen(_("Stream")) + 10 );
-
- msg_Dbg( p_input, " - track[%d]:", i );
-
- sprintf( psz_cat, "%s %d", _("Stream"), i );
- for( j = 0; j < tk->i_meta; j++ )
- {
- msg_Dbg( p_input, " - '%s' = '%s'", _(tk->name[j]),
- tk->value[j] );
-
- input_Control( p_input, INPUT_ADD_INFO, psz_cat,
- _(tk->name[j]), "%s", tk->value[j] );
- }
- }
- }
-
- if( p_input->p_sout && p_input->p_sout->p_meta == NULL )
- {
- p_input->p_sout->p_meta = vlc_meta_Duplicate( p_meta );
- }
-
- return VLC_SUCCESS;
-}
-
/*****************************************************************************
* UpdateItemLength:
*****************************************************************************/
-static void UpdateItemLength( input_thread_t *p_input, int64_t i_length,
- vlc_bool_t b_quick )
+static void UpdateItemLength( input_thread_t *p_input, int64_t i_length )
{
- 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 );
+ input_item_SetDuration( p_input->p->input.p_item, (mtime_t) i_length );
- p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST,
- FIND_PARENT);
- if( p_playlist )
+ if( !p_input->b_preparsing )
{
- var_SetInteger( p_playlist, "item-change",
- p_input->input.p_item->i_id );
- vlc_object_release( p_playlist );
+ pl_Yield( p_input );
+ var_SetInteger( pl_Get( p_input ), "item-change",
+ p_input->p->input.p_item->i_id );
+ pl_Release( p_input );
}
-
- 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;
in->p_stream = NULL;
in->p_demux = NULL;
in->b_title_demux = VLC_FALSE;
- in->i_title = 0;
- in->title = NULL;
+ TAB_INIT( in->i_title, in->title );
+ in->b_can_pause = VLC_TRUE;
in->b_can_pace_control = VLC_TRUE;
+ in->b_can_rate_control = VLC_TRUE;
+ in->b_rescale_ts = VLC_TRUE;
in->b_eof = VLC_FALSE;
+ in->f_fps = 0.0;
in->i_cr_average = 0;
return in;
* InputSourceInit:
*****************************************************************************/
static int InputSourceInit( input_thread_t *p_input,
- input_source_t *in, char *psz_mrl,
- char *psz_forced_demux, vlc_bool_t b_quick )
+ input_source_t *in, const char *psz_mrl,
+ const char *psz_forced_demux )
{
- char *psz_dup = strdup( psz_mrl );
- char *psz_access;
- char *psz_demux;
+ 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;
- /* Split uri */
- if( !b_quick )
- {
- MRLSplit( p_input, psz_dup, &psz_access, &psz_demux, &psz_path );
+ strcpy( psz_dup, psz_mrl );
+
+ if( !in ) return VLC_EGENERIC;
+ if( !p_input ) return VLC_EGENERIC;
- msg_Dbg( p_input, "`%s' gives access `%s' demux `%s' path `%s'",
- psz_mrl, psz_access, psz_demux, psz_path );
+ /* Split uri */
+ MRLSplit( psz_dup, &psz_access, &psz_demux, &psz_path );
+ msg_Dbg( p_input, "`%s' gives access `%s' demux `%s' path `%s'",
+ psz_mrl, psz_access, psz_demux, psz_path );
+ if( !p_input->b_preparsing )
+ {
/* 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,
+ {
+ /* 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;
+ }
+ else if( *psz_demux == '\0' )
+ {
+ /* special hack for forcing a demuxer with --demux=module
+ * (and do nothing with a list) */
+ char *psz_var_demux = var_GetNonEmptyString( p_input, "demux" );
+
+ if( psz_var_demux != NULL &&
+ !strchr(psz_var_demux, ',' ) &&
+ !strchr(psz_var_demux, ':' ) )
+ {
+ psz_demux = psz_var_demux;
+
+ msg_Dbg( p_input, "enforced demux ` %s'", psz_demux );
+ }
+ }
/* 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 );
+ NULL, p_input->p->p_es_out, VLC_FALSE );
}
}
else
{
- psz_path = psz_mrl;
- msg_Dbg( p_input, "trying to preparse %s", psz_path );
- psz_demux = strdup( "" );
- psz_access = strdup( "file" );
+ /* Preparsing is only for file:// */
+ if( *psz_demux )
+ goto error;
+ if( !*psz_access ) /* path without scheme:// */
+ psz_access = "file";
+ if( strcmp( psz_access, "file" ) )
+ goto error;
+ msg_Dbg( p_input, "trying to pre-parse %s", psz_path );
}
if( in->p_demux )
in->i_title = 0;
in->title = NULL;
}
- demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE,
- &in->b_can_pace_control );
- demux2_Control( in->p_demux, DEMUX_CAN_PAUSE,
- &in->b_can_pause );
+ if( demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE,
+ &in->b_can_pace_control ) )
+ in->b_can_pace_control = VLC_FALSE;
+
+ if( !in->b_can_pace_control )
+ {
+ if( demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_RATE,
+ &in->b_can_rate_control, &in->b_rescale_ts ) )
+ {
+ in->b_can_rate_control = VLC_FALSE;
+ in->b_rescale_ts = VLC_TRUE; /* not used */
+ }
+ }
+ else
+ {
+ in->b_can_rate_control = VLC_TRUE;
+ in->b_rescale_ts = VLC_TRUE;
+ }
+ if( demux2_Control( in->p_demux, DEMUX_CAN_PAUSE,
+ &in->b_can_pause ) )
+ in->b_can_pause = VLC_FALSE;
+ var_SetBool( p_input, "can-pause", in->b_can_pause );
- /* FIXME todo
- demux2_Control( in->p_demux, DEMUX_CAN_SEEK,
+ int ret = demux2_Control( in->p_demux, DEMUX_CAN_SEEK,
&val.b_bool );
- */
+ if( ret != VLC_SUCCESS )
+ val.b_bool = VLC_FALSE;
+ var_Set( p_input, "seekable", val );
}
else
{
int64_t i_pts_delay;
+ input_ChangeState( p_input, OPENING_S );
+
/* Now try a real access */
- in->p_access = access2_New( p_input, psz_access, psz_demux, psz_path,
- b_quick );
+ in->p_access = access2_New( p_input, psz_access, psz_demux, psz_path );
/* Access failed, URL encoded ? */
if( in->p_access == NULL && strchr( psz_path, '%' ) )
{
- DecodeUrl( psz_path );
+ decode_URI( psz_path );
msg_Dbg( p_input, "retrying with access `%s' demux `%s' path `%s'",
psz_access, psz_demux, psz_path );
in->p_access = access2_New( p_input,
- psz_access, psz_demux, psz_path,
- b_quick );
+ psz_access, psz_demux, psz_path );
}
-#ifndef WIN32 /* Remove this gross hack from the win32 build as colons
- * are forbidden in filenames on Win32. */
-
- /* Maybe we got something like: /Volumes/toto:titi/gabu.mpg */
- if( in->p_access == NULL &&
- *psz_access == '\0' && ( *psz_demux || *psz_path ) )
+ if( in->p_access == NULL )
{
- 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,
- b_quick );
+ msg_Err( p_input, "open of `%s' failed: %s", psz_mrl,
+ msg_StackMsg() );
+ intf_UserFatal( VLC_OBJECT( p_input), VLC_FALSE,
+ _("Your input can't be opened"),
+ _("VLC is unable to open the MRL '%s'."
+ " Check the log for details."), psz_mrl );
+ goto error;
}
-#endif
- if( in->p_access == NULL )
+ /* */
+ psz_tmp = psz = var_GetNonEmptyString( p_input, "access-filter" );
+ while( psz && *psz )
{
- msg_Err( p_input, "no suitable access module for `%s'", psz_mrl );
- goto error;
+ access_t *p_access = in->p_access;
+ char *end = strchr( psz, ':' );
+
+ 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;
}
+ free( psz_tmp );
/* Get infos from access */
- if( !b_quick )
+ if( !p_input->b_preparsing )
{
access2_Control( in->p_access,
ACCESS_GET_PTS_DELAY, &i_pts_delay );
}
access2_Control( in->p_access, ACCESS_CAN_CONTROL_PACE,
&in->b_can_pace_control );
+ in->b_can_rate_control = in->b_can_pace_control;
+ in->b_rescale_ts = VLC_TRUE;
+
access2_Control( in->p_access, ACCESS_CAN_PAUSE,
&in->b_can_pause );
+ var_SetBool( p_input, "can-pause", in->b_can_pause );
access2_Control( in->p_access, ACCESS_CAN_SEEK,
&val.b_bool );
var_Set( p_input, "seekable", val );
}
+ input_ChangeState( p_input, BUFFERING_S );
+
/* Create the stream_t */
- in->p_stream = stream_AccessNew( in->p_access, b_quick );
+ in->p_stream = stream_AccessNew( in->p_access, p_input->b_preparsing );
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, b_quick );
+
+ {
+ /* Take access redirections into account */
+ char *psz_real_path;
+ char *psz_buf = NULL;
+ if( in->p_access->psz_path )
+ {
+ const char *psz_a, *psz_d;
+ psz_buf = strdup( in->p_access->psz_path );
+ MRLSplit( psz_buf, &psz_a, &psz_d, &psz_real_path );
+ }
+ else
+ {
+ psz_real_path = psz_path;
+ }
+ in->p_demux = demux2_New( p_input, psz_access, psz_demux,
+ psz_real_path,
+ in->p_stream, p_input->p->p_es_out,
+ p_input->b_preparsing );
+ free( psz_buf );
+ }
+
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 ), VLC_FALSE,
+ _("VLC can't recognize the input's format"),
+ _("The format of '%s' cannot be detected. "
+ "Have a look the log for details."), psz_mrl );
goto error;
}
- /* TODO get title from demux */
- if( !b_quick && in->i_title <= 0 )
+ /* Get title from demux */
+ if( !p_input->b_preparsing && in->i_title <= 0 )
{
if( demux2_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
&in->title, &in->i_title,
&in->i_title_offset, &in->i_seekpoint_offset ))
{
- in->i_title = 0;
- in->title = NULL;
+ TAB_INIT( in->i_title, in->title );
}
else
{
}
}
+ /* get attachment
+ * FIXME improve for b_preparsing: move it after GET_META and check psz_arturl */
+ if( 1 || !p_input->b_preparsing )
+ {
+ int i_attachment;
+ input_attachment_t **attachment;
+ if( !demux2_Control( in->p_demux, DEMUX_GET_ATTACHMENTS,
+ &attachment, &i_attachment ) )
+ {
+ vlc_mutex_lock( &p_input->p->input.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 );
+ }
+ }
+ if( !demux2_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) )
+ {
+ 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 );
+ }
+
if( var_GetInteger( p_input, "clock-synchro" ) != -1 )
in->b_can_pace_control = !var_GetInteger( p_input, "clock-synchro" );
- free( psz_dup );
return VLC_SUCCESS;
error:
+ input_ChangeState( p_input, ERROR_S );
+
if( in->p_demux )
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 );
return VLC_EGENERIC;
}
/*****************************************************************************
* InputSourceClean:
*****************************************************************************/
-static void InputSourceClean( input_thread_t *p_input, input_source_t *in )
+static void InputSourceClean( input_source_t *in )
{
+ int i;
+
if( in->p_demux )
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 );
if( in->i_title > 0 )
{
- int i;
for( i = 0; i < in->i_title; i++ )
- {
vlc_input_title_Delete( in->title[i] );
- }
- free( in->title );
+ TAB_CLEAN( in->i_title, in->title );
}
}
{
int64_t i_time;
int i;
- if( demux2_Control( p_input->input.p_demux, DEMUX_GET_TIME, &i_time ) )
+
+ if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
{
msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
return;
}
- for( i = 0; i < p_input->i_slave; i++ )
+ for( i = 0; i < p_input->p->i_slave; i++ )
{
- input_source_t *in = p_input->slave[i];
+ input_source_t *in = p_input->p->slave[i];
int i_ret = 1;
if( in->b_eof )
int64_t i_time;
int i;
- if( demux2_Control( p_input->input.p_demux, DEMUX_GET_TIME, &i_time ) )
+ if( !p_input ) return;
+
+ if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
{
msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
return;
}
- for( i = 0; i < p_input->i_slave; i++ )
+ for( i = 0; i < p_input->p->i_slave; i++ )
{
- input_source_t *in = p_input->slave[i];
+ input_source_t *in = p_input->p->slave[i];
if( demux2_Control( in->p_demux, DEMUX_SET_TIME, i_time ) )
{
}
}
}
+
/*****************************************************************************
* InputMetaUser:
*****************************************************************************/
-static vlc_meta_t *InputMetaUser( input_thread_t *p_input )
+static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta )
{
- vlc_meta_t *p_meta;
vlc_value_t val;
- if( ( p_meta = vlc_meta_New() ) == NULL )
- return NULL;
+ if( !p_meta ) return;
/* Get meta information from user */
-#define GET_META( c, s ) \
+#define GET_META( field, s ) \
var_Get( p_input, (s), &val ); \
- if( *val.psz_string ) \
- vlc_meta_Add( p_meta, c, val.psz_string ); \
+ if( *val.psz_string ) \
+ vlc_meta_Set( p_meta, vlc_meta_ ## field, val.psz_string ); \
free( val.psz_string )
- GET_META( VLC_META_TITLE, "meta-title" );
- GET_META( VLC_META_AUTHOR, "meta-author" );
- GET_META( VLC_META_ARTIST, "meta-artist" );
- GET_META( VLC_META_GENRE, "meta-genre" );
- GET_META( VLC_META_COPYRIGHT, "meta-copyright" );
- GET_META( VLC_META_DESCRIPTION, "meta-description" );
- GET_META( VLC_META_DATE, "meta-date" );
- GET_META( VLC_META_URL, "meta-url" );
+ GET_META( Title, "meta-title" );
+ GET_META( Artist, "meta-artist" );
+ GET_META( Genre, "meta-genre" );
+ GET_META( Copyright, "meta-copyright" );
+ GET_META( Description, "meta-description" );
+ GET_META( Date, "meta-date" );
+ GET_META( URL, "meta-url" );
#undef GET_META
-
- return p_meta;
}
/*****************************************************************************
- * DecodeUrl: decode a given encoded url
+ * InputUpdateMeta: merge p_item meta data with p_meta taking care of
+ * arturl and locking issue.
*****************************************************************************/
-static void DecodeUrl( char *psz )
+static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta )
{
- char *dup = strdup( psz );
- char *p = dup;
+ input_item_t *p_item = p_input->p->input.p_item;
+ char * psz_arturl = NULL;
+ char *psz_title = NULL;
+ int i;
+ int i_arturl_event = VLC_FALSE;
- while( *p )
+ if( !p_meta )
+ return;
+
+ psz_arturl = input_item_GetArtURL( p_item );
+
+ vlc_mutex_lock( &p_item->lock );
+ if( vlc_meta_Get( p_meta, vlc_meta_Title ) && !p_item->b_fixed_name )
+ psz_title = strdup( vlc_meta_Get( p_meta, vlc_meta_Title ) );
+
+ vlc_meta_Merge( p_item->p_meta, p_meta );
+
+ if( psz_arturl && *psz_arturl )
{
- if( *p == '%' )
- {
- char val[3];
- p++;
- if( !*p )
- {
- break;
- }
+ vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, psz_arturl );
+ i_arturl_event = VLC_TRUE;
+ }
- val[0] = *p++;
- val[1] = *p++;
- val[2] = '\0';
+ vlc_meta_Delete( p_meta );
- *psz++ = strtol( val, NULL, 16 );
- }
- else if( *p == '+' )
+ if( psz_arturl && !strncmp( psz_arturl, "attachment://", strlen("attachment") ) )
+ {
+ /* Don't look for art cover if sout
+ * XXX It can change when sout has meta data support */
+ if( p_input->p->p_sout && !p_input->b_preparsing )
{
- *psz++ = ' ';
- p++;
+ vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, "" );
+ i_arturl_event = VLC_TRUE;
+
}
else
- {
- *psz++ = *p++;
- }
+ input_ExtractAttachmentAndCacheArt( p_input );
}
- *psz++ ='\0';
- free( dup );
-}
-
-/*****************************************************************************
- * ParseOption: parses the options for the input
- *****************************************************************************
- * This function parses the input (config) options and creates their associated
- * object variables.
- * Options are of the form "[no[-]]foo[=bar]" where foo is the option name and
- * bar is the value of the option.
- *****************************************************************************/
-static void ParseOption( input_thread_t *p_input, const char *psz_option )
-{
- char *psz_name = (char *)psz_option;
- char *psz_value = strchr( psz_option, '=' );
- int i_name_len, i_type;
- vlc_bool_t b_isno = VLC_FALSE;
- vlc_value_t val;
-
- if( psz_value ) i_name_len = psz_value - psz_option;
- else i_name_len = strlen( psz_option );
+ free( psz_arturl );
- /* It's too much of an hassle to remove the ':' when we parse
- * the cmd line :) */
- if( i_name_len && *psz_name == ':' )
+ /* A bit ugly */
+ p_meta = NULL;
+ if( vlc_dictionary_keys_count( &p_item->p_meta->extra_tags ) > 0 )
{
- psz_name++;
- i_name_len--;
+ p_meta = vlc_meta_New();
+ vlc_meta_Merge( p_meta, input_item_GetMetaObject( p_item ) );
}
+ vlc_mutex_unlock( &p_item->lock );
- if( i_name_len == 0 ) return;
+ input_item_SetPreparsed( p_item, VLC_TRUE );
- psz_name = strndup( psz_name, i_name_len );
- if( psz_value ) psz_value++;
+ if( i_arturl_event == VLC_TRUE )
+ {
+ vlc_event_t event;
- i_type = config_GetType( p_input, psz_name );
+ /* Notify interested third parties */
+ event.type = vlc_InputItemMetaChanged;
+ event.u.input_item_meta_changed.meta_type = vlc_meta_ArtworkURL;
+ vlc_event_send( &p_item->event_manager, &event );
+ }
- if( !i_type && !psz_value )
+ if( psz_title )
{
- /* check for "no-foo" or "nofoo" */
- if( !strncmp( psz_name, "no-", 3 ) )
- {
- memmove( psz_name, psz_name + 3, strlen(psz_name) + 1 - 3 );
- }
- else if( !strncmp( psz_name, "no", 2 ) )
+ input_Control( p_input, INPUT_SET_NAME, psz_title );
+ free( psz_title );
+ }
+
+ if( p_meta )
+ {
+ char ** ppsz_all_keys = vlc_dictionary_all_keys( &p_meta->extra_tags );
+ for( i = 0; ppsz_all_keys[i]; i++ )
{
- memmove( psz_name, psz_name + 2, strlen(psz_name) + 1 - 2 );
+ input_Control( p_input, INPUT_ADD_INFO, _(VLC_META_INFO_CAT), _(ppsz_all_keys[i]),
+ vlc_dictionary_value_for_key( &p_meta->extra_tags, ppsz_all_keys[i] ) );
+ free( ppsz_all_keys[i] );
}
- else goto cleanup; /* Option doesn't exist */
-
- b_isno = VLC_TRUE;
- i_type = config_GetType( p_input, psz_name );
-
- if( !i_type ) goto cleanup; /* Option doesn't exist */
+ free( ppsz_all_keys );
+ vlc_meta_Delete( p_meta );
}
- else if( !i_type ) goto cleanup; /* Option doesn't exist */
- if( ( i_type != VLC_VAR_BOOL ) &&
- ( !psz_value || !*psz_value ) ) goto cleanup; /* Invalid value */
+ /** \todo handle sout meta */
+}
- /* Create the variable in the input object.
- * Children of the input object will be able to retreive this value
- * thanks to the inheritance property of the object variables. */
- var_Create( p_input, psz_name, i_type );
- switch( i_type )
- {
- case VLC_VAR_BOOL:
- val.b_bool = !b_isno;
- break;
+static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment,
+ int i_new, input_attachment_t **pp_new )
+{
+ int i_attachment = *pi_attachment;
+ input_attachment_t **attachment = *ppp_attachment;
+ int i;
+
+ attachment = realloc( attachment,
+ sizeof(input_attachment_t**) * ( i_attachment + i_new ) );
+ for( i = 0; i < i_new; i++ )
+ attachment[i_attachment++] = pp_new[i];
+ free( pp_new );
- case VLC_VAR_INTEGER:
- val.i_int = atoi( psz_value );
- break;
+ /* */
+ *pi_attachment = i_attachment;
+ *ppp_attachment = attachment;
+}
- case VLC_VAR_FLOAT:
- val.f_float = atof( psz_value );
- break;
+static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_demux )
+{
+ vlc_bool_t b_bool;
+ module_t *p_id3;
- case VLC_VAR_STRING:
- case VLC_VAR_MODULE:
- case VLC_VAR_FILE:
- case VLC_VAR_DIRECTORY:
- val.psz_string = psz_value;
- break;
- default:
- goto cleanup;
- break;
+#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
+
+ demux2_Control( p_demux, DEMUX_GET_META, p_meta );
+ if( demux2_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) )
+ return;
+ if( !b_bool )
+ return;
+
+ p_demux->p_private = malloc( sizeof( demux_meta_t ) );
+ if(! p_demux->p_private )
+ return;
- var_Set( p_input, psz_name, val );
+ p_id3 = module_Need( p_demux, "meta reader", NULL, 0 );
+ if( p_id3 )
+ {
+ demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
- msg_Dbg( p_input, "set input option: %s to %s", psz_name,
- psz_value ? psz_value : ( val.b_bool ? "true" : "false") );
+ if( p_demux_meta->p_meta )
+ {
+ vlc_meta_Merge( p_meta, p_demux_meta->p_meta );
+ vlc_meta_Delete( p_demux_meta->p_meta );
+ }
- cleanup:
- if( psz_name ) free( psz_name );
- return;
+ if( p_demux_meta->i_attachments > 0 )
+ {
+ 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 );
+ }
+ module_Unneed( p_demux, p_id3 );
+ }
+ free( p_demux->p_private );
}
+
/*****************************************************************************
* 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( char *psz_dup, const char **ppsz_access, const char **ppsz_demux,
+ char **ppsz_path )
{
char *psz_access = NULL;
char *psz_demux = NULL;
- char *psz_path = NULL;
- char *psz, *psz_check;
-
- psz = strchr( psz_dup, ':' );
-
- /* '@' not allowed in access/demux part */
- psz_check = strchr( psz_dup, '@' );
- if( psz_check && psz_check < psz ) psz = 0;
-
-#if defined( WIN32 ) || defined( UNDER_CE )
- if( psz - psz_dup == 1 )
- {
- msg_Warn( p_input, "drive letter %c: found in source", *psz_dup );
- psz_path = psz_dup;
- }
- else
-#endif
+ char *psz_path;
- if( psz )
+ /* Either there is an access/demux specification before ://
+ * or we have a plain local file path. */
+ psz_path = strstr( psz_dup, "://" );
+ if( psz_path != NULL )
{
- *psz++ = '\0';
- if( psz[0] == '/' && psz[1] == '/' ) psz += 2;
-
- psz_path = psz;
-
- psz = strchr( psz_dup, '/' );
- if( psz )
- {
- *psz++ = '\0';
- psz_demux = psz;
- }
+ *psz_path = '\0';
+ psz_path += 3; /* skips "://" */
+ /* Separate access from demux (<access>/<demux>://<path>) */
psz_access = psz_dup;
+ psz_demux = strchr( psz_access, '/' );
+ if( psz_demux )
+ *psz_demux++ = '\0';
}
else
{
psz_path = psz_dup;
}
- if( !psz_access ) *ppsz_access = "";
- else *ppsz_access = psz_access;
-
- if( !psz_demux ) *ppsz_demux = "";
- else *ppsz_demux = psz_demux;
-
- if( !psz_path ) *ppsz_path = "";
- else *ppsz_path = psz_path;
+ *ppsz_access = psz_access ? psz_access : "";
+ *ppsz_demux = psz_demux ? psz_demux : "";
+ *ppsz_path = psz_path ? psz_path : "";
}
/*****************************************************************************
*pi_title_end, *pi_chapter_end );
}
-
-/***********************************************************************
- * Info management functions
- ***********************************************************************/
-char *vlc_input_item_GetInfo( input_item_t *p_i,
- const char *psz_cat,
- const char *psz_name )
+/*****************************************************************************
+ * input_AddSubtitles: add a subtitles file and enable it
+ *****************************************************************************/
+vlc_bool_t input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle,
+ vlc_bool_t b_check_extension )
{
- int i,j;
-
- vlc_mutex_lock( &p_i->lock );
+ input_source_t *sub;
+ vlc_value_t count;
+ vlc_value_t list;
+ char *psz_path, *psz_extension;
- for( i = 0 ; i< p_i->i_categories ; i++ )
+ if( b_check_extension && !subtitles_Filter( psz_subtitle ) )
{
- info_category_t *p_cat = p_i->pp_categories[i];
-
- if( !psz_cat || strcmp( p_cat->psz_name, psz_cat ) )
- continue;
+ return VLC_FALSE;
+ }
- for( j = 0; j < p_cat->i_infos ; j++ )
+ /* if we are provided a subtitle.sub file,
+ * see if we don't have a subtitle.idx and use it instead */
+ psz_path = strdup( psz_subtitle );
+ if( psz_path )
+ {
+ psz_extension = strrchr( psz_path, '.');
+ if( psz_extension && strcmp( psz_extension, ".sub" ) == 0 )
{
- if( !strcmp( p_cat->pp_infos[j]->psz_name, psz_name ) )
+ FILE *f;
+
+ strcpy( psz_extension, ".idx" );
+ /* FIXME: a portable wrapper for stat() or access() would be more suited */
+ if( ( f = utf8_fopen( psz_path, "rt" ) ) )
{
- vlc_mutex_unlock( &p_i->lock );
- return strdup( p_cat->pp_infos[j]->psz_value );
+ fclose( f );
+ msg_Dbg( p_input, "using %s subtitles file instead of %s",
+ psz_path, psz_subtitle );
+ strcpy( psz_subtitle, psz_path );
}
}
+ free( psz_path );
}
- 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 ;
+ var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, 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 )
+ sub = InputSourceNew( p_input );
+ if( !InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) )
{
- 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 );
- }
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub );
- for( i = 0; i< p_cat->i_infos; i++ )
- {
- if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) )
+ /* Select the ES */
+ if( !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) )
{
- p_info = p_cat->pp_infos[i];
- break;
- }
- }
+ if( count.i_int == 0 )
+ count.i_int++;
+ /* if it was first one, there is disable too */
- if( !p_info )
- {
- if( ( p_info = (info_t *)malloc( sizeof( info_t ) ) ) == NULL )
- {
- vlc_mutex_unlock( &p_i->lock );
- return VLC_EGENERIC;
+ 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 );
}
- 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 );
}
+ else free( sub );
- 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;
+ return VLC_TRUE;
}
-
projects / vlc / blobdiff