#include <assert.h>
#include "input_internal.h"
+#include "event.h"
+#include "es_out.h"
+#include "es_out_timeshift.h"
+#include "access.h"
+#include "demux.h"
+#include "stream.h"
#include <vlc_sout.h>
#include "../stream_output/stream_output.h"
*****************************************************************************/
static void Destructor( input_thread_t * p_input );
-static void* Run ( vlc_object_t *p_this );
-static void* RunAndDestroy ( vlc_object_t *p_this );
+static void *Run ( vlc_object_t *p_this );
+static void *RunAndDestroy ( vlc_object_t *p_this );
static input_thread_t * Create ( vlc_object_t *, input_item_t *,
const char *, bool, sout_instance_t * );
static void End ( input_thread_t *p_input );
static void MainLoop( input_thread_t *p_input );
-static inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t * );
+static inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t *, mtime_t i_deadline );
static void ControlReduce( input_thread_t * );
static bool Control( input_thread_t *, int, vlc_value_t );
static int UpdateFromAccess( input_thread_t * );
static int UpdateFromDemux( input_thread_t * );
-static void UpdateItemLength( input_thread_t *, int64_t i_length );
-
static void MRLSections( input_thread_t *, char *, int *, int *, int *, int *);
static input_source_t *InputSourceNew( input_thread_t *);
static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta );
static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta );
+static char *InputGetExtraFiles( input_thread_t *p_input,
+ const char *psz_access, const char *psz_path );
static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_demux );
static void AccessMeta( input_thread_t * p_input, vlc_meta_t *p_meta );
static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment,
int i_new, input_attachment_t **pp_new );
+static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_forced );
+
+static void input_ChangeState( input_thread_t *p_input, int i_state ); /* TODO fix name */
+
/*****************************************************************************
* This function creates a new input, and returns a pointer
* to its description. On error, it returns NULL.
*
- * Variables for _public_ use:
- * * Get and Set:
- * - state
- * - rate,rate-slower, rate-faster
- * - position, position-offset
- * - time, time-offset
- * - title,title-next,title-prev
- * - chapter,chapter-next, chapter-prev
- * - program, audio-es, video-es, spu-es
- * - audio-delay, spu-delay
- * - bookmark
- * * Get only:
- * - length
- * - bookmarks
- * - seekable (if you can seek, it doesn't say if 'bar display' has be shown
- * or not, for that check position != 0.0)
- * - can-pause
- * - can-record (if a stream can be recorded while playing)
- * - teletext-es to get the index of spu track that is teletext --1 if no teletext)
- * * For intf callback upon changes
- * - intf-change
- * - rate-change for when playback rate changes
- * TODO explain when Callback is called
- * TODO complete this list (?)
+ * XXX Do not forget to update vlc_input.h if you add new variables.
*****************************************************************************/
static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
const char *psz_header, bool b_quick,
stats_TimerStart( p_input, psz_timer_name,
STATS_TIMER_INPUT_LAUNCHING );
- MALLOC_NULL( p_input->p, input_thread_private_t );
- memset( p_input->p, 0, sizeof( input_thread_private_t ) );
+ p_input->p = calloc( 1, sizeof( input_thread_private_t ) );
+ if( !p_input->p )
+ return NULL;
/* One "randomly" selected input thread is responsible for computing
* the global stats. Check if there is already someone doing this */
if( p_input->p_libvlc->p_stats && !b_quick )
{
- libvlc_priv_t *priv = libvlc_priv (p_input->p_libvlc);
+ libvlc_priv_t *p_private = libvlc_priv( p_input->p_libvlc );
vlc_mutex_lock( &p_input->p_libvlc->p_stats->lock );
- if( priv->p_stats_computer == NULL )
- priv->p_stats_computer = p_input;
+ if( p_private->p_stats_computer == NULL )
+ p_private->p_stats_computer = p_input;
vlc_mutex_unlock( &p_input->p_libvlc->p_stats->lock );
}
p_input->b_eof = false;
p_input->b_can_pace_control = true;
p_input->p->i_start = 0;
- p_input->i_time = 0;
+ p_input->i_time = 0;
p_input->p->i_stop = 0;
- p_input->p->i_run = 0;
+ p_input->p->i_run = 0;
p_input->p->i_title = 0;
- p_input->p->title = NULL;
+ p_input->p->title = NULL;
p_input->p->i_title_offset = p_input->p->i_seekpoint_offset = 0;
p_input->i_state = INIT_S;
- p_input->p->i_rate = INPUT_RATE_DEFAULT;
+ p_input->p->i_rate = INPUT_RATE_DEFAULT;
p_input->p->b_recording = false;
TAB_INIT( p_input->p->i_bookmark, p_input->p->bookmark );
TAB_INIT( p_input->p->i_attachment, p_input->p->attachment );
+ p_input->p->p_es_out_display = NULL;
p_input->p->p_es_out = NULL;
- p_input->p->p_sout = NULL;
+ p_input->p->p_sout = NULL;
p_input->p->b_out_pace_control = false;
p_input->i_pts_delay = 0;
p_input->p->input.b_rescale_ts = true;
p_input->p->input.b_eof = false;
p_input->p->input.i_cr_average = 0;
+ memset( &p_input->p->input_last_times, 0, sizeof(p_input->p->input_last_times) );
vlc_mutex_lock( &p_item->lock );
/* Init control buffer */
vlc_mutex_init( &p_input->p->lock_control );
+ vlc_cond_init( &p_input->p->wait_control );
p_input->p->i_control = 0;
/* Parse input options */
input_ControlVarInit( p_input );
/* */
- p_input->p->pts_adjust.b_auto_adjust = var_GetBool( p_input, "auto-adjust-pts-delay" );
p_input->p->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
if( !p_input->b_preparsing )
psz_parser = val.psz_string;
while( (psz_start = strchr( psz_parser, '{' ) ) )
{
- seekpoint_t *p_seekpoint = vlc_seekpoint_New();
+ seekpoint_t *p_seekpoint;
char backup;
psz_start++;
psz_end = strchr( psz_start, '}' );
backup = *psz_parser;
*psz_parser = 0;
*psz_end = ',';
+
+ p_seekpoint = vlc_seekpoint_New();
while( (psz_end = strchr( psz_start, ',' ) ) )
{
*psz_end = 0;
/* Remove 'Now playing' info as it is probably outdated */
input_item_SetNowPlaying( p_item, NULL );
+ input_SendEventMeta( p_input );
/* */
if( p_input->b_preparsing )
*/
static void Destructor( input_thread_t * p_input )
{
- input_thread_private_t *priv = p_input->p;
-
#ifndef NDEBUG
char * psz_name = input_item_GetName( p_input->p->input.p_item );
msg_Dbg( p_input, "Destroying the input for '%s'", psz_name);
stats_TimerDump( p_input, STATS_TIMER_INPUT_LAUNCHING );
stats_TimerClean( p_input, STATS_TIMER_INPUT_LAUNCHING );
#ifdef ENABLE_SOUT
- if( priv->p_sout )
- sout_DeleteInstance( priv->p_sout );
+ if( p_input->p->p_sout )
+ sout_DeleteInstance( p_input->p->p_sout );
#endif
vlc_gc_decref( p_input->p->input.p_item );
vlc_mutex_destroy( &p_input->p->counters.counters_lock );
- vlc_mutex_destroy( &priv->lock_control );
- free( priv );
+ vlc_cond_destroy( &p_input->p->wait_control );
+ vlc_mutex_destroy( &p_input->p->lock_control );
+ free( p_input->p );
}
/**
/* Create thread and wait for its readiness. */
if( vlc_thread_create( p_input, "input", Run,
- VLC_THREAD_PRIORITY_INPUT, true ) )
+ VLC_THREAD_PRIORITY_INPUT, false ) )
{
input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
* \param p_parent a vlc_object
* \param p_item an input item
* \param b_block should we block until read is finished ?
- * \return the input object id if non blocking, an error code else
+ * \return an error code, VLC_SUCCESS on success
*/
int __input_Read( vlc_object_t *p_parent, input_item_t *p_item,
bool b_block )
else
{
if( vlc_thread_create( p_input, "input", RunAndDestroy,
- VLC_THREAD_PRIORITY_INPUT, true ) )
+ VLC_THREAD_PRIORITY_INPUT, false ) )
{
input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
return VLC_EGENERIC;
}
}
- return p_input->i_object_id;
+ return VLC_SUCCESS;
}
/**
input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
}
-sout_instance_t * input_DetachSout( input_thread_t *p_input )
+sout_instance_t *input_DetachSout( input_thread_t *p_input )
{
+ assert( p_input->b_dead );
sout_instance_t *p_sout = p_input->p->p_sout;
vlc_object_detach( p_sout );
p_input->p->p_sout = NULL;
* This is the "normal" thread that spawns the input processing chain,
* reads the stream, cleans up and waits
*****************************************************************************/
-static void* Run( vlc_object_t *p_this )
+static void *Run( vlc_object_t *p_this )
{
input_thread_t *p_input = (input_thread_t *)p_this;
- /* Signal that the thread is launched */
- vlc_thread_ready( p_input );
+ const int canc = vlc_savecancel();
if( Init( p_input ) )
{
/* If we failed, wait before we are killed, and exit */
- p_input->b_error = true;
-
WaitDie( p_input );
-
- /* Tell we're dead */
- p_input->b_dead = true;
-
- return NULL;
+ goto exit;
}
MainLoop( p_input );
- if( !p_input->b_eof && !p_input->b_error && p_input->p->input.b_eof )
- {
- /* We have finish to demux data but not to play them */
- while( !p_input->b_die )
- {
- if( input_EsOutDecodersEmpty( p_input->p->p_es_out ) )
- break;
-
- msg_Dbg( p_input, "waiting decoder fifos to empty" );
-
- msleep( INPUT_IDLE_SLEEP );
- }
-
- /* We have finished */
- p_input->b_eof = true;
- input_ChangeState( p_input, END_S );
- }
-
/* Wait until we are asked to die */
if( !p_input->b_die )
- {
WaitDie( p_input );
- }
/* Clean up */
End( p_input );
+exit:
+ p_input->b_dead = true;
+ vlc_restorecancel( canc );
return NULL;
}
* This is the "just forget me" thread that spawns the input processing chain,
* reads the stream, cleans up and releases memory
*****************************************************************************/
-static void* RunAndDestroy( vlc_object_t *p_this )
+static void *RunAndDestroy( vlc_object_t *p_this )
{
input_thread_t *p_input = (input_thread_t *)p_this;
- /* Signal that the thread is launched */
- vlc_thread_ready( p_input );
+ const int canc = vlc_savecancel();
if( Init( p_input ) )
goto exit;
MainLoop( p_input );
- if( !p_input->b_eof && !p_input->b_error && p_input->p->input.b_eof )
- {
- /* We have finished demuxing data but not playing it */
- while( !p_input->b_die )
- {
- if( input_EsOutDecodersEmpty( p_input->p->p_es_out ) )
- break;
-
- msg_Dbg( p_input, "waiting decoder fifos to empty" );
-
- msleep( INPUT_IDLE_SLEEP );
- }
-
- /* We have finished */
- p_input->b_eof = true;
- }
-
/* Clean up */
End( p_input );
exit:
/* Release memory */
vlc_object_release( p_input );
- return 0;
+ vlc_restorecancel( canc );
+ return NULL;
}
/*****************************************************************************
* Main loop: Fill buffers from access, and demux
*****************************************************************************/
-static void MainLoop( input_thread_t *p_input )
+
+/**
+ * MainLoopDemux
+ * It asks the demuxer to demux some data
+ */
+static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed, mtime_t *pi_start_mdate )
{
- int64_t i_start_mdate = mdate();
- int64_t i_intf_update = 0;
- int i_updates = 0;
+ int i_ret;
- /* Stop the timer */
- stats_TimerStop( p_input, STATS_TIMER_INPUT_LAUNCHING );
+ *pb_changed = false;
- while( !p_input->b_die && !p_input->b_error && !p_input->p->input.b_eof )
+ if( ( p_input->p->i_stop > 0 && p_input->i_time >= p_input->p->i_stop ) ||
+ ( 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);
+
+ if( i_ret > 0 )
{
- bool b_force_update = false;
- int i_ret;
- int i_type;
- vlc_value_t val;
+ /* TODO */
+ if( p_input->p->input.b_title_demux &&
+ p_input->p->input.p_demux->info.i_update )
+ {
+ i_ret = UpdateFromDemux( p_input );
+ *pb_changed = true;
+ }
+ 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 );
+ *pb_changed = true;
+ }
+ }
+
+ if( i_ret == 0 ) /* EOF */
+ {
+ vlc_value_t repeat;
- /* Do the read */
- if( p_input->i_state != PAUSE_S )
+ var_Get( p_input, "input-repeat", &repeat );
+ if( repeat.i_int == 0 )
{
- if( ( p_input->p->i_stop > 0 && p_input->i_time >= p_input->p->i_stop ) ||
- ( p_input->p->i_run > 0 && i_start_mdate+p_input->p->i_run < mdate() ) )
- i_ret = 0; /* EOF */
- else
- i_ret = p_input->p->input.p_demux->pf_demux(p_input->p->input.p_demux);
+ /* End of file - we do not set b_die because only the
+ * playlist is allowed to do so. */
+ msg_Dbg( p_input, "EOF reached" );
+ p_input->p->input.b_eof = true;
+ }
+ else
+ {
+ vlc_value_t val;
- if( i_ret > 0 )
+ msg_Dbg( p_input, "repeating the same input (%d)",
+ repeat.i_int );
+ if( repeat.i_int > 0 )
{
- /* TODO */
- 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 = true;
- }
- 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 = true;
- }
+ repeat.i_int--;
+ var_Set( p_input, "input-repeat", repeat );
}
- if( i_ret == 0 ) /* EOF */
+ /* Seek to start title/seekpoint */
+ 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->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->p->i_start > 0 )
+ {
+ val.i_time = p_input->p->i_start;
+ input_ControlPush( p_input, INPUT_CONTROL_SET_TIME,
+ &val );
+ }
+ else
{
- vlc_value_t repeat;
+ val.f_float = 0.0;
+ input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION,
+ &val );
+ }
- var_Get( p_input, "input-repeat", &repeat );
- if( repeat.i_int == 0 )
- {
- /* End of file - we do not set b_die because only the
- * playlist is allowed to do so. */
- msg_Dbg( p_input, "EOF reached" );
- p_input->p->input.b_eof = true;
- }
- else
- {
- msg_Dbg( p_input, "repeating the same input (%d)",
- repeat.i_int );
- if( repeat.i_int > 0 )
- {
- repeat.i_int--;
- var_Set( p_input, "input-repeat", repeat );
- }
+ /* */
+ *pi_start_mdate = mdate();
+ }
+ }
+ else if( i_ret < 0 )
+ {
+ input_ChangeState( p_input, ERROR_S );
+ }
- /* Seek to start title/seekpoint */
- 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->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->p->i_start > 0 )
- {
- val.i_time = p_input->p->i_start;
- input_ControlPush( p_input, INPUT_CONTROL_SET_TIME,
- &val );
- }
- else
- {
- val.f_float = 0.0;
- input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION,
- &val );
- }
+ if( i_ret > 0 && p_input->p->i_slave > 0 )
+ {
+ SlaveDemux( p_input );
+ }
+}
- /* */
- i_start_mdate = mdate();
- }
+/**
+ * MainLoopInterface
+ * It update the variables used by the interfaces
+ */
+static void MainLoopInterface( input_thread_t *p_input )
+{
+ input_event_times_t ev;
+ mtime_t i_es_out_delay;
+
+ es_out_GetBuffering( p_input->p->p_es_out, &i_es_out_delay );
+
+ ev.f_position = 0.0;
+ ev.i_time = 0;
+ ev.i_length = 0;
+
+ /* update input status variables */
+ if( demux_Control( p_input->p->input.p_demux,
+ DEMUX_GET_POSITION, &ev.f_position ) )
+ ev.f_position = 0.0;
+
+ if( demux_Control( p_input->p->input.p_demux,
+ DEMUX_GET_TIME, &ev.i_time ) )
+ ev.i_time = 0;
+
+ if( demux_Control( p_input->p->input.p_demux,
+ DEMUX_GET_LENGTH, &ev.i_length ) )
+ ev.i_length = 0;
+
+ if( ev.i_time > 0 )
+ {
+ ev.i_time -= i_es_out_delay;
+ if( ev.i_time < 0 )
+ ev.i_time = 0;
+ }
+ if( ev.i_length > 0 )
+ {
+ ev.f_position -= (double)i_es_out_delay / ev.i_length;
+ }
+
+ if( p_input->i_state == PAUSE_S )
+ {
+ input_event_times_t old = p_input->p->input_last_times;
+
+ /* XXX We have a jitter because of PCR frequency/get time precision.
+ * Hides it */
+ if( llabs(ev.i_time - old.i_time) < CLOCK_FREQ )
+ ev.i_time = old.i_time;
+ }
+
+ p_input->p->input_last_times = ev;
+
+ input_SendEventTimes( p_input, &ev );
+}
+
+/**
+ * MainLoopStatistic
+ * It updates the globals statics
+ */
+static void MainLoopStatistic( input_thread_t *p_input )
+{
+ stats_ComputeInputStats( p_input, p_input->p->input.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 )
+ {
+ stats_ComputeGlobalStats( p_input->p_libvlc,
+ p_input->p_libvlc->p_stats );
+ }
+ input_SendEventStatistics( p_input );
+}
+
+/**
+ * MainLoop
+ * The main input loop.
+ */
+static void MainLoop( input_thread_t *p_input )
+{
+ mtime_t i_start_mdate = mdate();
+ mtime_t i_intf_update = 0;
+ mtime_t i_statistic_update = 0;
+
+ /* Start the timer */
+ stats_TimerStop( p_input, STATS_TIMER_INPUT_LAUNCHING );
+
+ while( vlc_object_alive( p_input ) && !p_input->b_error )
+ {
+ bool b_force_update;
+ int i_type;
+ vlc_value_t val;
+ mtime_t i_current;
+ mtime_t i_deadline;
+ mtime_t i_wakeup;
+ bool b_paused;
+
+ /* Demux data */
+ b_force_update = false;
+ i_wakeup = 0;
+ /* FIXME if p_input->i_state == PAUSE_S the access/access_demux
+ * is paused -> this may cause problem with some of them
+ * The same problem can be seen when seeking while paused */
+ b_paused = p_input->i_state == PAUSE_S &&
+ !es_out_GetBuffering( p_input->p->p_es_out, NULL );
+
+ if( !b_paused )
+ {
+ if( !p_input->p->input.b_eof )
+ {
+ MainLoopDemux( p_input, &b_force_update, &i_start_mdate );
+
+ i_wakeup = es_out_GetWakeup( p_input->p->p_es_out );
}
- else if( i_ret < 0 )
+ else if( !p_input->b_eof && !es_out_GetEmpty( p_input->p->p_es_out ) )
{
- p_input->b_error = true;
+ msg_Dbg( p_input, "waiting decoder fifos to empty" );
+ i_wakeup = mdate() + INPUT_IDLE_SLEEP;
}
-
- if( i_ret > 0 && p_input->p->i_slave > 0 )
+ else
{
- SlaveDemux( p_input );
+ break;
}
}
- else
- {
- /* Small wait */
- msleep( 10*1000 );
- }
- /* Handle control */
- vlc_mutex_lock( &p_input->p->lock_control );
- ControlReduce( p_input );
- while( !ControlPopNoLock( p_input, &i_type, &val ) )
- {
- msg_Dbg( p_input, "control type=%d", i_type );
- if( Control( p_input, i_type, val ) )
- b_force_update = true;
- }
- vlc_mutex_unlock( &p_input->p->lock_control );
-
- if( b_force_update || i_intf_update < mdate() )
- {
- vlc_value_t val;
- double f_pos;
- int64_t i_time, i_length;
- /* update input status variables */
- if( !demux_Control( p_input->p->input.p_demux,
- DEMUX_GET_POSITION, &f_pos ) )
+ /* */
+ do {
+ i_deadline = i_wakeup;
+ if( b_paused )
+ i_deadline = __MIN( i_intf_update, i_statistic_update );
+
+ /* Handle control */
+ vlc_mutex_lock( &p_input->p->lock_control );
+ ControlReduce( p_input );
+ while( !ControlPopNoLock( p_input, &i_type, &val, i_deadline ) )
{
- val.f_float = (float)f_pos;
- var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
+ msg_Dbg( p_input, "control type=%d", i_type );
+
+ if( Control( p_input, i_type, val ) )
+ b_force_update = true;
}
- if( !demux_Control( p_input->p->input.p_demux,
- DEMUX_GET_TIME, &i_time ) )
+ vlc_mutex_unlock( &p_input->p->lock_control );
+
+ /* Update interface and statistics */
+ i_current = mdate();
+ if( i_intf_update < i_current || b_force_update )
{
- p_input->i_time = i_time;
- val.i_time = i_time;
- var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
+ MainLoopInterface( p_input );
+ i_intf_update = i_current + INT64_C(250000);
+ b_force_update = false;
}
- if( !demux_Control( p_input->p->input.p_demux,
- DEMUX_GET_LENGTH, &i_length ) )
+ if( i_statistic_update < i_current )
{
- vlc_value_t old_val;
- var_Get( p_input, "length", &old_val );
- val.i_time = i_length;
- var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
-
- if( old_val.i_time != val.i_time )
- {
- UpdateItemLength( p_input, i_length );
- }
+ MainLoopStatistic( p_input );
+ i_statistic_update = i_current + INT64_C(1000000);
}
- var_SetBool( p_input, "intf-change", true );
- i_intf_update = mdate() + INT64_C(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( libvlc_priv (p_input->p_libvlc)->p_stats_computer == p_input )
+ /* Check if i_wakeup is still valid */
+ if( i_wakeup != 0 )
{
- stats_ComputeGlobalStats( p_input->p_libvlc,
- p_input->p_libvlc->p_stats );
+ mtime_t i_new_wakeup = es_out_GetWakeup( p_input->p->p_es_out );
+ if( !i_new_wakeup )
+ i_wakeup = 0;
}
- }
+ } while( i_current < i_wakeup );
}
+
+ if( !p_input->b_error )
+ input_ChangeState( p_input, END_S );
}
static void InitStatistics( input_thread_t * p_input )
/* Prepare statistics */
#define INIT_COUNTER( c, type, compute ) p_input->p->counters.p_##c = \
stats_CounterCreate( p_input, VLC_VAR_##type, STATS_##compute);
- if( libvlc_stats (p_input) )
+ if( libvlc_stats( p_input ) )
{
INIT_COUNTER( read_bytes, INTEGER, COUNTER );
INIT_COUNTER( read_packets, INTEGER, COUNTER );
return VLC_EGENERIC;
}
}
- if( libvlc_stats (p_input) )
+ if( libvlc_stats( p_input ) )
{
INIT_COUNTER( sout_sent_packets, INTEGER, COUNTER );
- INIT_COUNTER (sout_sent_bytes, 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 =
/* 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);
+ if( val.i_int < 0 )
+ p_input->i_pts_delay -= (val.i_int * 1000);
/* Update cr_average depending on the caching */
p_input->p->input.i_cr_average *= (10 * p_input->i_pts_delay / 200000);
{
double f_fps;
vlc_value_t val;
- int i, i_delay;
+ int i_delay;
char *psz;
char *psz_subtitle;
int64_t i_length;
if( psz_subtitle != NULL )
{
msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle );
- input_AddSubtitles( p_input, psz_subtitle, false );
+ SubtitleAdd( p_input, psz_subtitle, true );
}
var_Get( p_input, "sub-autodetect-file", &val );
if( val.b_bool )
{
char *psz_autopath = var_GetNonEmptyString( p_input, "sub-autodetect-path" );
- char **subs = subtitles_Detect( p_input, psz_autopath,
- p_input->p->input.p_item->psz_uri );
- input_source_t *sub;
- i = 0;
- if( psz_autopath == NULL )
- psz_autopath = strdup("");
-
- /* Try to autoselect the first autodetected subtitles file
- * if no subtitles file was specified */
- if( ( psz_subtitle == NULL ) && subs && subs[0] )
- {
- input_AddSubtitles( p_input, subs[0], false );
- free( subs[0] );
- i = 1;
- }
+ char **ppsz_subs = subtitles_Detect( p_input, psz_autopath,
+ p_input->p->input.p_item->psz_uri );
+ free( psz_autopath );
- /* Then, just add the following subtitles files */
- for( ; subs && subs[i]; i++ )
+ for( int i = 0; ppsz_subs && ppsz_subs[i]; i++ )
{
- if( !psz_subtitle || strcmp( psz_subtitle, subs[i] ) )
- {
- sub = InputSourceNew( p_input );
- if( !InputSourceInit( p_input, sub, subs[i], "subtitle" ) )
- {
- TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub );
- }
- else free( sub );
- }
- free( subs[i] );
+ /* Try to autoselect the first autodetected subtitles file
+ * if no subtitles file was specified */
+ bool b_forced = i == 0 && !psz_subtitle;
+
+ if( !psz_subtitle || strcmp( psz_subtitle, ppsz_subs[i] ) )
+ SubtitleAdd( p_input, ppsz_subs[i], b_forced );
+
+ free( ppsz_subs[i] );
}
- free( subs );
- free( psz_autopath );
+ free( ppsz_subs );
}
free( psz_subtitle );
if( p_input->p->p_sout )
{
var_Get( p_input, "sout-all", &val );
- if ( val.b_bool )
+ if( val.b_bool )
{
i_es_out_mode = ES_OUT_MODE_ALL;
val.p_list = NULL;
else
{
var_Get( p_input, "programs", &val );
- if ( val.p_list && val.p_list->i_count )
+ if( val.p_list && val.p_list->i_count )
{
i_es_out_mode = ES_OUT_MODE_PARTIAL;
/* Note : we should remove the "program" callback. */
}
else
+ {
var_Change( p_input, "programs", VLC_VAR_FREELIST, &val,
NULL );
+ }
}
}
es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, i_es_out_mode );
static int Init( input_thread_t * p_input )
{
vlc_meta_t *p_meta;
- vlc_value_t val;
int i, ret;
for( i = 0; i < p_input->p->input.p_item->i_options; i++ )
#endif
/* Create es out */
- p_input->p->p_es_out = input_EsOutNew( p_input, p_input->p->i_rate );
+ p_input->p->p_es_out_display = input_EsOutNew( p_input, p_input->p->i_rate );
+ p_input->p->p_es_out = input_EsOutTimeshiftNew( p_input, p_input->p->p_es_out_display, p_input->p->i_rate );
es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, false );
es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE );
/* Load master infos */
/* Init length */
- if( !demux_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 );
- }
- else
- {
- val.i_time = input_item_GetDuration( p_input->p->input.p_item );
- if( val.i_time > 0 )
- { /* fallback: gets length from metadata */
- var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
- UpdateItemLength( p_input, val.i_time );
- }
- }
+ input_event_times_t ev_times;
+ ev_times.f_position = 0;
+ ev_times.i_time = 0;
+ if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_LENGTH,
+ &ev_times.i_length ) )
+ ev_times.i_length = 0;
+ if( ev_times.i_length <= 0 )
+ ev_times.i_length = input_item_GetDuration( p_input->p->input.p_item );
+ input_SendEventTimes( p_input, &ev_times );
StartTitle( p_input );
input_ChangeState( p_input, ERROR_S );
if( p_input->p->p_es_out )
- input_EsOutDelete( p_input->p->p_es_out );
+ es_out_Delete( p_input->p->p_es_out );
+ if( p_input->p->p_es_out_display )
+ es_out_Delete( p_input->p->p_es_out_display );
#ifdef ENABLE_SOUT
if( p_input->p->p_sout )
{
}
#endif
- if( !p_input->b_preparsing && libvlc_stats (p_input) )
+ if( !p_input->b_preparsing && libvlc_stats( p_input ) )
{
#define EXIT_COUNTER( c ) do { if( p_input->p->counters.p_##c ) \
stats_CounterClean( p_input->p->counters.p_##c );\
if( p_input->p->p_sout )
{
EXIT_COUNTER( sout_sent_packets );
- EXIT_COUNTER (sout_sent_bytes );
+ EXIT_COUNTER( sout_sent_bytes );
EXIT_COUNTER( sout_send_bitrate );
}
#undef EXIT_COUNTER
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_es_out_display = NULL;
p_input->p->p_sout = NULL;
return VLC_EGENERIC;
static void WaitDie( input_thread_t *p_input )
{
input_ChangeState( p_input, p_input->b_error ? ERROR_S : END_S );
- while( !p_input->b_die )
- {
- /* Sleep a while */
- msleep( INPUT_IDLE_SLEEP );
- }
+
+ /* Wait a die order */
+ vlc_object_lock( p_input );
+ while( vlc_object_alive( p_input ) )
+ vlc_object_wait( p_input );
+ vlc_object_unlock( p_input );
}
/*****************************************************************************
/* Unload all modules */
if( p_input->p->p_es_out )
- input_EsOutDelete( p_input->p->p_es_out );
+ es_out_Delete( p_input->p->p_es_out );
+ if( p_input->p->p_es_out_display )
+ es_out_Delete( p_input->p->p_es_out_display );
if( !p_input->b_preparsing )
{
#define CL_CO( c ) stats_CounterClean( p_input->p->counters.p_##c ); p_input->p->counters.p_##c = NULL;
- if( libvlc_stats (p_input) )
+ if( libvlc_stats( p_input ) )
{
- libvlc_priv_t *priv = libvlc_priv (p_input->p_libvlc);
+ 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 );
- if( priv->p_stats_computer == p_input )
+ if( p_private->p_stats_computer == p_input )
{
stats_ComputeGlobalStats( p_input->p_libvlc,
p_input->p_libvlc->p_stats );
- priv->p_stats_computer = NULL;
+ p_private->p_stats_computer = NULL;
}
CL_CO( read_bytes );
CL_CO( read_packets );
/*****************************************************************************
* Control
*****************************************************************************/
+void input_ControlPush( input_thread_t *p_input,
+ int i_type, vlc_value_t *p_val )
+{
+ vlc_mutex_lock( &p_input->p->lock_control );
+ if( i_type == INPUT_CONTROL_SET_DIE )
+ {
+ /* Special case, empty the control */
+ p_input->p->i_control = 1;
+ p_input->p->control[0].i_type = i_type;
+ memset( &p_input->p->control[0].val, 0, sizeof( vlc_value_t ) );
+ }
+ else if( p_input->p->i_control >= INPUT_CONTROL_FIFO_SIZE )
+ {
+ msg_Err( p_input, "input control fifo overflow, trashing type=%d",
+ i_type );
+ }
+ else
+ {
+ p_input->p->control[p_input->p->i_control].i_type = i_type;
+ if( p_val )
+ p_input->p->control[p_input->p->i_control].val = *p_val;
+ else
+ memset( &p_input->p->control[p_input->p->i_control].val, 0,
+ sizeof( vlc_value_t ) );
+
+ p_input->p->i_control++;
+ }
+ vlc_cond_signal( &p_input->p->wait_control );
+ vlc_mutex_unlock( &p_input->p->lock_control );
+}
+
static inline int ControlPopNoLock( input_thread_t *p_input,
- int *pi_type, vlc_value_t *p_val )
+ int *pi_type, vlc_value_t *p_val,
+ mtime_t i_deadline )
{
- if( p_input->p->i_control <= 0 )
+
+ while( p_input->p->i_control <= 0 )
{
- return VLC_EGENERIC;
+ if( !vlc_object_alive( p_input ) )
+ return VLC_EGENERIC;
+
+ if( i_deadline < 0 )
+ return VLC_EGENERIC;
+
+ if( vlc_cond_timedwait( &p_input->p->wait_control, &p_input->p->lock_control, i_deadline ) )
+ return VLC_EGENERIC;
}
*pi_type = p_input->p->control[0].i_type;
}
}
}
+/* Pause input */
+static void ControlPause( input_thread_t *p_input, mtime_t i_control_date )
+{
+ int i_ret = VLC_SUCCESS;
+ int i_state = PAUSE_S;
+
+ if( p_input->p->b_can_pause )
+ {
+ if( p_input->p->input.p_access )
+ i_ret = access_Control( p_input->p->input.p_access,
+ ACCESS_SET_PAUSE_STATE, true );
+ else
+ i_ret = demux_Control( p_input->p->input.p_demux,
+ DEMUX_SET_PAUSE_STATE, true );
+
+ if( i_ret )
+ {
+ msg_Warn( p_input, "cannot set pause state" );
+ i_state = p_input->i_state;
+ }
+ }
+
+ /* */
+ if( !i_ret )
+ {
+ i_ret = es_out_SetPauseState( p_input->p->p_es_out, p_input->p->b_can_pause, true, i_control_date );
+ if( i_ret )
+ {
+ msg_Warn( p_input, "cannot set pause state at es_out level" );
+ i_state = p_input->i_state;
+ }
+ }
+
+ /* Switch to new state */
+ input_ChangeState( p_input, i_state );
+
+}
+
+static void ControlUnpause( input_thread_t *p_input, mtime_t i_control_date )
+{
+ int i_ret = VLC_SUCCESS;
+
+ if( p_input->p->b_can_pause )
+ {
+ if( p_input->p->input.p_access )
+ i_ret = access_Control( p_input->p->input.p_access,
+ ACCESS_SET_PAUSE_STATE, false );
+ else
+ i_ret = demux_Control( p_input->p->input.p_demux,
+ DEMUX_SET_PAUSE_STATE, false );
+ if( i_ret )
+ {
+ /* FIXME What to do ? */
+ msg_Warn( p_input, "cannot unset pause -> EOF" );
+ vlc_mutex_unlock( &p_input->p->lock_control );
+ input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
+ vlc_mutex_lock( &p_input->p->lock_control );
+ }
+ }
+
+ /* Switch to play */
+ input_ChangeState( p_input, PLAYING_S );
+
+ /* */
+ if( !i_ret )
+ es_out_SetPauseState( p_input->p->p_es_out, false, false, i_control_date );
+}
static bool Control( input_thread_t *p_input, int i_type,
vlc_value_t val )
{
+ const mtime_t i_control_date = mdate();
+ /* FIXME b_force_update is abused, it should be carefully checked */
bool b_force_update = false;
- if( !p_input ) return b_force_update;
+ if( !p_input )
+ return b_force_update;
switch( i_type )
{
if( f_pos < 0.0 ) f_pos = 0.0;
if( f_pos > 1.0 ) f_pos = 1.0;
/* Reset the decoders states and clock sync (before calling the demuxer */
- input_EsOutChangePosition( p_input->p->p_es_out );
+ es_out_SetTime( p_input->p->p_es_out, -1 );
if( demux_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION,
f_pos ) )
{
{
if( p_input->p->i_slave > 0 )
SlaveSeek( p_input );
+ p_input->p->input.b_eof = false;
b_force_update = true;
}
if( i_time < 0 ) i_time = 0;
/* Reset the decoders states and clock sync (before calling the demuxer */
- input_EsOutChangePosition( p_input->p->p_es_out );
+ es_out_SetTime( p_input->p->p_es_out, -1 );
i_ret = demux_Control( p_input->p->input.p_demux,
DEMUX_SET_TIME, i_time );
{
if( p_input->p->i_slave > 0 )
SlaveSeek( p_input );
+ p_input->p->input.b_eof = false;
b_force_update = true;
}
if( ( val.i_int == PLAYING_S && p_input->i_state == PAUSE_S ) ||
( val.i_int == PAUSE_S && p_input->i_state == PAUSE_S ) )
{
- int i_ret;
- if( p_input->p->input.p_access )
- i_ret = access_Control( p_input->p->input.p_access,
- ACCESS_SET_PAUSE_STATE, false );
- else
- i_ret = demux_Control( p_input->p->input.p_demux,
- DEMUX_SET_PAUSE_STATE, false );
-
- if( i_ret )
- {
- /* FIXME What to do ? */
- msg_Warn( p_input, "cannot unset pause -> EOF" );
- vlc_mutex_unlock( &p_input->p->lock_control );
- input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
- vlc_mutex_lock( &p_input->p->lock_control );
- }
+ ControlUnpause( p_input, i_control_date );
b_force_update = true;
-
- /* Switch to play */
- input_ChangeStateWithVarCallback( p_input, PLAYING_S, false );
-
- /* */
- if( !i_ret )
- input_EsOutChangeState( p_input->p->p_es_out );
}
- else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S &&
- p_input->p->b_can_pause )
+ else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S /* &&
+ p_input->p->b_can_pause */ )
{
- int i_ret, state;
- if( p_input->p->input.p_access )
- i_ret = access_Control( p_input->p->input.p_access,
- ACCESS_SET_PAUSE_STATE, true );
- else
- i_ret = demux_Control( p_input->p->input.p_demux,
- DEMUX_SET_PAUSE_STATE, true );
+ ControlPause( p_input, i_control_date );
b_force_update = true;
-
- if( i_ret )
- {
- msg_Warn( p_input, "cannot set pause state" );
- state = p_input->i_state;
- }
- else
- {
- state = PAUSE_S;
- }
-
- /* Switch to new state */
- input_ChangeStateWithVarCallback( p_input, state, false );
-
- /* */
- if( !i_ret )
- input_EsOutChangeState( p_input->p->p_es_out );
}
- else if( val.i_int == PAUSE_S && !p_input->p->b_can_pause )
+ else if( val.i_int == PAUSE_S && !p_input->p->b_can_pause && 0 )
{
b_force_update = true;
/* Correct "state" value */
- input_ChangeStateWithVarCallback( p_input, p_input->i_state, false );
+ input_ChangeState( p_input, p_input->i_state );
}
else if( val.i_int != PLAYING_S && val.i_int != PAUSE_S )
{
case INPUT_CONTROL_SET_RATE_FASTER:
{
int i_rate;
+ int i_rate_sign;
+ /* Get rate and direction */
if( i_type == INPUT_CONTROL_SET_RATE )
{
- i_rate = val.i_int;
+ i_rate = abs( val.i_int );
+ i_rate_sign = val.i_int < 0 ? -1 : 1;
}
else
{
int i_idx;
int i;
+ i_rate_sign = p_input->p->i_rate < 0 ? -1 : 1;
+
i_error = INT_MAX;
i_idx = -1;
for( i = 0; ppi_factor[i][0] != 0; i++ )
{
const int i_test_r = INPUT_RATE_DEFAULT * ppi_factor[i][0] / ppi_factor[i][1];
- const int i_test_e = abs(p_input->p->i_rate - i_test_r);
+ const int i_test_e = abs( abs( p_input->p->i_rate ) - i_test_r );
if( i_test_e < i_error )
{
i_idx = i;
i_error = i_test_e;
}
}
+
assert( i_idx >= 0 && ppi_factor[i_idx][0] != 0 );
if( i_type == INPUT_CONTROL_SET_RATE_SLOWER )
}
}
+ /* Check rate bound */
if( i_rate < INPUT_RATE_MIN )
{
msg_Dbg( p_input, "cannot set rate faster" );
msg_Dbg( p_input, "cannot set rate slower" );
i_rate = INPUT_RATE_MAX;
}
+
+ /* Apply direction */
+ if( i_rate_sign < 0 )
+ {
+ if( p_input->p->input.b_rescale_ts )
+ {
+ msg_Dbg( p_input, "cannot set negative rate" );
+ i_rate = p_input->p->i_rate;
+ assert( i_rate > 0 );
+ }
+ else
+ {
+ i_rate *= i_rate_sign;
+ }
+ }
+
if( i_rate != INPUT_RATE_DEFAULT &&
- ( ( !p_input->b_can_pace_control && !p_input->p->b_can_rate_control ) ||
+ ( ( !p_input->p->b_can_rate_control && !p_input->p->input.b_rescale_ts ) ||
( p_input->p->p_sout && !p_input->p->b_out_pace_control ) ) )
{
msg_Dbg( p_input, "cannot change rate" );
{
int i_ret;
if( p_input->p->input.p_access )
+ {
i_ret = VLC_EGENERIC;
+ }
else
+ {
+ if( !p_input->p->input.b_rescale_ts )
+ es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
+
i_ret = demux_Control( p_input->p->input.p_demux,
DEMUX_SET_RATE, &i_rate );
+ }
if( i_ret )
{
msg_Warn( p_input, "ACCESS/DEMUX_SET_RATE failed" );
/* */
if( i_rate != p_input->p->i_rate )
{
- val.i_int = i_rate;
- var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
- var_SetBool( p_input, "rate-change", true );
-
- p_input->p->i_rate = i_rate;
+ p_input->p->i_rate = i_rate;
+ input_SendEventRate( p_input, i_rate );
- /* FIXME do we need a RESET_PCR when !p_input->p->input.b_rescale_ts ? */
if( p_input->p->input.b_rescale_ts )
- input_EsOutChangeRate( p_input->p->p_es_out, i_rate );
+ {
+ const int i_rate_source = (p_input->b_can_pace_control || p_input->p->b_can_rate_control ) ? i_rate : INPUT_RATE_DEFAULT;
+ es_out_SetRate( p_input->p->p_es_out, i_rate_source, i_rate );
+ }
b_force_update = true;
}
case INPUT_CONTROL_SET_ES:
/* No need to force update, es_out does it if needed */
- es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ES,
- input_EsOutGetFromID( p_input->p->p_es_out,
- val.i_int ) );
+ es_out_Control( p_input->p->p_es_out_display, ES_OUT_SET_ES_BY_ID, val.i_int );
+ break;
+
+ case INPUT_CONTROL_RESTART_ES:
+ es_out_Control( p_input->p->p_es_out_display, ES_OUT_RESTART_ES_BY_ID, val.i_int );
break;
case INPUT_CONTROL_SET_AUDIO_DELAY:
- input_EsOutSetDelay( p_input->p->p_es_out,
- AUDIO_ES, val.i_time );
- var_Change( p_input, "audio-delay", VLC_VAR_SETVALUE, &val, NULL );
+ if( !es_out_SetDelay( p_input->p->p_es_out_display, AUDIO_ES, val.i_time ) )
+ input_SendEventAudioDelay( p_input, val.i_time );
break;
case INPUT_CONTROL_SET_SPU_DELAY:
- input_EsOutSetDelay( p_input->p->p_es_out,
- SPU_ES, val.i_time );
- var_Change( p_input, "spu-delay", VLC_VAR_SETVALUE, &val, NULL );
+ if( !es_out_SetDelay( p_input->p->p_es_out_display, SPU_ES, val.i_time ) )
+ input_SendEventSubtitleDelay( p_input, val.i_time );
break;
case INPUT_CONTROL_SET_TITLE:
if( i_title >= 0 && i_title < p_input->p->input.i_title )
{
- input_EsOutChangePosition( p_input->p->p_es_out );
+ es_out_SetTime( p_input->p->p_es_out, -1 );
demux_Control( p_demux, DEMUX_SET_TITLE, i_title );
input_ControlVarTitle( p_input, i_title );
if( i_title >= 0 && i_title < p_input->p->input.i_title )
{
- input_EsOutChangePosition( p_input->p->p_es_out );
+ 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 );
!demux_Control( p_demux,
DEMUX_GET_TIME, &i_input_time ) )
{
- if ( i_input_time < i_seekpoint_time + 3000000 )
+ if( i_input_time < i_seekpoint_time + 3000000 )
i_seekpoint--;
}
else
p_input->p->input.title[p_demux->info.i_title]->i_seekpoint )
{
- input_EsOutChangePosition( p_input->p->p_es_out );
+ es_out_SetTime( p_input->p->p_es_out, -1 );
demux_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
}
demux_Control( p_demux,
DEMUX_GET_TIME, &i_input_time ) )
{
- if ( i_input_time < i_seekpoint_time + 3000000 )
+ if( i_input_time < i_seekpoint_time + 3000000 )
i_seekpoint--;
}
else
if( i_seekpoint >= 0 && i_seekpoint <
p_input->p->input.title[p_access->info.i_title]->i_seekpoint )
{
- input_EsOutChangePosition( p_input->p->p_es_out );
+ es_out_SetTime( p_input->p->p_es_out, -1 );
access_Control( p_access, ACCESS_SET_SEEKPOINT,
i_seekpoint );
}
break;
+ case INPUT_CONTROL_ADD_SUBTITLE:
+ if( val.psz_string )
+ {
+ SubtitleAdd( p_input, val.psz_string, true );
+ free( val.psz_string );
+ }
+ break;
+
case INPUT_CONTROL_ADD_SLAVE:
if( val.psz_string )
{
break;
}
if( demux_Control( slave->p_demux,
- DEMUX_SET_TIME, i_time ) )
+ DEMUX_SET_TIME, i_time ) )
{
msg_Err( p_input, "seek failed for new slave" );
InputSourceClean( slave );
}
else
{
- if( input_EsOutSetRecord( p_input->p->p_es_out, val.b_bool ) )
+ if( es_out_SetRecordState( p_input->p->p_es_out_display, val.b_bool ) )
val.b_bool = false;
}
p_input->p->b_recording = val.b_bool;
- var_Change( p_input, "record", VLC_VAR_SETVALUE, &val, NULL );
+ input_SendEventRecord( p_input, val.b_bool );
b_force_update = true;
}
break;
+ case INPUT_CONTROL_SET_FRAME_NEXT:
+ if( p_input->i_state == PAUSE_S )
+ {
+ es_out_SetFrameNext( p_input->p->p_es_out );
+ }
+ else if( p_input->i_state == PLAYING_S )
+ {
+ ControlPause( p_input, i_control_date );
+ }
+ else
+ {
+ msg_Err( p_input, "invalid state for frame next" );
+ }
+ b_force_update = true;
+ break;
+
case INPUT_CONTROL_SET_BOOKMARK:
default:
msg_Err( p_input, "not yet implemented" );
/*****************************************************************************
* UpdateFromDemux:
*****************************************************************************/
+static int UpdateTitleSeekpoint( input_thread_t *p_input,
+ int i_title, int i_seekpoint )
+{
+ 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 )
+ {
+ if( i_title > i_title_end ||
+ ( i_title == i_title_end && i_seekpoint > i_seekpoint_end ) )
+ return 0;
+ }
+ else if( i_seekpoint_end >= 0 )
+ {
+ if( i_seekpoint > i_seekpoint_end )
+ return 0;
+ }
+ else if( i_title_end >= 0 )
+ {
+ if( i_title > i_title_end )
+ return 0;
+ }
+ return 1;
+}
static int UpdateFromDemux( input_thread_t *p_input )
{
demux_t *p_demux = p_input->p->input.p_demux;
- vlc_value_t v;
+ /* TODO event-like */
if( p_demux->info.i_update & INPUT_UPDATE_TITLE )
{
- v.i_int = p_demux->info.i_title;
- var_Change( p_input, "title", VLC_VAR_SETVALUE, &v, NULL );
-
- input_ControlVarTitle( p_input, p_demux->info.i_title );
+ input_SendEventTitle( p_input, p_demux->info.i_title );
p_demux->info.i_update &= ~INPUT_UPDATE_TITLE;
}
if( p_demux->info.i_update & INPUT_UPDATE_SEEKPOINT )
{
- v.i_int = p_demux->info.i_seekpoint;
- var_Change( p_input, "chapter", VLC_VAR_SETVALUE, &v, NULL);
+ input_SendEventSeekpoint( p_input,
+ p_demux->info.i_title, p_demux->info.i_seekpoint );
p_demux->info.i_update &= ~INPUT_UPDATE_SEEKPOINT;
}
/* Hmmm only works with master input */
if( p_input->p->input.p_demux == p_demux )
- {
- 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 )
- {
- if( p_demux->info.i_title > i_title_end ||
- ( p_demux->info.i_title == i_title_end &&
- p_demux->info.i_seekpoint > i_seekpoint_end ) ) return 0;
- }
- else if( i_seekpoint_end >=0 )
- {
- if( p_demux->info.i_seekpoint > i_seekpoint_end ) return 0;
- }
- else if( i_title_end >= 0 )
- {
- if( p_demux->info.i_title > i_title_end ) return 0;
- }
- }
-
+ return UpdateTitleSeekpoint( p_input,
+ p_demux->info.i_title,
+ p_demux->info.i_seekpoint );
return 1;
}
static int UpdateFromAccess( input_thread_t *p_input )
{
access_t *p_access = p_input->p->input.p_access;
- vlc_value_t v;
if( p_access->info.i_update & INPUT_UPDATE_TITLE )
{
- v.i_int = p_access->info.i_title;
- var_Change( p_input, "title", VLC_VAR_SETVALUE, &v, NULL );
-
- input_ControlVarTitle( p_input, p_access->info.i_title );
+ input_SendEventTitle( p_input, p_access->info.i_title );
stream_AccessUpdate( p_input->p->input.p_stream );
}
if( p_access->info.i_update & INPUT_UPDATE_SEEKPOINT )
{
- v.i_int = p_access->info.i_seekpoint;
- var_Change( p_input, "chapter", VLC_VAR_SETVALUE, &v, NULL);
+ input_SendEventSeekpoint( p_input,
+ p_access->info.i_title, p_access->info.i_seekpoint );
+
p_access->info.i_update &= ~INPUT_UPDATE_SEEKPOINT;
}
if( p_access->info.i_update & INPUT_UPDATE_META )
InputUpdateMeta( p_input, p_meta );
p_access->info.i_update &= ~INPUT_UPDATE_META;
}
+ if( p_access->info.i_update & INPUT_UPDATE_SIGNAL )
+ {
+ double f_quality;
+ double f_strength;
- p_access->info.i_update &= ~INPUT_UPDATE_SIZE;
+ if( access_Control( p_access, ACCESS_GET_SIGNAL, &f_quality, &f_strength ) )
+ f_quality = f_strength = -1;
- /* Hmmm only works with master input */
- if( p_input->p->input.p_access == p_access )
- {
- 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;
+ input_SendEventSignal( p_input, f_quality, f_strength );
- if( i_title_end >= 0 && i_seekpoint_end >=0 )
- {
- if( p_access->info.i_title > i_title_end ||
- ( p_access->info.i_title == i_title_end &&
- p_access->info.i_seekpoint > i_seekpoint_end ) ) return 0;
- }
- else if( i_seekpoint_end >=0 )
- {
- if( p_access->info.i_seekpoint > i_seekpoint_end ) return 0;
- }
- else if( i_title_end >= 0 )
- {
- if( p_access->info.i_title > i_title_end ) return 0;
- }
+ p_access->info.i_update &= ~INPUT_UPDATE_SIGNAL;
}
- return 1;
-}
+ p_access->info.i_update &= ~INPUT_UPDATE_SIZE;
-/*****************************************************************************
- * UpdateItemLength:
- *****************************************************************************/
-static void UpdateItemLength( input_thread_t *p_input, int64_t i_length )
-{
- input_item_SetDuration( p_input->p->input.p_item, (mtime_t) i_length );
+ /* Hmmm only works with master input */
+ if( p_input->p->input.p_access == p_access )
+ return UpdateTitleSeekpoint( p_input,
+ p_access->info.i_title,
+ p_access->info.i_seekpoint );
+ return 1;
}
/*****************************************************************************
{
const bool b_master = in == &p_input->p->input;
- char psz_dup[strlen (psz_mrl) + 1];
+ char psz_dup[strlen(psz_mrl) + 1];
const char *psz_access;
const char *psz_demux;
char *psz_path;
}
}
- /* Try access_demux if no demux given */
- if( *psz_demux == '\0' )
- {
- in->p_demux = demux_New( p_input, psz_access, psz_demux, psz_path,
- NULL, p_input->p->p_es_out, false );
- }
+ /* Try access_demux first */
+ in->p_demux = demux_New( p_input, psz_access, psz_demux, psz_path,
+ NULL, p_input->p->p_es_out, false );
}
else
{
&in->title, &in->i_title,
&in->i_title_offset, &in->i_seekpoint_offset ) )
{
- in->i_title = 0;
- in->title = NULL;
+ TAB_INIT( in->i_title, in->title );
}
if( demux_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE,
&in->b_can_pace_control ) )
if( demux_Control( in->p_demux, DEMUX_CAN_PAUSE,
&in->b_can_pause ) )
in->b_can_pause = false;
- var_SetBool( p_input, "can-pause", in->b_can_pause );
+ var_SetBool( p_input, "can-pause", in->b_can_pause || !in->b_can_pace_control ); /* XXX temporary because of es_out_timeshift*/
+ var_SetBool( p_input, "can-rate", !in->b_can_pace_control || in->b_can_rate_control ); /* XXX temporary because of es_out_timeshift*/
+ var_SetBool( p_input, "can-rewind", !in->b_rescale_ts && !in->b_can_pace_control );
int ret = demux_Control( in->p_demux, DEMUX_CAN_SEEK,
&val.b_bool );
if( ret != VLC_SUCCESS )
val.b_bool = false;
- var_Set( p_input, "seekable", val );
+ var_Set( p_input, "can-seek", val );
}
else
{
&in->i_title_offset, &in->i_seekpoint_offset ) )
{
- in->i_title = 0;
- in->title = NULL;
+ TAB_INIT( in->i_title, in->title );
}
access_Control( in->p_access, ACCESS_CAN_CONTROL_PACE,
&in->b_can_pace_control );
access_Control( in->p_access, ACCESS_CAN_PAUSE,
&in->b_can_pause );
- var_SetBool( p_input, "can-pause", in->b_can_pause );
+ var_SetBool( p_input, "can-pause", in->b_can_pause || !in->b_can_pace_control ); /* XXX temporary because of es_out_timeshift*/
+ var_SetBool( p_input, "can-rate", !in->b_can_pace_control || in->b_can_rate_control ); /* XXX temporary because of es_out_timeshift*/
+ var_SetBool( p_input, "can-rewind", !in->b_rescale_ts && !in->b_can_pace_control );
+
access_Control( in->p_access, ACCESS_CAN_SEEK,
&val.b_bool );
- var_Set( p_input, "seekable", val );
+ var_Set( p_input, "can-seek", val );
}
if( b_master )
input_ChangeState( p_input, BUFFERING_S );
+ /* Autodetect extra files if none specified */
+ char *psz_input_list = var_CreateGetNonEmptyString( p_input, "input-list" );
+ if( !psz_input_list )
+ {
+ char *psz_extra_files = InputGetExtraFiles( p_input, psz_access, psz_path );
+ if( psz_extra_files )
+ var_SetString( p_input, "input-list", psz_extra_files );
+ free( psz_extra_files );
+ }
+
/* Create the stream_t */
in->p_stream = stream_AccessNew( in->p_access, p_input->b_preparsing );
+
+ /* Restor old value */
+ if( !psz_input_list )
+ var_SetString( p_input, "input-list", "" );
+ free( psz_input_list );
+
if( in->p_stream == NULL )
{
msg_Warn( p_input, "cannot create a stream_t from access" );
goto error;
}
- 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" ) )
- in->b_can_stream_record = false;
- var_SetBool( p_input, "can-record", true );
-#else
- var_SetBool( p_input, "can-record", in->b_can_stream_record );
-#endif
/* Get title from demux */
if( !p_input->b_preparsing && in->i_title <= 0 )
{
}
}
+ /* Set record capabilities */
+ 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" ) )
+ in->b_can_stream_record = false;
+ var_SetBool( p_input, "can-record", true );
+#else
+ var_SetBool( p_input, "can-record", in->b_can_stream_record );
+#endif
+
/* get attachment
* FIXME improve for b_preparsing: move it after GET_META and check psz_arturl */
if( 1 || !p_input->b_preparsing )
{
int64_t i_time;
int i;
+ bool b_set_time = true;
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" );
- return;
+ /* msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" ); */
+ b_set_time = false;
}
for( i = 0; i < p_input->p->i_slave; i++ )
if( in->b_eof )
continue;
- if( demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) )
+ if( b_set_time && demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) )
{
for( ;; )
{
if( demux_Control( in->p_demux, DEMUX_SET_TIME, i_time ) )
{
- msg_Err( p_input, "seek failed for slave %d -> EOF", i );
+ if( !in->b_eof )
+ msg_Err( p_input, "seek failed for slave %d -> EOF", i );
in->b_eof = true;
}
+ else
+ {
+ in->b_eof = false;
+ }
}
}
#undef GET_META
}
+/*****************************************************************************
+ * InputGetExtraFiles
+ * Autodetect extra input list
+ *****************************************************************************/
+static char *InputGetExtraFiles( input_thread_t *p_input,
+ const char *psz_access, const char *psz_path )
+{
+ char *psz_list = NULL;
+
+ if( ( psz_access && *psz_access && strcmp( psz_access, "file" ) ) || !psz_path )
+ return NULL;
+
+
+ const char *psz_ext = strrchr( psz_path, '.' );
+ if( !psz_ext || strcmp( psz_ext, ".001" ) )
+ return NULL;
+
+ char *psz_file = strdup( psz_path );
+ if( !psz_file )
+ return NULL;
+
+ /* Try to list .xyz files */
+ for( int i = 2; i < 999; i++ )
+ {
+ char *psz_ext = strrchr( psz_file, '.' );
+ struct stat st;
+
+ snprintf( psz_ext, 5, ".%.3d", i );
+
+ if( utf8_stat( psz_file, &st )
+ || !S_ISREG( st.st_mode ) || !st.st_size )
+ continue;
+
+ msg_Dbg( p_input, "Detected extra file `%s'", psz_file );
+
+ if( psz_list )
+ {
+ char *psz_old = psz_list;
+ /* FIXME how to handle file with ',' ?*/
+ if( asprintf( &psz_list, "%s,%s", psz_old, psz_file ) < 0 )
+ {
+ psz_list = psz_old;
+ break;
+ }
+ }
+ else
+ {
+ psz_list = strdup( psz_file );
+ }
+ }
+ free( psz_file );
+
+ return psz_list;
+}
+
/*****************************************************************************
* InputUpdateMeta: merge p_item meta data with p_meta taking care of
* arturl and locking issue.
input_item_t *p_item = p_input->p->input.p_item;
char * psz_arturl = NULL;
char *psz_title = NULL;
- int i_arturl_event = false;
if( !p_meta )
return;
psz_arturl = input_item_GetArtURL( p_item );
vlc_mutex_lock( &p_item->lock );
+
if( vlc_meta_Get( p_meta, vlc_meta_Title ) && !p_item->b_fixed_name )
psz_title = strdup( vlc_meta_Get( p_meta, vlc_meta_Title ) );
vlc_meta_Merge( p_item->p_meta, p_meta );
+ vlc_meta_Delete( p_meta );
+
if( psz_arturl && *psz_arturl )
{
vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, psz_arturl );
- i_arturl_event = true;
- }
- vlc_meta_Delete( p_meta );
-
- if( psz_arturl && !strncmp( psz_arturl, "attachment://", strlen("attachment") ) )
- {
- /* Don't look for art cover if sout
- * XXX It can change when sout has meta data support */
- if( p_input->p->p_sout && !p_input->b_preparsing )
+ if( !strncmp( psz_arturl, "attachment://", strlen("attachment") ) )
{
- vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, "" );
- i_arturl_event = true;
-
+ /* Don't look for art cover if sout
+ * XXX It can change when sout has meta data support */
+ if( p_input->p->p_sout && !p_input->b_preparsing )
+ vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, "" );
+ else
+ input_ExtractAttachmentAndCacheArt( p_input );
}
- else
- input_ExtractAttachmentAndCacheArt( p_input );
}
free( psz_arturl );
- /* A bit ugly */
- p_meta = NULL;
- if( vlc_dictionary_keys_count( &p_item->p_meta->extra_tags ) > 0 )
- {
- p_meta = vlc_meta_New();
- vlc_meta_Merge( p_meta, input_item_GetMetaObject( p_item ) );
- }
vlc_mutex_unlock( &p_item->lock );
- input_item_SetPreparsed( p_item, true );
-
- if( i_arturl_event == true )
- {
- vlc_event_t event;
-
- /* Notify interested third parties */
- event.type = vlc_InputItemMetaChanged;
- event.u.input_item_meta_changed.meta_type = vlc_meta_ArtworkURL;
- vlc_event_send( &p_item->event_manager, &event );
- }
-
if( psz_title )
{
- input_Control( p_input, INPUT_SET_NAME, psz_title );
+ input_item_SetName( p_item, psz_title );
free( psz_title );
}
+ input_item_SetPreparsed( p_item, true );
+
+ input_SendEventMeta( p_input );
/** \todo handle sout meta */
}
bool b_bool;
module_t *p_id3;
-
#if 0
/* XXX I am not sure it is a great idea, besides, there is more than that
* if we want to do it right */
if(! p_demux->p_private )
return;
- p_id3 = module_Need( p_demux, "meta reader", NULL, 0 );
+ p_id3 = module_need( p_demux, "meta reader", NULL, 0 );
if( p_id3 )
{
demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
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 );
+ module_unneed( p_demux, p_id3 );
}
free( p_demux->p_private );
}
+static void input_ChangeState( input_thread_t *p_input, int i_state )
+{
+ const bool b_changed = p_input->i_state != i_state;
+
+ p_input->i_state = i_state;
+ if( i_state == ERROR_S )
+ p_input->b_error = true;
+ else if( i_state == END_S )
+ p_input->b_eof = true;
+
+ if( b_changed )
+ {
+ input_item_SetErrorWhenReading( p_input->p->input.p_item, p_input->b_error );
+ input_SendEventState( p_input, i_state );
+ }
+}
+
/*****************************************************************************
* MRLSplit: parse the access, demux and url part of the
/*****************************************************************************
* input_AddSubtitles: add a subtitles file and enable it
*****************************************************************************/
-bool input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle,
- bool b_check_extension )
+static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_forced )
{
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 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 );
psz_extension = strrchr( psz_path, '.');
if( psz_extension && strcmp( psz_extension, ".sub" ) == 0 )
{
- FILE *f;
+ struct stat st;
strcpy( psz_extension, ".idx" );
- /* FIXME: a portable wrapper for stat() or access() would be more suited */
- if( ( f = utf8_fopen( psz_path, "rt" ) ) )
+
+ if( !utf8_stat( psz_path, &st ) && S_ISREG( st.st_mode ) )
{
- fclose( f );
msg_Dbg( p_input, "using %s subtitles file instead of %s",
psz_path, psz_subtitle );
strcpy( psz_subtitle, 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" ) )
+ if( InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) )
+ {
+ free( sub );
+ return;
+ }
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub );
+
+ /* Select the ES */
+ if( b_forced && !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) )
{
- TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub );
+ if( count.i_int == 0 )
+ count.i_int++;
+ /* if it was first one, there is disable too */
- /* Select the ES */
- if( !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) )
+ if( count.i_int < list.p_list->i_count )
{
- if( count.i_int == 0 )
- count.i_int++;
- /* if it was first one, there is disable too */
+ const int i_id = list.p_list->p_values[count.i_int].i_int;
- 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 );
+ es_out_Control( p_input->p->p_es_out_display, ES_OUT_SET_ES_DEFAULT_BY_ID, i_id );
+ es_out_Control( p_input->p->p_es_out_display, ES_OUT_SET_ES_BY_ID, i_id );
}
+ var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, NULL );
}
- else free( sub );
+}
+
+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
+ *****************************************************************************/
+void input_UpdateStatistic( input_thread_t *p_input,
+ input_statistic_t i_type, int i_delta )
+{
+ assert( p_input->i_state != INIT_S );
+
+ vlc_mutex_lock( &p_input->p->counters.counters_lock);
+ switch( i_type )
+ {
+#define I(c) stats_UpdateInteger( p_input, p_input->p->counters.c, i_delta, NULL )
+ case INPUT_STATISTIC_DECODED_VIDEO:
+ I(p_decoded_video);
+ break;
+ case INPUT_STATISTIC_DECODED_AUDIO:
+ I(p_decoded_audio);
+ break;
+ case INPUT_STATISTIC_DECODED_SUBTITLE:
+ I(p_decoded_sub);
+ break;
+ case INPUT_STATISTIC_SENT_PACKET:
+ I(p_sout_sent_packets);
+ break;
+#undef I
+ case INPUT_STATISTIC_SENT_BYTE:
+ {
+ int i_bytes; /* That's pretty stupid to define it as an integer, it will overflow
+ really fast ... */
+ if( !stats_UpdateInteger( p_input, p_input->p->counters.p_sout_sent_bytes, i_delta, &i_bytes ) )
+ stats_UpdateFloat( p_input, p_input->p->counters.p_sout_send_bitrate, i_bytes, NULL );
+ break;
+ }
+ default:
+ msg_Err( p_input, "Invalid statistic type %d (internal error)", i_type );
+ break;
+ }
+ vlc_mutex_unlock( &p_input->p->counters.counters_lock);
+}
/*****************************************************************************
* input_get_event_manager
*****************************************************************************/
projects / vlc / blobdiff