#include "access.h"
#include "demux.h"
#include "stream.h"
+#include "item.h"
#include <vlc_sout.h>
#include "../stream_output/stream_output.h"
p_input->i_state = INIT_S;
p_input->p->i_rate = INPUT_RATE_DEFAULT;
p_input->p->b_recording = false;
- TAB_INIT( p_input->p->i_bookmark, p_input->p->bookmark );
+ memset( &p_input->p->bookmark, 0, sizeof(p_input->p->bookmark) );
+ TAB_INIT( p_input->p->i_bookmark, p_input->p->pp_bookmark );
TAB_INIT( p_input->p->i_attachment, p_input->p->attachment );
p_input->p->p_es_out_display = NULL;
p_input->p->p_es_out = NULL;
p_input->p->p_sout = NULL;
p_input->p->b_out_pace_control = false;
p_input->i_pts_delay = 0;
+ p_input->p->i_cr_average = 0;
- /* Init Input fields */
vlc_gc_incref( p_item ); /* Released in Destructor() */
- p_input->p->input.p_item = p_item;
+ p_input->p->p_item = p_item;
+
+ /* Init Input fields */
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_can_rate_control = true;
p_input->p->input.b_rescale_ts = true;
p_input->p->input.b_eof = false;
- p_input->p->input.i_cr_average = 0;
vlc_mutex_lock( &p_item->lock );
input_ControlVarInit( p_input );
/* */
- p_input->p->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
+ p_input->p->i_cr_average = var_GetInteger( p_input, "cr-average" );
if( !p_input->b_preparsing )
{
static void Destructor( input_thread_t * p_input )
{
#ifndef NDEBUG
- char * psz_name = input_item_GetName( p_input->p->input.p_item );
+ char * psz_name = input_item_GetName( p_input->p->p_item );
msg_Dbg( p_input, "Destroying the input for '%s'", psz_name);
free( psz_name );
#endif
if( p_input->p->p_sout )
sout_DeleteInstance( p_input->p->p_sout );
#endif
- vlc_gc_decref( p_input->p->input.p_item );
+ vlc_gc_decref( p_input->p->p_item );
vlc_mutex_destroy( &p_input->p->counters.counters_lock );
return p_sout;
}
+/**
+ * Get the item from an input thread
+ * FIXME it does not increase ref count of the item.
+ * if it is used after p_input is destroyed nothing prevent it from
+ * being freed.
+ */
+input_item_t *input_GetItem( input_thread_t *p_input )
+{
+ assert( p_input && p_input->p );
+ return p_input->p->p_item;
+}
+
/*****************************************************************************
* ObjectKillChildrens
*****************************************************************************/
( p_input->p->i_run > 0 && *pi_start_mdate+p_input->p->i_run < mdate() ) )
i_ret = 0; /* EOF */
else
- i_ret = p_input->p->input.p_demux->pf_demux(p_input->p->input.p_demux);
+ i_ret = demux_Demux( p_input->p->input.p_demux );
if( i_ret > 0 )
{
i_length = 0;
es_out_SetTimes( p_input->p->p_es_out, f_position, i_time, i_length );
+
+ /* update current bookmark */
+ vlc_mutex_lock( &p_input->p->p_item->lock );
+ p_input->p->bookmark.i_time_offset = i_time;
+ if( p_input->p->input.p_stream )
+ p_input->p->bookmark.i_byte_offset = stream_Tell( p_input->p->input.p_stream );
+ vlc_mutex_unlock( &p_input->p->p_item->lock );
}
/**
*/
static void MainLoopStatistic( input_thread_t *p_input )
{
- stats_ComputeInputStats( p_input, p_input->p->input.p_item->p_stats );
+ stats_ComputeInputStats( p_input, p_input->p->p_item->p_stats );
/* Are we the thread responsible for computing global stats ? */
if( libvlc_priv( p_input->p_libvlc )->p_stats_computer == p_input )
{
/* Find a usable sout and attach it to p_input */
psz = var_GetNonEmptyString( p_input, "sout" );
- if( psz && strncasecmp( p_input->p->input.p_item->psz_uri, "vlc:", 4 ) )
+ if( psz && strncasecmp( p_input->p->p_item->psz_uri, "vlc:", 4 ) )
{
/* Check the validity of the provided sout */
if( p_input->p->p_sout )
static void InitTitle( input_thread_t * p_input )
{
- vlc_value_t val;
+ input_source_t *p_master = &p_input->p->input;
- if( p_input->b_preparsing ) return;
+ if( p_input->b_preparsing )
+ return;
/* Create global title (from master) */
- 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;
+ p_input->p->i_title = p_master->i_title;
+ p_input->p->title = p_master->title;
+ p_input->p->i_title_offset = p_master->i_title_offset;
+ p_input->p->i_seekpoint_offset = p_master->i_seekpoint_offset;
if( p_input->p->i_title > 0 )
{
/* Setup variables */
}
/* Global flag */
- p_input->b_can_pace_control = p_input->p->input.b_can_pace_control;
- p_input->p->b_can_pause = p_input->p->input.b_can_pause;
- p_input->p->b_can_rate_control = p_input->p->input.b_can_rate_control;
+ p_input->b_can_pace_control = p_master->b_can_pace_control;
+ p_input->p->b_can_pause = p_master->b_can_pause;
+ p_input->p->b_can_rate_control = p_master->b_can_rate_control;
/* Fix pts delay */
if( p_input->i_pts_delay < 0 )
/* If the desynchronisation requested by the user is < 0, we need to
* cache more data. */
- var_Get( p_input, "audio-desync", &val );
- if( val.i_int < 0 )
- p_input->i_pts_delay -= (val.i_int * 1000);
+ const int i_desynch = var_GetInteger( p_input, "audio-desync" );
+ if( i_desynch < 0 )
+ p_input->i_pts_delay -= i_desynch * 1000;
/* Update cr_average depending on the caching */
- 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;
+ p_input->p->i_cr_average *= (10 * p_input->i_pts_delay / 200000);
+ p_input->p->i_cr_average /= 10;
+ if( p_input->p->i_cr_average < 10 )
+ p_input->p->i_cr_average = 10;
}
static void StartTitle( input_thread_t * p_input )
{
- double f_fps;
vlc_value_t val;
- int i_delay;
- char *psz;
- char *psz_subtitle;
- int64_t i_length;
/* Start title/chapter */
-
- if( p_input->b_preparsing )
- {
- p_input->p->i_start = 0;
- return;
- }
-
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->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 */
+ /* Start/stop/run time */
p_input->p->i_start = INT64_C(1000000) * var_GetInteger( p_input, "start-time" );
p_input->p->i_stop = INT64_C(1000000) * var_GetInteger( p_input, "stop-time" );
p_input->p->i_run = INT64_C(1000000) * var_GetInteger( p_input, "run-time" );
- i_length = var_GetTime( p_input, "length" );
if( p_input->p->i_run < 0 )
{
msg_Warn( p_input, "invalid run-time ignored" );
p_input->p->i_run = 0;
}
+ const mtime_t i_length = var_GetTime( p_input, "length" );
if( p_input->p->i_start > 0 )
{
if( p_input->p->i_start >= i_length )
msg_Warn( p_input, "invalid stop-time ignored" );
p_input->p->i_stop = 0;
}
+}
+static void LoadSubtitles( input_thread_t *p_input )
+{
/* Load subtitles */
/* Get fps and set it if not already set */
- if( !demux_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) &&
- f_fps > 1.0 )
+ const double f_fps = p_input->p->f_fps;
+ if( f_fps > 1.0 )
{
float f_requested_fps;
}
}
- i_delay = var_CreateGetInteger( p_input, "sub-delay" );
+ const int i_delay = var_CreateGetInteger( p_input, "sub-delay" );
if( i_delay != 0 )
- {
var_SetTime( p_input, "spu-delay", (mtime_t)i_delay * 100000 );
- }
/* Look for and add subtitle files */
- psz_subtitle = var_GetNonEmptyString( p_input, "sub-file" );
+ char *psz_subtitle = var_GetNonEmptyString( p_input, "sub-file" );
if( psz_subtitle != NULL )
{
msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle );
SubtitleAdd( p_input, psz_subtitle, true );
}
- var_Get( p_input, "sub-autodetect-file", &val );
- if( val.b_bool )
+ if( var_GetBool( p_input, "sub-autodetect-file" ) )
{
char *psz_autopath = var_GetNonEmptyString( p_input, "sub-autodetect-path" );
char **ppsz_subs = subtitles_Detect( p_input, psz_autopath,
- p_input->p->input.p_item->psz_uri );
+ p_input->p->p_item->psz_uri );
free( psz_autopath );
for( int i = 0; ppsz_subs && ppsz_subs[i]; i++ )
free( ppsz_subs );
}
free( psz_subtitle );
+}
+
+static void LoadSlaves( input_thread_t *p_input )
+{
+ char *psz = var_GetNonEmptyString( p_input, "input-slave" );
+ if( !psz )
+ return;
- /* Look for slave */
- psz = var_GetNonEmptyString( p_input, "input-slave" );
- if( psz != NULL )
+ char *psz_org = psz;
+ while( psz && *psz )
{
- char *psz_delim;
- input_source_t *slave;
- while( psz && *psz )
- {
- while( *psz == ' ' || *psz == '#' )
- {
- psz++;
- }
- if( ( psz_delim = strchr( psz, '#' ) ) )
- {
- *psz_delim++ = '\0';
- }
- if( *psz == 0 )
- {
- break;
- }
+ while( *psz == ' ' || *psz == '#' )
+ psz++;
- msg_Dbg( p_input, "adding slave input '%s'", psz );
- slave = InputSourceNew( p_input );
- if( !InputSourceInit( p_input, slave, psz, NULL ) )
- {
- TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave );
- }
- else free( slave );
- psz = psz_delim;
- }
- free( psz );
+ char *psz_delim = strchr( psz, '#' );
+ if( psz_delim )
+ *psz_delim++ = '\0';
+
+ if( *psz == 0 )
+ break;
+
+ msg_Dbg( p_input, "adding slave input '%s'", psz );
+
+ input_source_t *p_slave = InputSourceNew( p_input );
+ if( p_slave && !InputSourceInit( p_input, p_slave, psz, NULL ) )
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, p_slave );
+ else
+ free( p_slave );
+
+ psz = psz_delim;
}
+ free( psz_org );
}
static void InitPrograms( input_thread_t * p_input )
int i_es_out_mode;
vlc_value_t val;
- if( p_input->b_preparsing ) return;
-
/* Set up es_out */
es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, true );
i_es_out_mode = ES_OUT_MODE_AUTO;
vlc_meta_t *p_meta;
int i, ret;
- for( i = 0; i < p_input->p->input.p_item->i_options; i++ )
+ for( i = 0; i < p_input->p->p_item->i_options; i++ )
{
- if( !strncmp( p_input->p->input.p_item->ppsz_options[i], "meta-file", 9 ) )
+ if( !strncmp( p_input->p->p_item->ppsz_options[i], "meta-file", 9 ) )
{
msg_Dbg( p_input, "Input is a meta file: disabling unneeded options" );
var_SetString( p_input, "sout", "" );
var_Create( p_input, "bit-rate", VLC_VAR_INTEGER );
var_Create( p_input, "sample-rate", VLC_VAR_INTEGER );
+ /* */
+ input_ChangeState( p_input, OPENING_S );
+ input_SendEventCache( p_input, 0.0 );
+
+ /* */
if( InputSourceInit( p_input, &p_input->p->input,
- p_input->p->input.p_item->psz_uri, NULL ) )
+ p_input->p->p_item->psz_uri, NULL ) )
{
goto error;
}
&i_length ) )
i_length = 0;
if( i_length <= 0 )
- i_length = input_item_GetDuration( p_input->p->input.p_item );
+ i_length = input_item_GetDuration( p_input->p->p_item );
input_SendEventTimes( p_input, 0.0, 0, i_length );
- StartTitle( p_input );
-
- InitPrograms( p_input );
+ if( !p_input->b_preparsing )
+ {
+ StartTitle( p_input );
+ LoadSubtitles( p_input );
+ LoadSlaves( p_input );
+ InitPrograms( p_input );
+ }
if( !p_input->b_preparsing && p_input->p->p_sout )
{
}
p_meta = vlc_meta_New();
+ if( p_meta )
+ {
+ /* Get meta data from users */
+ InputMetaUser( p_input, p_meta );
- /* Get meta data from users */
- InputMetaUser( p_input, p_meta );
-
- /* Get meta data from master input */
- InputSourceMeta( p_input, &p_input->p->input, p_meta );
+ /* Get meta data from master input */
+ InputSourceMeta( p_input, &p_input->p->input, p_meta );
- /* And from slave */
- for( int i = 0; i < p_input->p->i_slave; i++ )
- InputSourceMeta( p_input, p_input->p->slave[i], p_meta );
+ /* And from slave */
+ for( int i = 0; i < p_input->p->i_slave; i++ )
+ InputSourceMeta( p_input, p_input->p->slave[i], p_meta );
- /* */
- InputUpdateMeta( p_input, p_meta );
+ /* */
+ InputUpdateMeta( p_input, p_meta );
+ }
if( !p_input->b_preparsing )
{
msg_Dbg( p_input, "`%s' successfully opened",
- p_input->p->input.p_item->psz_uri );
+ p_input->p->p_item->psz_uri );
}
libvlc_priv_t *p_private = libvlc_priv( p_input->p_libvlc );
/* make sure we are up to date */
- stats_ComputeInputStats( p_input, p_input->p->input.p_item->p_stats );
+ stats_ComputeInputStats( p_input, p_input->p->p_item->p_stats );
if( p_private->p_stats_computer == p_input )
{
stats_ComputeGlobalStats( p_input->p_libvlc,
p_input->p_libvlc->p_stats );
+ /* FIXME how can it be thread safe ? */
p_private->p_stats_computer = NULL;
}
CL_CO( read_bytes );
{
es_out_SetTime( p_input->p->p_es_out, -1 );
- access_Control( p_access, ACCESS_SET_TITLE, i_title );
- stream_AccessReset( p_input->p->input.p_stream );
+ stream_Control( p_input->p->input.p_stream, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_TITLE, i_title );
}
}
break;
{
es_out_SetTime( p_input->p->p_es_out, -1 );
- access_Control( p_access, ACCESS_SET_SEEKPOINT,
- i_seekpoint );
- stream_AccessReset( p_input->p->input.p_stream );
+ stream_Control( p_input->p->input.p_stream, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_SEEKPOINT, i_seekpoint );
}
}
break;
{
input_source_t *slave = InputSourceNew( p_input );
- if( !InputSourceInit( p_input, slave, val.psz_string, NULL ) )
+ if( slave && !InputSourceInit( p_input, slave, val.psz_string, NULL ) )
{
vlc_meta_t *p_meta;
int64_t i_time;
/* Get meta (access and demux) */
p_meta = vlc_meta_New();
- access_Control( slave->p_access, ACCESS_GET_META,
- p_meta );
- demux_Control( slave->p_demux, DEMUX_GET_META, p_meta );
- InputUpdateMeta( p_input, p_meta );
+ if( p_meta )
+ {
+ access_Control( slave->p_access, ACCESS_GET_META, p_meta );
+ demux_Control( slave->p_demux, DEMUX_GET_META, p_meta );
+ InputUpdateMeta( p_input, p_meta );
+ }
TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave );
}
break;
case INPUT_CONTROL_SET_BOOKMARK:
+ {
+ seekpoint_t bookmark;
+
+ bookmark.i_time_offset = -1;
+ bookmark.i_byte_offset = -1;
+
+ vlc_mutex_lock( &p_input->p->p_item->lock );
+ if( val.i_int >= 0 && val.i_int < p_input->p->i_bookmark )
+ {
+ const seekpoint_t *p_bookmark = p_input->p->pp_bookmark[val.i_int];
+ bookmark.i_time_offset = p_bookmark->i_time_offset;
+ bookmark.i_byte_offset = p_bookmark->i_byte_offset;
+ }
+ vlc_mutex_unlock( &p_input->p->p_item->lock );
+
+ if( bookmark.i_time_offset < 0 && bookmark.i_byte_offset < 0 )
+ {
+ msg_Err( p_input, "invalid bookmark %d", val.i_int );
+ break;
+ }
+
+ if( bookmark.i_time_offset >= 0 )
+ {
+ val.i_time = bookmark.i_time_offset;
+ b_force_update = Control( p_input, INPUT_CONTROL_SET_TIME, val );
+ }
+ else if( bookmark.i_byte_offset >= 0 &&
+ p_input->p->input.p_stream )
+ {
+ const int64_t i_size = stream_Size( p_input->p->input.p_stream );
+ if( i_size > 0 && bookmark.i_byte_offset <= i_size )
+ {
+ val.f_float = (double)bookmark.i_byte_offset / i_size;
+ b_force_update = Control( p_input, INPUT_CONTROL_SET_POSITION, val );
+ }
+ }
+ break;
+ }
+
default:
msg_Err( p_input, "not yet implemented" );
break;
if( p_demux->info.i_update & INPUT_UPDATE_META )
{
vlc_meta_t *p_meta = vlc_meta_New();
- demux_Control( p_input->p->input.p_demux, DEMUX_GET_META, p_meta );
- InputUpdateMeta( p_input, p_meta );
+ if( p_meta )
+ {
+ demux_Control( p_input->p->input.p_demux, DEMUX_GET_META, p_meta );
+ InputUpdateMeta( p_input, p_meta );
+ }
p_demux->info.i_update &= ~INPUT_UPDATE_META;
}
{
input_SendEventTitle( p_input, p_access->info.i_title );
- stream_AccessUpdate( p_input->p->input.p_stream );
+ stream_Control( p_input->p->input.p_stream, STREAM_UPDATE_SIZE );
p_access->info.i_update &= ~INPUT_UPDATE_TITLE;
}
{
/* TODO maybe multi - access ? */
vlc_meta_t *p_meta = vlc_meta_New();
- access_Control( p_input->p->input.p_access, ACCESS_GET_META, p_meta );
- InputUpdateMeta( p_input, p_meta );
+ if( p_meta )
+ {
+ access_Control( p_input->p->input.p_access, ACCESS_GET_META, p_meta );
+ InputUpdateMeta( p_input, p_meta );
+ }
p_access->info.i_update &= ~INPUT_UPDATE_META;
}
if( p_access->info.i_update & INPUT_UPDATE_SIGNAL )
input_source_t *in, const char *psz_mrl,
const char *psz_forced_demux )
{
- const bool b_master = in == &p_input->p->input;
-
char psz_dup[strlen(psz_mrl) + 1];
const char *psz_access;
const char *psz_demux;
strcpy( psz_dup, psz_mrl );
- if( !in ) return VLC_EGENERIC;
- if( !p_input ) return VLC_EGENERIC;
-
/* Split uri */
input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_dup );
{
int64_t i_pts_delay;
- if( b_master )
- input_ChangeState( p_input, OPENING_S );
-
/* Now try a real access */
in->p_access = access_New( p_input, psz_access, psz_demux, psz_path );
goto error;
}
- /* */
- psz_tmp = psz = var_GetNonEmptyString( p_input, "access-filter" );
- while( psz && *psz )
- {
- access_t *p_access = in->p_access;
- char *end = strchr( psz, ':' );
-
- if( end )
- *end++ = '\0';
-
- in->p_access = access_FilterNew( in->p_access, psz );
- if( in->p_access == NULL )
- {
- in->p_access = p_access;
- msg_Warn( p_input, "failed to insert access filter %s",
- psz );
- }
-
- psz = end;
- }
- free( psz_tmp );
-
/* Get infos from access */
if( !p_input->b_preparsing )
{
var_Set( p_input, "can-seek", val );
}
- if( b_master )
- input_ChangeState( p_input, BUFFERING_S );
+ /* TODO (maybe)
+ * do not let stream_AccessNew access input-list
+ * but give it a list of access ? */
/* Autodetect extra files if none specified */
char *psz_input_list = var_CreateGetNonEmptyString( p_input, "input-list" );
/* Create the stream_t */
in->p_stream = stream_AccessNew( in->p_access, p_input->b_preparsing );
- /* Restor old value */
+ /* Restore old value */
if( !psz_input_list )
var_SetString( p_input, "input-list", "" );
free( psz_input_list );
goto error;
}
+ /* Add auto stream filter */
+ for( ;; )
+ {
+ stream_t *p_filter = stream_FilterNew( in->p_stream, NULL );
+ if( !p_filter )
+ break;
+
+ msg_Dbg( p_input, "Inserted a stream filter" );
+ in->p_stream = p_filter;
+ }
+
+ /* Add user stream filter */
+ psz_tmp = psz = var_GetNonEmptyString( p_input, "stream-filter" );
+ while( psz && *psz )
+ {
+ stream_t *p_filter;
+ char *psz_end = strchr( psz, ':' );
+
+ if( psz_end )
+ *psz_end++ = '\0';
+
+ p_filter = stream_FilterNew( in->p_stream, psz );
+ if( p_filter )
+ in->p_stream = p_filter;
+ else
+ msg_Warn( p_input, "failed to insert stream filter %s", psz );
+
+ psz = psz_end;
+ }
+ free( psz_tmp );
+
+ /* Add record filter if usefull */
+ if( var_GetBool( p_input, "input-record-native" ) )
+ {
+ stream_t *p_filter;
+
+ p_filter = stream_FilterNew( in->p_stream, "stream_filter_record" );
+ if( p_filter )
+ in->p_stream = p_filter;
+ else
+ var_SetBool( p_input, "input-record-native", false );
+ }
+
/* Open a demuxer */
if( *psz_demux == '\0' && *in->p_access->psz_demux )
{
if( demux_Control( in->p_demux, DEMUX_CAN_RECORD, &in->b_can_stream_record ) )
in->b_can_stream_record = false;
#ifdef ENABLE_SOUT
- if( !var_CreateGetBool( p_input, "input-record-native" ) )
+ if( !var_GetBool( p_input, "input-record-native" ) )
in->b_can_stream_record = false;
var_SetBool( p_input, "can-record", true );
#else
if( !demux_Control( in->p_demux, DEMUX_GET_ATTACHMENTS,
&attachment, &i_attachment ) )
{
- vlc_mutex_lock( &p_input->p->input.p_item->lock );
+ vlc_mutex_lock( &p_input->p->p_item->lock );
AppendAttachment( &p_input->p->i_attachment, &p_input->p->attachment,
i_attachment, attachment );
- vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ vlc_mutex_unlock( &p_input->p->p_item->lock );
}
}
- if( !demux_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) )
+ if( !demux_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) && f_fps > 0.0 )
{
- vlc_mutex_lock( &p_input->p->input.p_item->lock );
- in->f_fps = f_fps;
- vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ vlc_mutex_lock( &p_input->p->p_item->lock );
+ p_input->p->f_fps = f_fps;
+ vlc_mutex_unlock( &p_input->p->p_item->lock );
}
if( var_GetInteger( p_input, "clock-synchro" ) != -1 )
return VLC_SUCCESS;
error:
- if( b_master )
- input_ChangeState( p_input, ERROR_S );
-
if( in->p_demux )
demux_Delete( in->p_demux );
}
}
+/*****************************************************************************
+ * InputSourceMeta:
+ *****************************************************************************/
+static void InputSourceMeta( input_thread_t *p_input,
+ input_source_t *p_source, vlc_meta_t *p_meta )
+{
+ access_t *p_access = p_source->p_access;
+ demux_t *p_demux = p_source->p_demux;
+
+ /* XXX Remember that checking against p_item->p_meta->i_status & ITEM_PREPARSED
+ * is a bad idea */
+
+ /* Read access meta */
+ if( p_access )
+ access_Control( p_access, ACCESS_GET_META, p_meta );
+
+ /* Read demux meta */
+ demux_Control( p_demux, DEMUX_GET_META, p_meta );
+
+ /* If the demux report unsupported meta data, try an external "meta reader" */
+ bool b_bool;
+ if( demux_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) )
+ return;
+ if( !b_bool )
+ return;
+
+ demux_meta_t *p_demux_meta = p_demux->p_private = calloc( 1, sizeof(*p_demux_meta) );
+ if( !p_demux_meta )
+ return;
+
+ module_t *p_id3 = module_need( p_demux, "meta reader", NULL, 0 );
+ if( p_id3 )
+ {
+ if( p_demux_meta->p_meta )
+ {
+ vlc_meta_Merge( p_meta, p_demux_meta->p_meta );
+ vlc_meta_Delete( p_demux_meta->p_meta );
+ }
+
+ if( p_demux_meta->i_attachments > 0 )
+ {
+ vlc_mutex_lock( &p_input->p->p_item->lock );
+ AppendAttachment( &p_input->p->i_attachment, &p_input->p->attachment,
+ p_demux_meta->i_attachments, p_demux_meta->attachments );
+ vlc_mutex_unlock( &p_input->p->p_item->lock );
+ }
+ module_unneed( p_demux, p_id3 );
+ }
+ free( p_demux_meta );
+}
+
+
static void SlaveDemux( input_thread_t *p_input )
{
int64_t i_time;
if( i_stime >= i_time )
break;
- if( ( i_ret = in->p_demux->pf_demux( in->p_demux ) ) <= 0 )
+ if( ( i_ret = demux_Demux( in->p_demux ) ) <= 0 )
break;
}
}
else
{
- i_ret = in->p_demux->pf_demux( in->p_demux );
+ i_ret = demux_Demux( in->p_demux );
}
if( i_ret <= 0 )
int64_t i_time;
int i;
- if( !p_input ) return;
-
if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
{
msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
{
vlc_value_t val;
- if( !p_meta ) return;
-
/* Get meta information from user */
-#define GET_META( field, s ) \
+#define GET_META( field, s ) do { \
var_Get( p_input, (s), &val ); \
- if( *val.psz_string ) \
+ if( val.psz_string && *val.psz_string ) \
vlc_meta_Set( p_meta, vlc_meta_ ## field, val.psz_string ); \
- free( val.psz_string )
+ free( val.psz_string ); } while(0)
GET_META( Title, "meta-title" );
GET_META( Artist, "meta-artist" );
*****************************************************************************/
static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta )
{
- input_item_t *p_item = p_input->p->input.p_item;
- char * psz_arturl = NULL;
- char *psz_title = NULL;
+ input_item_t *p_item = p_input->p->p_item;
- if( !p_meta )
- return;
-
- psz_arturl = input_item_GetArtURL( p_item );
+ char *psz_title = NULL;
+ char *psz_arturl = input_item_GetArtURL( p_item );
vlc_mutex_lock( &p_item->lock );
*pi_attachment = i_attachment;
*ppp_attachment = attachment;
}
-
-static void InputSourceMeta( input_thread_t *p_input,
- input_source_t *p_source, vlc_meta_t *p_meta )
-{
- access_t *p_access = p_source->p_access;
- demux_t *p_demux = p_source->p_demux;
-
- /* XXX Remember that checking against p_item->p_meta->i_status & ITEM_PREPARSED
- * is a bad idea */
-
- /* Read access meta */
- if( p_access )
- access_Control( p_access, ACCESS_GET_META, p_meta );
-
- /* Read demux meta */
- demux_Control( p_demux, DEMUX_GET_META, p_meta );
-
- /* If the demux report unsupported meta data, try an external "meta reader" */
- bool b_bool;
- if( demux_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) )
- return;
- if( !b_bool )
- return;
-
- demux_meta_t *p_demux_meta = p_demux->p_private = calloc( 1, sizeof(*p_demux_meta) );
- if( !p_demux_meta )
- return;
-
- module_t *p_id3 = module_need( p_demux, "meta reader", NULL, 0 );
- if( p_id3 )
- {
- if( p_demux_meta->p_meta )
- {
- vlc_meta_Merge( p_meta, p_demux_meta->p_meta );
- vlc_meta_Delete( p_demux_meta->p_meta );
- }
-
- if( p_demux_meta->i_attachments > 0 )
- {
- vlc_mutex_lock( &p_input->p->input.p_item->lock );
- AppendAttachment( &p_input->p->i_attachment, &p_input->p->attachment,
- p_demux_meta->i_attachments, p_demux_meta->attachments );
- vlc_mutex_unlock( &p_input->p->input.p_item->lock );
- }
- module_unneed( p_demux, p_id3 );
- }
- free( p_demux_meta );
-}
-
/*****************************************************************************
* InputGetExtraFiles
* Autodetect extra input list
if( b_changed )
{
- input_item_SetErrorWhenReading( p_input->p->input.p_item, p_input->b_error );
+ input_item_SetErrorWhenReading( p_input->p->p_item, p_input->b_error );
input_SendEventState( p_input, i_state );
}
}
var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL );
sub = InputSourceNew( p_input );
- if( InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) )
+ if( !sub || InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) )
{
free( sub );
return;
}
}
-bool input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle,
- bool b_check_extension )
-{
- vlc_value_t val;
-
- if( b_check_extension && !subtitles_Filter( psz_subtitle ) )
- return false;
-
- assert( psz_subtitle != NULL );
-
- val.psz_string = strdup( psz_subtitle );
- if( val.psz_string )
- input_ControlPush( p_input, INPUT_CONTROL_ADD_SUBTITLE, &val );
- return true;
-}
-
/*****************************************************************************
* Statistics
*****************************************************************************/
vlc_mutex_unlock( &p_input->p->counters.counters_lock);
}
/*****************************************************************************
- * input_get_event_manager
+ * input_GetEventManager
*****************************************************************************/
-vlc_event_manager_t *input_get_event_manager( input_thread_t *p_input )
+vlc_event_manager_t *input_GetEventManager( input_thread_t *p_input )
{
return &p_input->p->event_manager;
}
projects / vlc / blobdiff