*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include "vlc_interface.h"
#include "vlc_interaction.h"
+#include "charset.h"
+
/*****************************************************************************
* 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 *, vlc_bool_t );
+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 void Error ( input_thread_t *p_input );
static void End ( input_thread_t *p_input );
static void ControlReduce( input_thread_t * );
static vlc_bool_t Control( input_thread_t *, int, vlc_value_t );
-
static int UpdateFromAccess( input_thread_t * );
static int UpdateFromDemux( input_thread_t * );
static int UpdateMeta( input_thread_t *, vlc_bool_t );
static void UpdateItemLength( input_thread_t *, int64_t i_length, vlc_bool_t );
-static void ParseOption( input_thread_t *p_input, const char *psz_option );
-
static void DecodeUrl( char * );
static void MRLSections( input_thread_t *, char *, int *, int *, int *, int *);
static void SlaveDemux( input_thread_t *p_input );
static void SlaveSeek( input_thread_t *p_input );
-static vlc_meta_t *InputMetaUser( input_thread_t *p_input );
+static void InputMetaUser( input_thread_t *p_input );
/*****************************************************************************
* 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,
- vlc_bool_t b_quick )
+ char *psz_header, vlc_bool_t b_quick )
{
- input_thread_t *p_input; /* thread descriptor */
+ input_thread_t *p_input = NULL; /* thread descriptor */
vlc_value_t val;
int i;
msg_Err( p_parent, "out of memory" );
return NULL;
}
+ p_input->psz_header = psz_header ? strdup( psz_header ) : NULL;
/* Init Common fields */
p_input->b_eof = VLC_FALSE;
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 );
+
/* No slave */
p_input->i_slave = 0;
p_input->slave = NULL;
vlc_mutex_lock( &p_item->lock );
for( i = 0; i < p_item->i_options; i++ )
{
- ParseOption( p_input, p_item->ppsz_options[i] );
+ var_OptionParse( p_input, p_item->ppsz_options[i] );
}
vlc_mutex_unlock( &p_item->lock );
}
else if( !strncmp( psz_start, "time=", 5 ) )
{
- p_seekpoint->i_time_offset = atoll(psz_start + 5) * 1000000;
+ p_seekpoint->i_time_offset = atoll(psz_start + 5) *
+ 1000000;
}
psz_start = psz_end + 1;
}
}
/* Remove 'Now playing' info as it is probably outdated */
- input_Control( p_input, INPUT_DEL_INFO, _("Meta-information"),
- VLC_META_NOW_PLAYING );
+ input_Control( p_input, INPUT_DEL_INFO, _(VLC_META_INFO_CAT),
+ VLC_META_NOW_PLAYING ); /* ? Don't translate as it might has been copied ? */
return p_input;
}
*/
input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
input_item_t *p_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 )
{
- input_thread_t *p_input; /* thread descriptor */
+ input_thread_t *p_input = NULL; /* thread descriptor */
- p_input = Create( p_parent, p_item, VLC_FALSE );
+ p_input = Create( p_parent, p_item, psz_header, VLC_FALSE );
/* Now we can attach our new input */
vlc_object_attach( p_input, p_parent );
* \param p_parent a vlc_object
* \param p_item an input item
* \param b_block should we block until read is finished ?
- * \return the input object id if non blocking, 0 else
+ * \return the input object id if non blocking, an error code else
*/
int __input_Read( vlc_object_t *p_parent, input_item_t *p_item,
vlc_bool_t b_block )
{
- input_thread_t *p_input; /* thread descriptor */
+ input_thread_t *p_input = NULL; /* thread descriptor */
- p_input = Create( p_parent, p_item, VLC_FALSE );
+ p_input = Create( p_parent, p_item, NULL, VLC_FALSE );
/* Now we can attach our new input */
vlc_object_attach( p_input, p_parent );
if( b_block )
{
RunAndClean( p_input );
- return 0;
+ return VLC_SUCCESS;
}
else
{
msg_Err( p_input, "cannot create input thread" );
vlc_object_detach( p_input );
vlc_object_destroy( p_input );
- return;
+ return VLC_EGENERIC;
}
}
return p_input->i_object_id;
*/
int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item )
{
- input_thread_t *p_input; /* thread descriptor */
+ input_thread_t *p_input = NULL; /* thread descriptor */
/* Allocate descriptor */
- p_input = Create( p_parent, p_item, VLC_TRUE );
+ p_input = Create( p_parent, p_item, NULL, VLC_TRUE );
+ 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 );
/* Clean up master */
InputSourceClean( p_input, &p_input->input );
- /* Kill access and demux */
- if( p_input->input.p_access ) p_input->input.p_access->b_die = VLC_TRUE;
- if( p_input->input.p_demux ) p_input->input.p_access->b_die = VLC_TRUE;
-
/* Unload all modules */
if( p_input->p_es_out ) input_EsOutDelete( p_input->p_es_out );
- /* Delete meta */
- if( p_input->p_meta ) vlc_meta_Delete( p_input->p_meta );
-
vlc_object_detach( p_input );
vlc_object_destroy( p_input );
*****************************************************************************/
static int Run( input_thread_t *p_input )
{
-
/* Signal that the thread is launched */
vlc_thread_ready( p_input );
p_input->b_eof = VLC_TRUE;
}
- /* Wait we are asked to die */
+ /* Wait until we are asked to die */
if( !p_input->b_die )
{
Error( p_input );
if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof )
{
- /* We have finish to demux data but not to play them */
+ /* We have finished demuxing data but not playing it */
while( !p_input->b_die )
{
if( input_EsOutDecodersEmpty( p_input->p_es_out ) )
msleep( INPUT_IDLE_SLEEP );
}
+
/* We have finished */
p_input->b_eof = VLC_TRUE;
}
char *psz_subtitle;
vlc_value_t val;
double f_fps;
- vlc_meta_t *p_meta, *p_meta_tmp;
+ vlc_meta_t *p_meta;
int i_es_out_mode;
int i, i_delay;
* (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 ;)
*/
+ memset( &p_input->counters, 0, sizeof( p_input->counters ) );
if( !b_quick )
{
+ /* Prepare statistics */
+#define INIT_COUNTER( p, type, compute ) p_input->counters.p_##p = \
+ stats_CounterCreate( p_input, VLC_VAR_##type, STATS_##compute);
+ if( p_input->p_libvlc_global->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->counters.p_sout_send_bitrate = NULL;
+ p_input->counters.p_sout_sent_packets = NULL;
+ p_input->counters.p_sout_sent_bytes = NULL;
+ if( p_input->counters.p_demux_bitrate )
+ p_input->counters.p_demux_bitrate->update_interval = 1000000;
+ if( p_input->counters.p_input_bitrate )
+ p_input->counters.p_input_bitrate->update_interval = 1000000;
+ }
+ vlc_mutex_init( p_input, &p_input->counters.counters_lock );
+
+ /* handle sout */
psz = var_GetString( p_input, "sout" );
if( *psz && strncasecmp( p_input->input.p_item->psz_uri, "vlc:", 4 ) )
{
free( psz );
return VLC_EGENERIC;
}
+ if( p_input->p_libvlc_global->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->counters.p_sout_send_bitrate )
+ p_input->counters.p_sout_send_bitrate->update_interval =
+ 1000000;
+ }
}
free( psz );
}
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 );
+ 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 ) )
{
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 );
p_input->input.p_item->psz_uri );
input_source_t *sub;
- for( i = 0; subs && subs[i]; i++ )
+ i = 0;
+
+ /* 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;
+ }
+
+ /* Then, just add the following subtitles files */
+ for( ; subs && subs[i]; i++ )
{
if( strcmp( psz_subtitle, subs[i] ) )
{
if( !InputSourceInit( p_input, sub, subs[i], "subtitle",
VLC_FALSE ) )
{
- TAB_APPEND( p_input->i_slave, p_input->slave, sub );
+ TAB_APPEND( p_input->i_slave, p_input->slave, sub );
}
}
free( subs[i] );
}
}
+ p_meta = p_input->input.p_item->p_meta;
/* Get meta data from users */
- p_meta_tmp = InputMetaUser( p_input );
-
+ InputMetaUser( p_input );
/* Get meta data from master input */
- if( demux2_Control( p_input->input.p_demux, DEMUX_GET_META, &p_meta ) )
- p_meta = NULL;
-
- /* Merge them */
- if( p_meta == NULL )
- {
- p_meta = p_meta_tmp;
- }
- else if( p_meta_tmp )
- {
- vlc_meta_Merge( p_meta, p_meta_tmp );
- vlc_meta_Delete( p_meta_tmp );
- }
+ demux2_Control( p_input->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->input.p_access ||
+ if( p_input->input.p_access )
access2_Control( p_input->input.p_access, ACCESS_GET_META,
- &p_meta_tmp))
- p_meta_tmp = NULL;
-
- if( p_meta == NULL )
- {
- p_meta = p_meta_tmp;
- }
- else if( p_meta_tmp )
- {
- vlc_meta_Merge( p_meta, p_meta_tmp );
- vlc_meta_Delete( p_meta_tmp );
- }
+ p_meta );
/* Get meta data from slave input */
for( i = 0; i < p_input->i_slave; i++ )
{
- vlc_meta_t *p_meta_slave;
-
- if( !demux2_Control( p_input->slave[i]->p_demux,
- DEMUX_GET_META, &p_meta_slave ) )
+ demux2_Control( p_input->slave[i]->p_demux,
+ DEMUX_GET_META, p_meta );
+ if( p_input->slave[i]->p_access )
{
- if( p_meta == NULL )
- {
- p_meta = p_meta_slave;
- }
- else if( p_meta_slave )
- {
- vlc_meta_Merge( p_meta, p_meta_slave );
- vlc_meta_Delete( p_meta_slave );
- }
- }
-
- if( p_input->slave[i]->p_access &&
- !access2_Control( p_input->slave[i]->p_access,
- ACCESS_GET_META, &p_meta_slave ) )
- {
- if( p_meta == NULL )
- {
- p_meta = p_meta_slave;
- }
- else if( p_meta_slave )
- {
- vlc_meta_Merge( p_meta, p_meta_slave );
- vlc_meta_Delete( p_meta_slave );
- }
+ access2_Control( p_input->slave[i]->p_access,
+ ACCESS_GET_META, p_meta );
}
}
}
- p_input->p_meta = p_meta;
UpdateMeta( p_input, b_quick );
if( !b_quick )
}
/* 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;
*****************************************************************************/
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->p_es_out )
input_EsOutDelete( p_input->p_es_out );
+#define CL_CO( c ) stats_CounterClean( p_input->counters.p_##c ); p_input->counters.p_##c = NULL;
+ if( p_input->p_libvlc_global->b_stats )
+ {
+ vlc_mutex_lock( &p_input->counters.counters_lock );
+ 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) ;
+ vlc_mutex_unlock( &p_input->counters.counters_lock );
+ }
+
/* Close optional stream output instance */
if( p_input->p_sout )
{
vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
vlc_value_t keep;
+ vlc_mutex_lock( &p_input->counters.counters_lock );
+ CL_CO( sout_sent_packets );
+ CL_CO( sout_sent_bytes );
+ CL_CO( sout_send_bitrate );
+ vlc_mutex_unlock( &p_input->counters.counters_lock );
+
if( var_Get( p_input, "sout-keep", &keep ) >= 0 && keep.b_bool && p_pl )
{
/* attach sout to the playlist */
vlc_object_release( p_pl );
}
- /* Delete meta */
- if( p_input->p_meta )
- vlc_meta_Delete( p_input->p_meta );
-
+#undef CL_CO
/* Tell we're dead */
p_input->b_dead = VLC_TRUE;
}
{
input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
-
+
access2_Control( p_access, ACCESS_SET_TITLE, i_title );
stream_AccessReset( p_input->input.p_stream );
}
{
input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
-
+
demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
}
}
{
input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
-
- access2_Control( p_access, ACCESS_SET_SEEKPOINT, i_seekpoint );
+
+ access2_Control( p_access, ACCESS_SET_SEEKPOINT,
+ i_seekpoint );
stream_AccessReset( p_input->input.p_stream );
}
}
if( !InputSourceInit( p_input, slave, val.psz_string, NULL,
VLC_FALSE ) )
{
- vlc_meta_t *p_meta_new = NULL;
- vlc_meta_t *p_meta;
+ vlc_meta_t *p_meta = p_input->input.p_item->p_meta;
int64_t i_time;
/* Add the slave */
break;
}
-
/* Get meta (access and demux) */
- if( access2_Control( slave->p_access,
- ACCESS_GET_META, &p_meta_new ) )
- p_meta_new = NULL;
- if( !demux2_Control( slave->p_demux,
- DEMUX_GET_META, &p_meta ) )
- {
- if( p_meta_new )
- {
- vlc_meta_Merge( p_meta_new, p_meta );
- vlc_meta_Delete( p_meta );
- }
- else
- {
- p_meta_new = p_meta;
- }
- }
- /* Update meta */
- if( p_meta_new )
- {
- if( p_input->p_meta )
- {
- vlc_meta_Merge( p_input->p_meta, p_meta_new );
- vlc_meta_Delete( p_meta_new );
- }
- else
- {
- p_input->p_meta = p_meta_new;
- }
- UpdateMeta( p_input, VLC_FALSE );
- }
+ 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 );
TAB_APPEND( p_input->i_slave, p_input->slave, slave );
}
{
v.i_int = p_access->info.i_seekpoint;
var_Change( p_input, "chapter", VLC_VAR_SETVALUE, &v, NULL);
-
p_access->info.i_update &= ~INPUT_UPDATE_SEEKPOINT;
}
if( p_access->info.i_update & INPUT_UPDATE_META )
{
/* TODO maybe multi - access ? */
- vlc_meta_t *p_meta;
- if( !access2_Control( p_input->input.p_access,ACCESS_GET_META,&p_meta))
- {
- if( p_input->p_meta )
- {
- vlc_meta_Merge( p_input->p_meta, p_meta );
- vlc_meta_Delete( p_meta );
- }
- else
- {
- p_input->p_meta = p_meta;
- }
-
- UpdateMeta( p_input, VLC_FALSE );
- var_SetBool( p_input, "item-change", p_input->input.p_item->i_id );
- }
+ vlc_meta_t *p_meta = 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 );
p_access->info.i_update &= ~INPUT_UPDATE_META;
}
*****************************************************************************/
static int UpdateMeta( input_thread_t *p_input, vlc_bool_t b_quick )
{
- vlc_meta_t *p_meta = p_input->p_meta;
- int i;
-
- if( !p_meta || p_meta->i_meta == 0 )
+ vlc_meta_t *p_meta = p_input->input.p_item->p_meta;
+ if( !p_meta )
return VLC_SUCCESS;
- if( !b_quick ) msg_Dbg( p_input, "meta information:" );
- for( i = 0; i < p_meta->i_meta; i++ )
- {
- if( !b_quick )
- msg_Dbg( p_input, " - '%s' = '%s'",
- _(p_meta->name[i]), p_meta->value[i] );
-
- if( !strcmp(p_meta->name[i], VLC_META_TITLE) && p_meta->value[i] &&
- !p_input->input.p_item->b_fixed_name )
- input_Control( p_input, INPUT_SET_NAME, p_meta->value[i] );
-
- if( !strcmp( p_meta->name[i], VLC_META_AUTHOR ) )
- input_Control( p_input, INPUT_ADD_INFO, _("General"),
- _("Author"), p_meta->value[i] );
-
- input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"),
- _(p_meta->name[i]), "%s", p_meta->value[i] );
- }
-
- for( i = 0; i < p_meta->i_track; i++ )
- {
- vlc_meta_t *tk = p_meta->track[i];
- int j;
-
- if( tk->i_meta > 0 )
- {
- char *psz_cat = malloc( strlen(_("Stream")) + 10 );
-
- msg_Dbg( p_input, " - track[%d]:", i );
-
- sprintf( psz_cat, "%s %d", _("Stream"), i );
- for( j = 0; j < tk->i_meta; j++ )
- {
- msg_Dbg( p_input, " - '%s' = '%s'", _(tk->name[j]),
- tk->value[j] );
+ if( p_meta->psz_title && !p_input->input.p_item->b_fixed_name )
+ input_Control( p_input, INPUT_SET_NAME, p_meta->psz_title );
- input_Control( p_input, INPUT_ADD_INFO, psz_cat,
- _(tk->name[j]), "%s", tk->value[j] );
- }
- }
- }
-
- if( p_input->p_sout && p_input->p_sout->p_meta == NULL )
- {
- p_input->p_sout->p_meta = vlc_meta_Duplicate( p_meta );
- }
+ /** \todo handle sout meta */
return VLC_SUCCESS;
}
static input_source_t *InputSourceNew( input_thread_t *p_input )
{
input_source_t *in = (input_source_t*) malloc( sizeof( input_source_t ) );
-
+
if( !in )
{
msg_Err( p_input, "out of memory for new input source" );
{
psz_demux = psz_var_demux;
- msg_Dbg( p_input, "Enforce demux ` %s'", psz_demux );
+ msg_Dbg( p_input, "enforced demux ` %s'", psz_demux );
}
else if( psz_var_demux )
{
else
{
psz_path = psz_mrl;
- msg_Dbg( p_input, "trying to preparse %s", psz_path );
+ msg_Dbg( p_input, "trying to pre-parse %s", psz_path );
psz_demux = strdup( "" );
psz_access = strdup( "file" );
}
{
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 );
if( psz_dup ) free( psz_dup );
psz_dup = strdup( psz_mrl );
psz_access = "";
- psz_demux = "";
+ if( psz_forced_demux && *psz_forced_demux )
+ {
+ psz_demux = psz_forced_demux;
+ }
+ else psz_demux = "";
psz_path = psz_dup;
in->p_access = access2_New( p_input,
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 );
+ 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;
}
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 );
if( in->p_stream == 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;
}
{
int64_t i_time;
int i;
-
+
if( demux2_Control( p_input->input.p_demux, DEMUX_GET_TIME, &i_time ) )
{
msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
/*****************************************************************************
* InputMetaUser:
*****************************************************************************/
-static vlc_meta_t *InputMetaUser( input_thread_t *p_input )
+static void InputMetaUser( input_thread_t *p_input )
{
- vlc_meta_t *p_meta;
+ vlc_meta_t *p_meta = p_input->input.p_item->p_meta;
vlc_value_t val;
- if( ( p_meta = vlc_meta_New() ) == NULL )
- return NULL;
+ if( !p_meta ) return;
/* Get meta information from user */
-#define GET_META( c, s ) \
+#define GET_META( field, s ) \
var_Get( p_input, (s), &val ); \
- if( *val.psz_string ) \
- vlc_meta_Add( p_meta, c, val.psz_string ); \
+ if( *val.psz_string ) { \
+ if( p_meta->psz_ ## field ) free ( p_meta->psz_ ## field ); \
+ p_meta->psz_ ## field = strdup( val.psz_string ); \
+ } \
free( val.psz_string )
- GET_META( VLC_META_TITLE, "meta-title" );
- GET_META( VLC_META_AUTHOR, "meta-author" );
- GET_META( VLC_META_ARTIST, "meta-artist" );
- GET_META( VLC_META_GENRE, "meta-genre" );
- GET_META( VLC_META_COPYRIGHT, "meta-copyright" );
- GET_META( VLC_META_DESCRIPTION, "meta-description" );
- GET_META( VLC_META_DATE, "meta-date" );
- GET_META( VLC_META_URL, "meta-url" );
+ GET_META( title, "meta-title" );
+ GET_META( author, "meta-author" );
+ GET_META( artist, "meta-artist" );
+ GET_META( genre, "meta-genre" );
+ GET_META( copyright, "meta-copyright" );
+ GET_META( description, "meta-description" );
+ GET_META( date, "meta-date" );
+ GET_META( url, "meta-url" );
#undef GET_META
-
- return p_meta;
}
/*****************************************************************************
if( dup ) free( dup );
}
-/*****************************************************************************
- * ParseOption: parses the options for the input
- *****************************************************************************
- * This function parses the input (config) options and creates their associated
- * object variables.
- * Options are of the form "[no[-]]foo[=bar]" where foo is the option name and
- * bar is the value of the option.
- *****************************************************************************/
-static void ParseOption( input_thread_t *p_input, const char *psz_option )
-{
- char *psz_name = (char *)psz_option;
- char *psz_value = strchr( psz_option, '=' );
- int i_name_len, i_type;
- vlc_bool_t b_isno = VLC_FALSE;
- vlc_value_t val;
-
- if( psz_value ) i_name_len = psz_value - psz_option;
- else i_name_len = strlen( psz_option );
-
- /* It's too much of an hassle to remove the ':' when we parse
- * the cmd line :) */
- if( i_name_len && *psz_name == ':' )
- {
- psz_name++;
- i_name_len--;
- }
-
- if( i_name_len == 0 ) return;
-
- psz_name = strndup( psz_name, i_name_len );
- if( psz_value ) psz_value++;
-
- /* FIXME: :programs should be handled generically */
- if( !strcmp( psz_name, "programs" ) )
- i_type = VLC_VAR_LIST;
- else
- i_type = config_GetType( p_input, psz_name );
-
- if( !i_type && !psz_value )
- {
- /* check for "no-foo" or "nofoo" */
- if( !strncmp( psz_name, "no-", 3 ) )
- {
- memmove( psz_name, psz_name + 3, strlen(psz_name) + 1 - 3 );
- }
- else if( !strncmp( psz_name, "no", 2 ) )
- {
- memmove( psz_name, psz_name + 2, strlen(psz_name) + 1 - 2 );
- }
- else goto cleanup; /* Option doesn't exist */
-
- b_isno = VLC_TRUE;
- i_type = config_GetType( p_input, psz_name );
-
- if( !i_type ) goto cleanup; /* Option doesn't exist */
- }
- else if( !i_type ) goto cleanup; /* Option doesn't exist */
-
- if( ( i_type != VLC_VAR_BOOL ) &&
- ( !psz_value || !*psz_value ) ) goto cleanup; /* Invalid value */
-
- /* Create the variable in the input object.
- * Children of the input object will be able to retreive this value
- * thanks to the inheritance property of the object variables. */
- var_Create( p_input, psz_name, i_type );
-
- switch( i_type )
- {
- case VLC_VAR_BOOL:
- val.b_bool = !b_isno;
- break;
-
- case VLC_VAR_INTEGER:
- val.i_int = strtol( psz_value, NULL, 0 );
- break;
-
- case VLC_VAR_FLOAT:
- val.f_float = atof( psz_value );
- break;
-
- case VLC_VAR_STRING:
- case VLC_VAR_MODULE:
- case VLC_VAR_FILE:
- case VLC_VAR_DIRECTORY:
- val.psz_string = psz_value;
- break;
-
- case VLC_VAR_LIST:
- {
- char *psz_orig, *psz_var;
- vlc_list_t *p_list = malloc(sizeof(vlc_list_t));
- val.p_list = p_list;
- p_list->i_count = 0;
-
- psz_var = psz_orig = strdup(psz_value);
- while( psz_var && *psz_var )
- {
- char *psz_item = psz_var;
- vlc_value_t val2;
- while( *psz_var && *psz_var != ',' ) psz_var++;
- if( *psz_var == ',' )
- {
- *psz_var = '\0';
- psz_var++;
- }
- val2.i_int = strtol( psz_item, NULL, 0 );
- INSERT_ELEM( p_list->p_values, p_list->i_count,
- p_list->i_count, val2 );
- /* p_list->i_count is incremented twice by INSERT_ELEM */
- p_list->i_count--;
- INSERT_ELEM( p_list->pi_types, p_list->i_count,
- p_list->i_count, VLC_VAR_INTEGER );
- }
- if( psz_orig ) free( psz_orig );
- break;
- }
-
- default:
- goto cleanup;
- break;
- }
-
- var_Set( p_input, psz_name, val );
-
- msg_Dbg( p_input, "set input option: %s to %s", psz_name,
- psz_value ? psz_value : ( val.b_bool ? "true" : "false") );
-
- cleanup:
- if( psz_name ) free( psz_name );
- return;
-}
-
/*****************************************************************************
* MRLSplit: parse the access, demux and url part of the
* Media Resource Locator.
#if defined( WIN32 ) || defined( UNDER_CE )
if( psz - psz_dup == 1 )
{
- msg_Warn( p_input, "drive letter %c: found in source", *psz_dup );
+ msg_Dbg( p_input, "drive letter %c: found in source", *psz_dup );
psz_path = psz_dup;
}
else
*pi_title_end, *pi_chapter_end );
}
-
-/***********************************************************************
- * Info management functions
- ***********************************************************************/
-/**
- * Get a info item from a given category in a given input item.
- *
- * \param p_i The input item to get info from
- * \param psz_cat String representing the category for the info
- * \param psz_name String representing the name of the desired info
- * \return A pointer to the string with the given info if found, or an
- * empty string otherwise. The caller should free the returned
- * pointer.
- */
-char *vlc_input_item_GetInfo( input_item_t *p_i,
- const char *psz_cat,
- const char *psz_name )
+/*****************************************************************************
+ * input_AddSubtitles: add a subtitles file and enable it
+ *****************************************************************************/
+vlc_bool_t input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle,
+ vlc_bool_t b_check_extension )
{
- int i,j;
-
- vlc_mutex_lock( &p_i->lock );
+ input_source_t *sub;
+ vlc_value_t count;
+ vlc_value_t list;
+ char *psz_path, *psz_extension;
- for( i = 0 ; i< p_i->i_categories ; i++ )
+ if( b_check_extension && !subtitles_Filter( psz_subtitle ) )
{
- info_category_t *p_cat = p_i->pp_categories[i];
-
- if( !psz_cat || strcmp( p_cat->psz_name, psz_cat ) )
- continue;
+ return VLC_FALSE;
+ }
- for( j = 0; j < p_cat->i_infos ; j++ )
+ /* if we are provided a subtitle.sub file,
+ * see if we don't have a subtitle.idx and use it instead */
+ psz_path = strdup( psz_subtitle );
+ if( psz_path )
+ {
+ psz_extension = strrchr( psz_path, '.');
+ if( psz_extension && strcmp( psz_extension, ".sub" ) == 0 )
{
- if( !strcmp( p_cat->pp_infos[j]->psz_name, psz_name ) )
+ FILE *f;
+
+ strcpy( psz_extension, ".idx" );
+ /* FIXME: a portable wrapper for stat() or access() would be more suited */
+ if( ( f = utf8_fopen( psz_path, "rt" ) ) )
{
- char *psz_ret = strdup( p_cat->pp_infos[j]->psz_value );
- vlc_mutex_unlock( &p_i->lock );
- return psz_ret;
+ fclose( f );
+ msg_Dbg( p_input, "using %s subtitles file instead of %s",
+ psz_path, psz_subtitle );
+ strcpy( psz_subtitle, psz_path );
}
}
+ free( psz_path );
}
- vlc_mutex_unlock( &p_i->lock );
- return strdup( "" );
-}
-
-int vlc_input_item_AddInfo( input_item_t *p_i,
- const char *psz_cat,
- const char *psz_name,
- const char *psz_format, ... )
-{
- va_list args;
- int i;
- info_t *p_info = NULL;
- info_category_t *p_cat = NULL ;
- vlc_mutex_lock( &p_i->lock );
+ var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL );
- for( i = 0 ; i < p_i->i_categories ; i ++ )
- {
- if( !strcmp( p_i->pp_categories[i]->psz_name, psz_cat ) )
- {
- p_cat = p_i->pp_categories[i];
- break;
- }
- }
- if( !p_cat )
+ sub = InputSourceNew( p_input );
+ if( !InputSourceInit( p_input, sub, psz_subtitle, "subtitle", VLC_FALSE ) )
{
- if( !(p_cat = (info_category_t *)malloc( sizeof(info_category_t) )) )
- {
- vlc_mutex_unlock( &p_i->lock );
- return VLC_EGENERIC;
- }
- p_cat->psz_name = strdup( psz_cat );
- p_cat->i_infos = 0;
- p_cat->pp_infos = 0;
- INSERT_ELEM( p_i->pp_categories, p_i->i_categories, p_i->i_categories,
- p_cat );
- }
+ TAB_APPEND( p_input->i_slave, p_input->slave, sub );
- for( i = 0; i< p_cat->i_infos; i++ )
- {
- if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) )
+ /* Select the ES */
+ if( !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) )
{
- p_info = p_cat->pp_infos[i];
- break;
- }
- }
+ if( count.i_int == 0 )
+ count.i_int++;
+ /* if it was first one, there is disable too */
- if( !p_info )
- {
- if( ( p_info = (info_t *)malloc( sizeof( info_t ) ) ) == NULL )
- {
- vlc_mutex_unlock( &p_i->lock );
- return VLC_EGENERIC;
+ if( count.i_int < list.p_list->i_count )
+ {
+ input_ControlPush( p_input, INPUT_CONTROL_SET_ES,
+ &list.p_list->p_values[count.i_int] );
+ }
+ var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, NULL );
}
- INSERT_ELEM( p_cat->pp_infos, p_cat->i_infos, p_cat->i_infos, p_info );
- p_info->psz_name = strdup( psz_name );
- }
- else
- {
- if( p_info->psz_value ) free( p_info->psz_value );
}
- va_start( args, psz_format );
- vasprintf( &p_info->psz_value, psz_format, args);
- va_end( args );
-
- vlc_mutex_unlock( &p_i->lock );
-
- return VLC_SUCCESS;
+ return VLC_TRUE;
}
-
projects / vlc / blobdiff