/*****************************************************************************
* input.c: input thread
*****************************************************************************
- * Copyright (C) 1998-2004 the VideoLAN team
+ * Copyright (C) 1998-2007 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <ctype.h>
-
#include <vlc/vlc.h>
+#include <ctype.h>
+
#include "input_internal.h"
#include <vlc_sout.h>
static int RunAndDestroy ( input_thread_t *p_input );
static input_thread_t * Create ( vlc_object_t *, input_item_t *,
- const char *, vlc_bool_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 void Destroy( input_thread_t *p_input, sout_instance_t **pp_sout );
static inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t * );
static void ControlReduce( input_thread_t * );
static int UpdateFromAccess( input_thread_t * );
static int UpdateFromDemux( input_thread_t * );
-static int UpdateMeta( input_thread_t * );
static void UpdateItemLength( input_thread_t *, int64_t i_length );
static input_source_t *InputSourceNew( input_thread_t *);
static int InputSourceInit( input_thread_t *, input_source_t *,
const char *, const char *psz_forced_demux );
-static void InputSourceClean( input_thread_t *, input_source_t * );
+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 void 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 * );
/*****************************************************************************
* This function creates a new input, and returns a pointer
* TODO complete this list (?)
*****************************************************************************/
static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
- const char *psz_header, vlc_bool_t b_quick )
+ const char *psz_header, vlc_bool_t b_quick, sout_instance_t *p_sout )
{
input_thread_t *p_input = NULL; /* thread descriptor */
vlc_value_t val;
p_input->p->i_start = 0;
p_input->i_time = 0;
p_input->p->i_stop = 0;
+ p_input->p->i_run = 0;
p_input->p->i_title = 0;
p_input->p->title = NULL;
p_input->p->i_title_offset = p_input->p->i_seekpoint_offset = 0;
p_input->i_state = INIT_S;
p_input->p->i_rate = INPUT_RATE_DEFAULT;
- p_input->p->i_bookmark = 0;
- p_input->p->bookmark = NULL;
- p_input->p->p_meta = NULL;
+ 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_sout_keep = VLC_FALSE;
p_input->p->b_out_pace_control = VLC_FALSE;
p_input->i_pts_delay = 0;
p_input->p->input.b_eof = VLC_FALSE;
p_input->p->input.i_cr_average = 0;
- if( !p_input->p->input.p_item->p_meta )
- p_input->p->input.p_item->p_meta = vlc_meta_New();
+ vlc_mutex_lock( &p_item->lock );
if( !p_item->p_stats )
- {
- p_item->p_stats = (input_stats_t*)malloc( sizeof( input_stats_t ) );
- vlc_mutex_init( p_input, &p_item->p_stats->lock );
- stats_ReinitInputStats( p_item->p_stats );
- }
+ p_item->p_stats = stats_NewInputStats( p_input );
+ vlc_mutex_unlock( &p_item->lock );
/* No slave */
p_input->p->i_slave = 0;
/* Parse input options */
vlc_mutex_lock( &p_item->lock );
for( i = 0; i < p_item->i_options; i++ )
- {
var_OptionParse( p_input, p_item->ppsz_options[i] );
- }
vlc_mutex_unlock( &p_item->lock );
/* Create Object Variables for private use only */
*psz_end = 0;
if( !strncmp( psz_start, "name=", 5 ) )
{
- p_seekpoint->psz_name = psz_start + 5;
+ p_seekpoint->psz_name = strdup(psz_start + 5);
}
else if( !strncmp( psz_start, "bytes=", 6 ) )
{
}
/* Remove 'Now playing' info as it is probably outdated */
- input_Control( p_input, INPUT_DEL_INFO, _(VLC_META_INFO_CAT),
- VLC_META_NOW_PLAYING ); /* ? Don't translate as it might has been copied ? */
+ input_Control( p_input, INPUT_DEL_INFO,
+ _(VLC_META_INFO_CAT),
+ _(VLC_META_NOW_PLAYING) );
+ input_item_SetNowPlaying( p_item, NULL );
/* */
if( p_input->b_preparsing )
p_input->i_flags |= OBJECT_FLAGS_QUIET | OBJECT_FLAGS_NOINTERACT;
+ /* */
+ if( p_sout )
+ p_input->p->p_sout = p_sout;
+
/* Attach only once we are ready */
vlc_object_attach( p_input, p_parent );
return p_input;
}
-static void Destroy( input_thread_t *p_input )
+static void Destroy( input_thread_t *p_input, sout_instance_t **pp_sout )
{
vlc_object_detach( p_input );
+ if( pp_sout )
+ *pp_sout = NULL;
+ if( p_input->p->p_sout )
+ {
+ if( pp_sout )
+ *pp_sout = p_input->p->p_sout;
+ else if( p_input->p->b_sout_keep )
+ SoutKeep( p_input->p->p_sout );
+ else
+ sout_DeleteInstance( p_input->p->p_sout );
+ }
+
vlc_mutex_destroy( &p_input->p->lock_control );
free( p_input->p );
vlc_object_destroy( p_input );
}
+
/**
* Initialize an input thread and run it. You will need to monitor the
* thread to clean up after it is done
input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
input_item_t *p_item )
{
- return __input_CreateThread2( p_parent, p_item, NULL );
+ vlc_bool_t b_sout_keep;
+ sout_instance_t *p_sout = SoutFind( p_parent, p_item, &b_sout_keep );
+ input_thread_t *p_input = __input_CreateThreadExtended( p_parent, p_item, NULL, p_sout );
+
+ if( !p_input && p_sout )
+ SoutKeep( p_sout );
+
+ p_input->p->b_sout_keep = b_sout_keep;
+ return p_input;
}
-/* Gruik ! */
-input_thread_t *__input_CreateThread2( vlc_object_t *p_parent,
- input_item_t *p_item,
- const char *psz_header )
+/* */
+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 = NULL; /* thread descriptor */
+ input_thread_t *p_input;
- p_input = Create( p_parent, p_item, psz_header, VLC_FALSE );
+ 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 ) )
+ VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
{
input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
- Destroy( p_input );
+ Destroy( p_input, &p_sout );
return NULL;
}
int __input_Read( vlc_object_t *p_parent, input_item_t *p_item,
vlc_bool_t b_block )
{
- input_thread_t *p_input = NULL; /* thread descriptor */
+ vlc_bool_t b_sout_keep;
+ sout_instance_t *p_sout = SoutFind( p_parent, p_item, &b_sout_keep );
+ input_thread_t *p_input;
- p_input = Create( p_parent, p_item, NULL, VLC_FALSE );
- if( !p_input )
+ 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;
if( b_block )
{
{
input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
- Destroy( p_input );
+ Destroy( p_input, NULL );
return VLC_EGENERIC;
}
}
*/
int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item )
{
- input_thread_t *p_input = NULL; /* thread descriptor */
+ input_thread_t *p_input;
/* Allocate descriptor */
- p_input = Create( p_parent, p_item, NULL, VLC_TRUE );
+ p_input = Create( p_parent, p_item, NULL, VLC_TRUE, NULL );
if( !p_input )
return VLC_EGENERIC;
- Init( p_input );
- End( p_input );
+ if( !Init( p_input ) )
+ End( p_input );
- Destroy( p_input );
+ Destroy( p_input, NULL );
return VLC_SUCCESS;
}
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 come from another thread),
* so use the vlc_object_find way, it's perfectly safe */
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 );
* \param the input thread to kill
*/
void input_DestroyThread( input_thread_t *p_input )
+{
+ input_DestroyThreadExtended( p_input, NULL );
+}
+
+void input_DestroyThreadExtended( input_thread_t *p_input, sout_instance_t **pp_sout )
{
/* Join the thread */
vlc_thread_join( p_input );
/* */
- Destroy( p_input );
+ Destroy( p_input, pp_sout );
}
/*****************************************************************************
exit:
/* Release memory */
- Destroy( p_input );
+ Destroy( p_input, NULL );
return 0;
}
*****************************************************************************/
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;
/* Do the read */
if( p_input->i_state != PAUSE_S )
{
- if( p_input->p->i_stop <= 0 || p_input->i_time < p_input->p->i_stop )
- i_ret=p_input->p->input.p_demux->pf_demux(p_input->p->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 )
{
input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION,
&val );
}
+
+ /* */
+ i_start_mdate = mdate();
}
}
else if( i_ret < 0 )
p_input->p->counters.p_input_bitrate->update_interval = 1000000;
}
- /* handle sout */
+ /* Find a usable sout and attach it to p_input */
psz = var_GetString( p_input, "sout" );
if( *psz && strncasecmp( p_input->p->input.p_item->psz_uri, "vlc:", 4 ) )
{
- p_input->p->p_sout = sout_NewInstance( p_input, psz );
- if( p_input->p->p_sout == NULL )
+ /* 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
{
- input_ChangeState( p_input, ERROR_S );
- msg_Err( p_input, "cannot start stream output instance, " \
- "aborting" );
- free( psz );
- return VLC_EGENERIC;
+ /* 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 )
{
INIT_COUNTER( sout_sent_packets, INTEGER, COUNTER );
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 );
}
{
var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
UpdateItemLength( p_input, val.i_time );
- p_input->p->input.p_item->i_duration = 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 */
/* Start time*/
/* Set start time */
- p_input->p->i_start = (int64_t)var_GetInteger( p_input, "start-time" ) *
- I64C(1000000);
- p_input->p->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->p->i_start > 0 )
{
}
}
- p_meta = p_input->p->input.p_item->p_meta;
+ p_meta = vlc_meta_New();
/* Get meta data from users */
- InputMetaUser( p_input );
+ InputMetaUser( p_input, p_meta );
+
/* Get meta data from master input */
demux2_Control( p_input->p->input.p_demux, DEMUX_GET_META, p_meta );
}
}
- UpdateMeta( p_input );
+ InputUpdateMeta( p_input, p_meta );
if( !p_input->b_preparsing )
{
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->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->p->input.p_demux = NULL;
input_ControlVarClean( p_input );
/* Clean up master */
- InputSourceClean( p_input, &p_input->p->input );
+ InputSourceClean( &p_input->p->input );
/* Delete slave */
for( i = 0; i < p_input->p->i_slave; i++ )
{
- InputSourceClean( p_input, p_input->p->slave[i] );
+ InputSourceClean( p_input->p->slave[i] );
free( p_input->p->slave[i] );
}
if( p_input->p->slave ) free( p_input->p->slave );
/* Close optional stream output instance */
if( p_input->p->p_sout )
{
- vlc_value_t keep;
-
CL_CO( sout_sent_packets );
CL_CO( sout_sent_bytes );
CL_CO( sout_send_bitrate );
- if( var_Get( p_input, "sout-keep", &keep ) >= 0 && keep.b_bool )
+ vlc_object_detach( p_input->p->p_sout );
+ }
+#undef CL_CO
+ }
+
+ 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 );
+ }
+
+ vlc_mutex_destroy( &p_input->p->counters.counters_lock );
+
+ /* Tell we're dead */
+ p_input->b_dead = VLC_TRUE;
+}
+
+static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, vlc_bool_t *pb_sout_keep )
+{
+ vlc_bool_t b_keep_sout = var_CreateGetBool( p_parent, "sout-keep" );
+ sout_instance_t *p_sout = NULL;
+ int i;
+
+ /* Search sout-keep options
+ * XXX it has to be done here, but it is duplicated work :( */
+ vlc_mutex_lock( &p_item->lock );
+ for( i = 0; i < p_item->i_options; i++ )
+ {
+ const char *psz_option = p_item->ppsz_options[i];
+ if( !psz_option )
+ continue;
+ if( *psz_option == ':' )
+ psz_option++;
+
+ if( !strcmp( psz_option, "sout-keep" ) )
+ b_keep_sout = VLC_TRUE;
+ else if( !strcmp( psz_option, "no-sout-keep" ) || !strcmp( psz_option, "nosout-keep" ) )
+ b_keep_sout = VLC_FALSE;
+ }
+ vlc_mutex_unlock( &p_item->lock );
+
+ /* Find a potential sout to reuse
+ * XXX it might be unusable but this will be checked later */
+ if( b_keep_sout )
+ {
+ /* Remove the sout from the playlist garbage collector */
+ playlist_t *p_playlist = pl_Yield( p_parent );
+
+ vlc_mutex_lock( &p_playlist->gc_lock );
+ p_sout = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, FIND_CHILD );
+ if( p_sout )
+ {
+ if( p_sout->p_parent != VLC_OBJECT(p_playlist) )
{
- /* attach sout to the playlist */
- msg_Dbg( p_input, "keeping sout" );
- vlc_object_detach( p_input->p->p_sout );
- vlc_object_attach( p_input->p->p_sout, p_input->p_libvlc->p_playlist );
+ vlc_object_release( p_sout );
+ p_sout = NULL;
}
else
{
- msg_Dbg( p_input, "destroying sout" );
- sout_DeleteInstance( p_input->p->p_sout );
+ vlc_object_detach( p_sout ); /* Remove it from the GC */
+
+ vlc_object_release( p_sout );
}
}
-#undef CL_CO
+ vlc_mutex_unlock( &p_playlist->gc_lock );
+
+ pl_Release( p_parent );
}
- vlc_mutex_destroy( &p_input->p->counters.counters_lock );
+ if( pb_sout_keep )
+ *pb_sout_keep = b_keep_sout;
- /* Tell we're dead */
- p_input->b_dead = VLC_TRUE;
+ 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 );
}
/*****************************************************************************
msg_Dbg( p_input, "control: stopping input" );
/* Mark all submodules to die */
if( p_input->p->input.p_access )
- p_input->p->input.p_access->b_die = VLC_TRUE;
+ vlc_object_kill( p_input->p->input.p_access );
if( p_input->p->input.p_stream )
- p_input->p->input.p_stream->b_die = VLC_TRUE;
- p_input->p->input.p_demux->b_die = VLC_TRUE;
+ 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:
if( f_pos > 1.0 ) f_pos = 1.0;
/* Reset the decoders states and clock sync (before calling the demuxer */
es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE );
+ input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
if( demux2_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION,
f_pos ) )
{
/* Reset the decoders states and clock sync (before calling the demuxer */
es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE );
+ input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
i_ret = demux2_Control( p_input->p->input.p_demux,
DEMUX_SET_TIME, i_time );
/* Reset clock */
es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE );
}
else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S &&
p_input->p->b_can_pause )
/* Switch to new state */
p_input->i_state = val.i_int;
var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+
+ /* Send discontinuity to decoders (it will allow them to flush
+ * if implemented */
+ input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE, VLC_FALSE );
}
else if( val.i_int == PAUSE_S && !p_input->p->b_can_pause )
{
}
if( i_rate != p_input->p->i_rate )
{
- p_input->p->i_rate = i_rate;
val.i_int = i_rate;
var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
- /* We haven't send data to decoder when rate != default */
- if( i_rate == INPUT_RATE_DEFAULT )
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE );
+ input_EsOutDiscontinuity( p_input->p->p_es_out,
+ VLC_FALSE, VLC_FALSE );
- /* Reset clock */
- es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
+ p_input->p->i_rate = i_rate;
+
+ input_EsOutSetRate( p_input->p->p_es_out );
b_force_update = VLC_TRUE;
}
if( i_title >= 0 && i_title < p_input->p->input.i_title )
{
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE );
es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
demux2_Control( p_demux, DEMUX_SET_TITLE, i_title );
input_ControlVarTitle( p_input, i_title );
if( i_title >= 0 && i_title < p_input->p->input.i_title )
{
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE );
es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
access2_Control( p_access, ACCESS_SET_TITLE, i_title );
stream_AccessReset( p_input->p->input.p_stream );
if( i_seekpoint >= 0 && i_seekpoint <
p_input->p->input.title[p_demux->info.i_title]->i_seekpoint )
{
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE );
es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
}
else
i_seekpoint--;
}
- else if( i_type == INPUT_CONTROL_SET_SEEKPOINT_NEXT )
+ 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->p->input.title[p_access->info.i_title]->i_seekpoint )
{
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE );
es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
access2_Control( p_access, ACCESS_SET_SEEKPOINT,
i_seekpoint );
if( !InputSourceInit( p_input, slave, val.psz_string, NULL ) )
{
- vlc_meta_t *p_meta = p_input->p->input.p_item->p_meta;
+ vlc_meta_t *p_meta;
int64_t i_time;
/* Add the slave */
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) */
+ 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 );
- UpdateMeta( p_input );
+ InputUpdateMeta( p_input, p_meta );
TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave );
}
if( p_access->info.i_update & INPUT_UPDATE_META )
{
/* TODO maybe multi - access ? */
- vlc_meta_t *p_meta = p_input->p->input.p_item->p_meta;
+ vlc_meta_t *p_meta = vlc_meta_New();
access2_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta );
- UpdateMeta( p_input );
+ InputUpdateMeta( p_input, p_meta );
var_SetBool( p_input, "item-change", p_input->p->input.p_item->i_id );
p_access->info.i_update &= ~INPUT_UPDATE_META;
}
return 1;
}
-/*****************************************************************************
- * UpdateMeta:
- *****************************************************************************/
-static int UpdateMeta( input_thread_t *p_input )
-{
- vlc_meta_t *p_meta = p_input->p->input.p_item->p_meta;
- if( !p_meta )
- return VLC_SUCCESS;
-
- if( p_meta->psz_title && !p_input->p->input.p_item->b_fixed_name )
- input_Control( p_input, INPUT_SET_NAME, p_meta->psz_title );
-
- /** \todo handle sout meta */
-
- return VLC_SUCCESS;
-}
-
/*****************************************************************************
* UpdateItemLength:
*****************************************************************************/
static void UpdateItemLength( input_thread_t *p_input, int64_t i_length )
{
- vlc_mutex_lock( &p_input->p->input.p_item->lock );
- p_input->p->input.p_item->i_duration = i_length;
- vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ input_item_SetDuration( p_input->p->input.p_item, (mtime_t) i_length );
if( !p_input->b_preparsing )
{
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_pace_control = VLC_TRUE;
in->b_eof = VLC_FALSE;
in->i_cr_average = 0;
char *psz;
vlc_value_t val;
- strcpy (psz_dup, psz_mrl);
+ strcpy( psz_dup, psz_mrl );
if( !in ) return VLC_EGENERIC;
if( !p_input ) return VLC_EGENERIC;
psz_access, psz_demux, psz_path,
p_input->b_preparsing );
}
-
+ /* access failed, maybe our access detection was wrong.
+ * Retry with the full name */
+ if( in->p_access == NULL && strchr( psz_mrl, ':' ) )
+ {
+ msg_Dbg( p_input, "retrying with access `' demux `' path `%s'",
+ psz_mrl );
+ in->p_access = access2_New( p_input,
+ "", "", psz_mrl,
+ p_input->b_preparsing );
+ }
if( in->p_access == NULL )
{
msg_Err( p_input, "open of `%s' failed: %s", psz_mrl,
{
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->p_es_out,
- p_input->b_preparsing );
+
+ {
+ /* 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( VLC_OBJECT(p_input), 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,
+ intf_UserFatal( VLC_OBJECT( p_input ), VLC_FALSE,
_("Can't recognize the input's format"),
_("The format of '%s' can't be detected. "
"Have a look the log for details."), psz_mrl );
goto error;
}
- /* TODO get title from demux */
+ /* 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
{
in->b_title_demux = VLC_TRUE;
}
}
+ /* 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 ) )
+ {
+ int i;
+ vlc_mutex_lock( &p_input->p->input.p_item->lock );
+ p_input->p->attachment = realloc( p_input->p->attachment,
+ sizeof(input_attachment_t**) * ( p_input->p->i_attachment + i_attachment ) );
+ for( i = 0; i < i_attachment; i++ )
+ p_input->p->attachment[p_input->p->i_attachment++] = attachment[i];
+ if( attachment )
+ free( attachment );
+ vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ }
+ }
}
if( var_GetInteger( p_input, "clock-synchro" ) != -1 )
/*****************************************************************************
* 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->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 );
}
}
/*****************************************************************************
* InputMetaUser:
*****************************************************************************/
-static void InputMetaUser( input_thread_t *p_input )
+static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta )
{
- vlc_meta_t *p_meta = p_input->p->input.p_item->p_meta;
vlc_value_t val;
if( !p_meta ) return;
/* Get meta information from user */
#define GET_META( field, s ) \
var_Get( p_input, (s), &val ); \
- if( *val.psz_string ) { \
- if( p_meta->psz_ ## field ) free ( p_meta->psz_ ## field ); \
- p_meta->psz_ ## field = strdup( val.psz_string ); \
- } \
+ if( *val.psz_string ) \
+ vlc_meta_Set( p_meta, vlc_meta_ ## field, val.psz_string ); \
free( val.psz_string )
- 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" );
+ 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
}
+/*****************************************************************************
+ * InputUpdateMeta: merge p_item meta data with p_meta taking care of
+ * arturl and locking issue.
+ *****************************************************************************/
+static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta )
+{
+ input_item_t *p_item = p_input->p->input.p_item;
+ char * psz_arturl = NULL;
+ char *psz_title = NULL;
+ int i;
+ int i_arturl_event = VLC_FALSE;
+
+ 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 )
+ {
+ vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, psz_arturl );
+ i_arturl_event = VLC_TRUE;
+ }
+
+ vlc_meta_Delete( p_meta );
+
+ 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 )
+ {
+ vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, "" );
+ i_arturl_event = VLC_TRUE;
+
+ }
+ else
+ input_ExtractAttachmentAndCacheArt( p_input );
+ }
+ free( psz_arturl );
+
+ input_item_SetPreparsed( p_item, VLC_TRUE );
+
+ /* A bit ugly */
+ p_meta = NULL;
+ if( vlc_dictionary_keys_count( &p_item->p_meta->extra_tags ) > 0 )
+ {
+ p_meta = vlc_meta_New();
+ vlc_meta_Merge( p_meta, input_item_GetMetaObject( p_item ) );
+ }
+ vlc_mutex_unlock( &p_item->lock );
+
+ if( i_arturl_event == VLC_TRUE )
+ {
+ vlc_event_t event;
+
+ /* 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( psz_title )
+ {
+ 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++ )
+ {
+ input_Control( p_input, INPUT_ADD_INFO, _(VLC_META_INFO_CAT), _(ppsz_all_keys[i]),
+ vlc_dictionary_value_for_key( &p_meta->extra_tags, ppsz_all_keys[i] ) );
+ free( ppsz_all_keys[i] );
+ }
+ free( ppsz_all_keys );
+ vlc_meta_Delete( p_meta );
+ }
+
+ /** \todo handle sout meta */
+}
+
+
+static inline vlc_bool_t IsValidAccess( const char *psz )
+{
+ char c;
+
+ while( ( c = *psz ) != '\0' )
+ {
+ if( c == ':' )
+ return VLC_TRUE;
+
+ if( ( !isascii( c ) || !isalnum( c ) ) && c != '-' && ( c != '/' ) )
+ return VLC_FALSE;
+ psz++;
+ }
+ /* should not happen though */
+ return VLC_FALSE;
+}
+
+
/*****************************************************************************
* MRLSplit: parse the access, demux and url part of the
* Media Resource Locator.
const char *psz_access = "";
const char *psz_demux = "";
char *psz_path;
- char *psz, *psz_check;
+ char *psz;
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 )
+ if( psz != NULL )
{
- msg_Dbg( p_input, "drive letter %c: found in source", *psz_dup );
- psz_path = psz_dup;
- }
- else
+ /* Guess whether ':' is part of a local filename, or separates
+ * access/demux from path */
+ if( !IsValidAccess( psz_dup ) )
+ psz = NULL;
+#if defined( WIN32 ) || defined( UNDER_CE )
+ else if( ( psz - psz_dup == 1 ) && isalpha( psz_dup[0] ) )
+ {
+ msg_Dbg( p_input, "drive letter %c: found in source", *psz_dup );
+ psz = NULL;
+ }
#endif
+ }
- if( psz )
+ if( psz != NULL )
{
*psz++ = '\0';
if( psz[0] == '/' && psz[1] == '/' ) psz += 2;
projects / vlc / blobdiff