#include <ctype.h>
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/decoder.h>
-#include <vlc/vout.h>
#include "input_internal.h"
-#include "stream_output.h"
-#include "vlc_playlist.h"
-#include "vlc_interface.h"
-#include "vlc_interaction.h"
+#include <vlc_sout.h>
+#include "../stream_output/stream_output.h"
+
+#include <vlc_playlist.h>
+#include <vlc_interface.h>
+#include <vlc_url.h>
+#include <vlc_demux.h>
+#include <vlc_charset.h>
+
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
/*****************************************************************************
* Local prototypes
static int Run ( input_thread_t *p_input );
static int RunAndClean ( input_thread_t *p_input );
-static input_thread_t * Create ( vlc_object_t *, input_item_t *, char *,
- vlc_bool_t );
-static int Init ( input_thread_t *p_input, vlc_bool_t b_quick );
+static input_thread_t * Create ( vlc_object_t *, input_item_t *,
+ const char *, vlc_bool_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 int UpdateFromAccess( input_thread_t * );
static int UpdateFromDemux( input_thread_t * );
-static int UpdateMeta( input_thread_t *, vlc_bool_t );
+static int UpdateMeta( input_thread_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 DecodeUrl( char * );
static void MRLSections( input_thread_t *, char *, int *, int *, int *, int *);
static input_source_t *InputSourceNew( input_thread_t *);
static int InputSourceInit( input_thread_t *, input_source_t *,
- char *, char *psz_forced_demux,
- vlc_bool_t b_quick );
+ const char *, const char *psz_forced_demux );
static void InputSourceClean( input_thread_t *, input_source_t * );
static void SlaveDemux( input_thread_t *p_input );
* TODO complete this list (?)
*****************************************************************************/
static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
- char *psz_header, vlc_bool_t b_quick )
+ const char *psz_header, vlc_bool_t b_quick )
{
input_thread_t *p_input = NULL; /* thread descriptor */
vlc_value_t val;
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_playlist->p_stats && !b_quick )
+ {
+ vlc_mutex_lock( &p_input->p_libvlc->p_playlist->p_stats->lock );
+ if( p_input->p_libvlc->p_playlist->p_stats_computer == NULL )
+ {
+ p_input->p_libvlc->p_playlist->p_stats_computer = p_input;
+ }
+ vlc_mutex_unlock( &p_input->p_libvlc->p_playlist->p_stats->lock );
+ }
+
+ 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_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;
+ p_input->p->i_bookmark = 0;
+ p_input->p->bookmark = NULL;
+ p_input->p->p_meta = NULL;
+ p_input->p->p_es_out = NULL;
+ p_input->p->p_sout = NULL;
+ 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;
-
- if( !p_input->input.p_item->p_meta )
- p_input->input.p_item->p_meta = vlc_meta_New();
- stats_ReinitInputStats( p_item->p_stats );
+ 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_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();
+
+ 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 );
+ }
/* 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 );
input_ConfigVarInit( p_input );
/* Create Objects variables for public Get and Set */
- input_ControlVarInit( p_input );
- p_input->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
+ if( !p_input->b_preparsing )
+ input_ControlVarInit( p_input );
- if( !b_quick )
+ 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 )
}
/**
- * Initialize an input thread and run it. You will need to monitor the thread to clean
- * up after it is done
+ * 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 __input_CreateThread2( p_parent, p_item, NULL );
}
-
/* Gruik ! */
input_thread_t *__input_CreateThread2( vlc_object_t *p_parent,
input_item_t *p_item,
- char *psz_header )
+ const char *psz_header )
{
input_thread_t *p_input = NULL; /* thread descriptor */
p_input = Create( p_parent, p_item, psz_header, VLC_FALSE );
+ if( !p_input )
+ return NULL;
+
/* Now we can attach our new input */
vlc_object_attach( p_input, p_parent );
if( vlc_thread_create( p_input, "input", Run,
VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
{
+ input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
vlc_object_detach( p_input );
+ free( p_input->p );
vlc_object_destroy( p_input );
return NULL;
}
return p_input;
}
-
/**
* 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
input_thread_t *p_input = NULL; /* thread descriptor */
p_input = Create( p_parent, p_item, NULL, VLC_FALSE );
+ if( !p_input )
+ return VLC_EGENERIC;
+
/* Now we can attach our new input */
vlc_object_attach( p_input, p_parent );
if( vlc_thread_create( p_input, "input", RunAndClean,
VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
{
+ input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
vlc_object_detach( p_input );
+ free( p_input->p );
vlc_object_destroy( p_input );
return VLC_EGENERIC;
}
/* Allocate descriptor */
p_input = Create( p_parent, p_item, NULL, VLC_TRUE );
- p_input->i_flags |= OBJECT_FLAGS_NODBG;
+ if( !p_input )
+ return VLC_EGENERIC;
+
+ p_input->i_flags |= OBJECT_FLAGS_QUIET;
p_input->i_flags |= OBJECT_FLAGS_NOINTERACT;
/* Now we can attach our new input */
vlc_object_attach( p_input, p_parent );
- Init( p_input, VLC_TRUE );
+ Init( p_input );
/* Clean up master */
- InputSourceClean( p_input, &p_input->input );
+ InputSourceClean( p_input, &p_input->p->input );
/* 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 );
vlc_object_detach( p_input );
+ free( p_input->p );
vlc_object_destroy( p_input );
return VLC_SUCCESS;
/* Set die for input */
p_input->b_die = VLC_TRUE;
- /* 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 */
vlc_thread_join( p_input );
/* Delete input lock (only after thread joined) */
- vlc_mutex_destroy( &p_input->lock_control );
+ vlc_mutex_destroy( &p_input->p->lock_control );
/* TODO: maybe input_DestroyThread should also delete p_input instead
* of the playlist but I'm not sure if it's possible */
/* 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 );
MainLoop( p_input );
- if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof )
+ 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_es_out ) )
+ if( input_EsOutDecodersEmpty( p_input->p->p_es_out ) )
break;
msg_Dbg( p_input, "waiting decoder fifos to empty" );
/* We have finished */
p_input->b_eof = VLC_TRUE;
+ playlist_Signal( pl_Get( p_input ) );
}
- /* Wait we are asked to die */
+ /* Wait until we are asked to die */
if( !p_input->b_die )
{
Error( p_input );
/* Signal that the thread is launched */
vlc_thread_ready( p_input );
- if( Init( p_input, VLC_FALSE ) )
+ if( Init( p_input ) )
{
/* If we failed, just exit */
return 0;
MainLoop( p_input );
- if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof )
+ 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 */
+ /* We have finished demuxing data but not playing it */
while( !p_input->b_die )
{
- if( input_EsOutDecodersEmpty( p_input->p_es_out ) )
+ 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;
}
/* Release memory */
vlc_object_detach( p_input );
+ free( p_input->p );
vlc_object_destroy( p_input );
return 0;
}
-
/*****************************************************************************
* Main loop: Fill buffers from access, and demux
*****************************************************************************/
static void MainLoop( input_thread_t *p_input )
{
int64_t i_intf_update = 0;
- while( !p_input->b_die && !p_input->b_error && !p_input->input.b_eof )
+ 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 )
+ i_ret=p_input->p->input.p_demux->pf_demux(p_input->p->input.p_demux);
else
i_ret = 0; /* EOF */
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 );
}
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);
}
+ /* 150ms * 8 = ~ 1 second */
+ if( ++i_updates % 8 == 0 )
+ {
+ stats_ComputeInputStats( p_input, p_input->p->input.p_item->p_stats );
+ /* Are we the thread responsible for computing global stats ? */
+ if( p_input->p_libvlc->p_playlist->p_stats_computer == p_input )
+ {
+ stats_ComputeGlobalStats( p_input->p_libvlc->p_playlist,
+ p_input->p_libvlc->p_playlist->p_stats );
+ }
+ }
}
}
-
-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;
* (this will break playing of file starting by 'vlc:' but I don't
* want to add more logic, just force file by file:// or code it ;)
*/
- if( !b_quick )
+ memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) );
+ vlc_mutex_init( p_input, &p_input->p->counters.counters_lock );
+
+ if( !p_input->b_preparsing )
{
/* Prepare statistics */
- counter_t *p_counter;
- stats_Create( p_input, "read_bytes", STATS_READ_BYTES,
- VLC_VAR_INTEGER, STATS_COUNTER );
- stats_Create( p_input, "read_packets", STATS_READ_PACKETS,
- VLC_VAR_INTEGER, STATS_COUNTER );
- stats_Create( p_input, "demux_read", STATS_DEMUX_READ,
- VLC_VAR_INTEGER, STATS_COUNTER );
- stats_Create( p_input, "input_bitrate", STATS_INPUT_BITRATE,
- VLC_VAR_FLOAT, STATS_DERIVATIVE );
- stats_Create( p_input, "demux_bitrate", STATS_DEMUX_BITRATE,
- VLC_VAR_FLOAT, STATS_DERIVATIVE );
-
- p_counter = stats_CounterGet( p_input, p_input->i_object_id,
- STATS_INPUT_BITRATE );
- if( p_counter ) p_counter->update_interval = 1000000;
- p_counter = stats_CounterGet( p_input, p_input->i_object_id,
- STATS_DEMUX_BITRATE );
- if( p_counter ) p_counter->update_interval = 1000000;
-
- stats_Create( p_input, "played_abuffers", STATS_PLAYED_ABUFFERS,
- VLC_VAR_INTEGER, STATS_COUNTER );
- stats_Create( p_input, "lost_abuffers", STATS_LOST_ABUFFERS,
- VLC_VAR_INTEGER, STATS_COUNTER );
+#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;
+ }
/* handle sout */
psz = var_GetString( p_input, "sout" );
- if( *psz && strncasecmp( p_input->input.p_item->psz_uri, "vlc:", 4 ) )
+ if( *psz && strncasecmp( p_input->p->input.p_item->psz_uri, "vlc:", 4 ) )
{
- p_input->p_sout = sout_NewInstance( p_input, psz );
- if( p_input->p_sout == NULL )
+ p_input->p->p_sout = sout_NewInstance( p_input, psz );
+ if( p_input->p->p_sout == NULL )
{
+ 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 );
+ INIT_COUNTER (sout_sent_bytes, INTEGER, COUNTER );
+ INIT_COUNTER( sout_send_bitrate, FLOAT, DERIVATIVE );
+ if( p_input->p->counters.p_sout_send_bitrate )
+ p_input->p->counters.p_sout_send_bitrate->update_interval =
+ 1000000;
+ }
}
free( psz );
}
/* Create es out */
- p_input->p_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 );
+ es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, VLC_FALSE );
+ es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE );
var_Create( p_input, "bit-rate", VLC_VAR_INTEGER );
var_Create( p_input, "sample-rate", VLC_VAR_INTEGER );
- if( InputSourceInit( p_input, &p_input->input,
- p_input->input.p_item->psz_uri, NULL, b_quick ) )
+ 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;
/* Fix pts delay */
if( p_input->i_pts_delay < 0 )
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 < 10 ) p_input->input.i_cr_average = 10;
+ 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 );
+ p_input->p->input.p_item->i_duration = 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" ) *
+ p_input->p->i_start = (int64_t)var_GetInteger( p_input, "start-time" ) *
I64C(1000000);
- p_input->i_stop = (int64_t)var_GetInteger( p_input, "stop-time" ) *
+ p_input->p->i_stop = (int64_t)var_GetInteger( p_input, "stop-time" ) *
I64C(1000000);
- 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, "starting at time: %ds",
- (int)( p_input->i_start / I64C(1000000) ) );
+ (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 )
{
- 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 );
{
char *psz_autopath = var_GetString( p_input, "sub-autodetect-path" );
char **subs = subtitles_Detect( p_input, psz_autopath,
- p_input->input.p_item->psz_uri );
+ p_input->p->input.p_item->psz_uri );
input_source_t *sub;
- vlc_value_t count;
- vlc_value_t list;
+ i = 0;
- var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL );
+ /* Try to autoselect the first autodetected subtitles file
+ * if no subtitles file was specified */
+ if( *psz_subtitle == 0 && subs && subs[0] )
+ {
+ input_AddSubtitles( p_input, subs[0], VLC_FALSE );
+ free( subs[0] );
+ i = 1;
+ }
- for( i = 0; subs && subs[i]; i++ )
+ /* Then, just add the following subtitles files */
+ for( ; subs && subs[i]; i++ )
{
if( 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 );
-
- /* If no subtitle was specified, select the first
- * autodetected subtitle. */
- if( i == 0 && psz_subtitle != NULL )
- {
- /* Select the ES */
- if( !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) )
- {
- if( count.i_int == 0 )
- count.i_int++;
- /* if it was first one, there is disable too */
-
- 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 );
- }
- }
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub );
}
+ else free( sub );
}
free( subs[i] );
}
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;
}
}
}
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->b_out_pace_control )
+ 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 */
}
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 = p_input->input.p_item->p_meta;
+ p_meta = p_input->p->input.p_item->p_meta;
/* Get meta data from users */
InputMetaUser( p_input );
/* Get meta data from master input */
- demux2_Control( p_input->input.p_demux, DEMUX_GET_META, p_meta );
+ demux2_Control( p_input->p->input.p_demux, DEMUX_GET_META, p_meta );
/* 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,
+ 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++ )
{
- demux2_Control( p_input->slave[i]->p_demux,
+ demux2_Control( p_input->p->slave[i]->p_demux,
DEMUX_GET_META, p_meta );
- if( p_input->slave[i]->p_access )
+ if( p_input->p->slave[i]->p_access )
{
- access2_Control( p_input->slave[i]->p_access,
+ access2_Control( p_input->p->slave[i]->p_access,
ACCESS_GET_META, p_meta );
}
}
}
- UpdateMeta( p_input, b_quick );
+ UpdateMeta( p_input );
- if( !b_quick )
+ if( !p_input->b_preparsing )
{
msg_Dbg( p_input, "`%s' successfully opened",
- p_input->input.p_item->psz_uri );
+ p_input->p->input.p_item->psz_uri );
}
/* 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_sout )
- sout_DeleteInstance( p_input->p_sout );
+ if( p_input->p->p_sout )
+ sout_DeleteInstance( p_input->p->p_sout );
/* 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;
}
while( !p_input->b_die )
{
/* Sleep a while */
+ input_ChangeState( p_input, ERROR_S );
msleep( INPUT_IDLE_SLEEP );
}
}
*****************************************************************************/
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 );
+ if( !p_input->b_preparsing )
+ input_ControlVarClean( p_input );
/* Clean up master */
- InputSourceClean( p_input, &p_input->input );
+ InputSourceClean( p_input, &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_input->p->slave[i] );
+ free( p_input->p->slave[i] );
}
- if( p_input->slave ) free( p_input->slave );
+ if( p_input->p->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 );
+
+#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 )
+ {
+ /* make sure we are up to date */
+ stats_ComputeInputStats( p_input, p_input->p->input.p_item->p_stats );
+ if( p_input->p_libvlc->p_playlist->p_stats_computer == p_input )
+ {
+ stats_ComputeGlobalStats( p_input->p_libvlc->p_playlist,
+ p_input->p_libvlc->p_playlist->p_stats );
+ p_input->p_libvlc->p_playlist->p_stats_computer = NULL;
+ }
+ 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) ;
+ }
/* Close optional stream output instance */
- if( p_input->p_sout )
+ if( p_input->p->p_sout )
{
- 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 )
+ 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 )
{
/* attach sout to the playlist */
msg_Dbg( p_input, "keeping sout" );
- vlc_object_detach( p_input->p_sout );
- vlc_object_attach( p_input->p_sout, p_pl );
+ vlc_object_detach( p_input->p->p_sout );
+ vlc_object_attach( p_input->p->p_sout, p_input->p_libvlc->p_playlist );
}
else
{
msg_Dbg( p_input, "destroying sout" );
- sout_DeleteInstance( p_input->p_sout );
+ sout_DeleteInstance( p_input->p->p_sout );
}
- if( p_pl )
- vlc_object_release( p_pl );
}
+#undef CL_CO
+
+ vlc_mutex_destroy( &p_input->p->counters.counters_lock );
/* Tell we're dead */
p_input->b_dead = VLC_TRUE;
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 &&
int j;
// 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
{
case INPUT_CONTROL_SET_DIE:
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 )
+ p_input->p->input.p_access->b_die = VLC_TRUE;
+ 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;
p_input->b_die = VLC_TRUE;
break;
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 */
+ es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE );
+ 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 );
b_force_update = VLC_TRUE;
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 */
+ es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE );
- 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,
+ 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 );
}
}
}
else
{
- if( p_input->i_slave > 0 )
+ if( p_input->p->i_slave > 0 )
SlaveSeek( p_input );
b_force_update = VLC_TRUE;
( 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;
var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
/* Reset clock */
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
- input_EsOutDiscontinuity( p_input->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_FALSE );
}
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;
p_input->i_state = val.i_int;
var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
}
- 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;
+ i_rate = p_input->p->i_rate * 2;
else if( i_type == INPUT_CONTROL_SET_RATE_FASTER )
- i_rate = p_input->i_rate / 2;
+ i_rate = p_input->p->i_rate / 2;
else
i_rate = val.i_int;
}
if( i_rate != INPUT_RATE_DEFAULT &&
( !p_input->b_can_pace_control ||
- ( p_input->p_sout && !p_input->b_out_pace_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->i_rate = 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_es_out, VLC_TRUE );
+ input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE );
/* Reset clock */
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
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 )
{
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE );
+ es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
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 )
{
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE );
+ es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
access2_Control( p_access, ACCESS_SET_TITLE, i_title );
- stream_AccessReset( p_input->input.p_stream );
+ 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;
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;
- i_seekpoint_time = p_input->input.title[p_demux->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
+ 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 ) )
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 )
{
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE );
+ es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
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 )
{
- demux_t *p_demux = p_input->input.p_demux;
- 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;
- i_seekpoint_time = p_input->input.title[p_access->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
+ 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 ) )
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 )
{
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE );
+ es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
access2_Control( p_access, ACCESS_SET_SEEKPOINT,
i_seekpoint );
- stream_AccessReset( p_input->input.p_stream );
+ 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 = p_input->input.p_item->p_meta;
+ vlc_meta_t *p_meta = p_input->p->input.p_item->p_meta;
int64_t i_time;
/* Add the slave */
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" );
access2_Control( slave->p_access, ACCESS_GET_META,
p_meta );
demux2_Control( slave->p_demux, DEMUX_GET_META, p_meta );
- UpdateMeta( p_input, VLC_FALSE );
+ UpdateMeta( p_input );
- 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;
}
if( p_access->info.i_update & INPUT_UPDATE_META )
{
/* TODO maybe multi - access ? */
- vlc_meta_t *p_meta = p_input->input.p_item->p_meta;
- access2_Control( p_input->input.p_access,ACCESS_GET_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 = p_input->p->input.p_item->p_meta;
+ access2_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta );
+ UpdateMeta( p_input );
+ var_SetBool( 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 )
{
/*****************************************************************************
* UpdateMeta:
*****************************************************************************/
-static int UpdateMeta( input_thread_t *p_input, vlc_bool_t b_quick )
+static int UpdateMeta( input_thread_t *p_input )
{
- vlc_meta_t *p_meta = p_input->input.p_item->p_meta;
+ 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->input.p_item->b_fixed_name )
+ 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 */
/*****************************************************************************
* 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 );
+ 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 );
- 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 ) );
}
/*****************************************************************************
* 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;
+ strcpy (psz_dup, psz_mrl);
+
if( !in ) return VLC_EGENERIC;
+ if( !p_input ) return VLC_EGENERIC;
/* Split uri */
- if( !b_quick )
+ if( !p_input->b_preparsing )
{
MRLSplit( VLC_OBJECT(p_input), psz_dup,
&psz_access, &psz_demux, &psz_path );
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;
+ psz_path = psz_dup;
msg_Dbg( p_input, "trying to pre-parse %s", psz_path );
- psz_demux = strdup( "" );
- psz_access = strdup( "file" );
+ psz_demux = "";
+ psz_access = "file";
}
if( in->p_demux )
{
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 );
+ p_input->b_preparsing );
/* 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 );
+ p_input->b_preparsing );
}
#ifndef WIN32 /* Remove this gross hack from the win32 build as colons
* are forbidden in filenames on Win32. */
if( in->p_access == NULL &&
*psz_access == '\0' && ( *psz_demux || *psz_path ) )
{
- if( psz_dup ) free( psz_dup );
- psz_dup = strdup( psz_mrl );
+ strcpy (psz_dup, psz_mrl);
psz_access = "";
if( psz_forced_demux && *psz_forced_demux )
{
in->p_access = access2_New( p_input,
psz_access, psz_demux, psz_path,
- b_quick );
+ p_input->b_preparsing );
}
#endif
if( in->p_access == NULL )
{
- msg_Err( p_input, "no suitable access module for `%s'", psz_mrl );
- intf_UserFatal( VLC_OBJECT( p_input),
- _("Errors"),"Unable to open '%s'", psz_mrl );
+ 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;
}
if( psz_tmp ) 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 );
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 );
+ in->p_stream, p_input->p->p_es_out,
+ p_input->b_preparsing );
if( in->p_demux == NULL )
{
msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
psz_access, psz_demux, psz_path );
- intf_UserFatal( VLC_OBJECT( p_input), _("Errors"),
- "Unrecognized format for '%s'", psz_mrl );
+ 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 */
- if( !b_quick && in->i_title <= 0 )
+ if( !p_input->b_preparsing && in->i_title <= 0 )
{
if( demux2_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
&in->title, &in->i_title,
if( var_GetInteger( p_input, "clock-synchro" ) != -1 )
in->b_can_pace_control = !var_GetInteger( p_input, "clock-synchro" );
- if( psz_dup ) free( psz_dup );
return VLC_SUCCESS;
error:
+ input_ChangeState( p_input, ERROR_S );
+
if( in->p_demux )
demux2_Delete( in->p_demux );
if( in->p_access )
access2_Delete( in->p_access );
- if( psz_dup ) free( psz_dup );
return VLC_EGENERIC;
}
{
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 void InputMetaUser( input_thread_t *p_input )
{
- vlc_meta_t *p_meta = p_input->input.p_item->p_meta;
+ vlc_meta_t *p_meta = p_input->p->input.p_item->p_meta;
vlc_value_t val;
if( !p_meta ) return;
free( val.psz_string )
GET_META( title, "meta-title" );
- GET_META( author, "meta-author" );
GET_META( artist, "meta-artist" );
GET_META( genre, "meta-genre" );
GET_META( copyright, "meta-copyright" );
#undef GET_META
}
-/*****************************************************************************
- * DecodeUrl: decode a given encoded url
- *****************************************************************************/
-static void DecodeUrl( char *psz )
-{
- char *dup = strdup( psz );
- char *p = dup;
-
- while( *p )
- {
- if( *p == '%' )
- {
- char val[3];
- p++;
- if( !*p )
- {
- break;
- }
-
- val[0] = *p++;
- val[1] = *p++;
- val[2] = '\0';
-
- *psz++ = strtol( val, NULL, 16 );
- }
- else if( *p == '+' )
- {
- *psz++ = ' ';
- p++;
- }
- else
- {
- *psz++ = *p++;
- }
- }
- if( psz ) *psz++ ='\0';
- if( dup ) free( dup );
-}
-
/*****************************************************************************
* MRLSplit: parse the access, demux and url part of the
* Media Resource Locator.
*****************************************************************************/
void MRLSplit( vlc_object_t *p_input, char *psz_dup,
- char **ppsz_access, char **ppsz_demux, char **ppsz_path )
+ const char **ppsz_access, const char **ppsz_demux,
+ char **ppsz_path )
{
- char *psz_access = NULL;
- char *psz_demux = NULL;
- char *psz_path = NULL;
+ const char *psz_access = "";
+ const char *psz_demux = "";
+ char *psz_path;
char *psz, *psz_check;
psz = strchr( psz_dup, ':' );
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;
+ *ppsz_demux = psz_demux;
+ *ppsz_path = psz_path;
}
/*****************************************************************************
input_source_t *sub;
vlc_value_t count;
vlc_value_t list;
+ char *psz_path, *psz_extension;
if( b_check_extension && !subtitles_Filter( psz_subtitle ) )
{
return VLC_FALSE;
}
+ /* 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 )
+ {
+ 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" ) ) )
+ {
+ 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 );
+ }
+
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 ) )
+ if( !InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) )
{
- TAB_APPEND( p_input->i_slave, p_input->slave, sub );
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub );
/* Select the ES */
if( !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) )
var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, NULL );
}
}
+ else free( sub );
return VLC_TRUE;
}
projects / vlc / blobdiff