#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 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 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
- * - intf-change-vout for when a vout is created or destroyed
- * - rate-change for when playback rate changes
- * - stats-change for when statistics are updated
- * 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 */
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 );
/* Remove 'Now playing' info as it is probably outdated */
input_item_SetNowPlaying( p_item, NULL );
+ input_SendEventMeta( p_input );
/* */
if( p_input->b_preparsing )
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;
const int canc = vlc_savecancel();
* 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;
const int canc = vlc_savecancel();
*/
static void MainLoopInterface( input_thread_t *p_input )
{
- vlc_value_t val;
- double f_pos;
- int64_t i_time, i_length;
+ 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, &f_pos ) )
+ 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 )
{
- val.f_float = (float)f_pos;
- var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
+ ev.i_time -= i_es_out_delay;
+ if( ev.i_time < 0 )
+ ev.i_time = 0;
}
- if( !demux_Control( p_input->p->input.p_demux,
- DEMUX_GET_TIME, &i_time ) )
+ if( ev.i_length > 0 )
{
- p_input->i_time = i_time;
- val.i_time = i_time;
- var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
+ ev.f_position -= (double)i_es_out_delay / ev.i_length;
}
- if( !demux_Control( p_input->p->input.p_demux,
- DEMUX_GET_LENGTH, &i_length ) )
+
+ if( p_input->i_state == PAUSE_S )
{
- 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 );
+ input_event_times_t old = p_input->p->input_last_times;
- if( old_val.i_time != val.i_time )
- {
- UpdateItemLength( p_input, i_length );
- }
+ /* 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;
}
- var_SetBool( p_input, "intf-change", true );
+ p_input->p->input_last_times = ev;
+
+ input_SendEventTimes( p_input, &ev );
}
/**
stats_ComputeGlobalStats( p_input->p_libvlc,
p_input->p_libvlc->p_stats );
}
- var_SetBool( p_input, "stats-change", true );
+ input_SendEventStatistics( p_input );
}
/**
/* Start the timer */
stats_TimerStop( p_input, STATS_TIMER_INPUT_LAUNCHING );
- while( !p_input->b_die && !p_input->b_error && !p_input->p->input.b_eof )
+ while( vlc_object_alive( p_input ) && !p_input->b_error )
{
bool b_force_update;
int i_type;
/* 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 &&
- !input_EsOutIsBuffering( p_input->p->p_es_out );
+ !es_out_GetBuffering( p_input->p->p_es_out, NULL );
if( !b_paused )
{
- MainLoopDemux( p_input, &b_force_update, &i_start_mdate );
- i_wakeup = input_EsOutGetWakeup( p_input->p->p_es_out );
+ 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( !p_input->b_eof && !es_out_GetEmpty( p_input->p->p_es_out ) )
+ {
+ msg_Dbg( p_input, "waiting decoder fifos to empty" );
+ i_wakeup = mdate() + INPUT_IDLE_SLEEP;
+ }
+ else
+ {
+ break;
+ }
}
/* */
while( !ControlPopNoLock( p_input, &i_type, &val, i_deadline ) )
{
msg_Dbg( p_input, "control type=%d", i_type );
+
if( Control( p_input, i_type, val ) )
b_force_update = true;
}
/* Check if i_wakeup is still valid */
if( i_wakeup != 0 )
{
- mtime_t i_new_wakeup = input_EsOutGetWakeup( p_input->p->p_es_out );
+ 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_eof && !p_input->b_error && p_input->p->input.b_eof )
- {
- /* We have finish to demux data but not to play them */
- while( vlc_object_alive( p_input ) )
- {
- if( input_EsOutDecodersIsEmpty( p_input->p->p_es_out ) )
- break;
-
- msg_Dbg( p_input, "waiting decoder fifos to empty" );
-
- msleep( INPUT_IDLE_SLEEP );
- }
-
- /* We have finished */
+ if( !p_input->b_error )
input_ChangeState( p_input, END_S );
- }
}
static void InitStatistics( input_thread_t * p_input )
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 )
{
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;
/* 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 )
{
/*****************************************************************************
* 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,
mtime_t i_deadline )
}
}
}
+/* 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 )
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_EsOutChangePause( p_input->p->p_es_out, false, i_control_date );
}
- 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_EsOutChangePause( p_input->p->p_es_out, true, i_control_date );
}
- 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, ES_OUT_RESTART_ES,
- input_EsOutGetFromID( p_input->p->p_es_out, val.i_int ) );
+ 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 );
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 );
}
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 );
}
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 )
if( access_Control( p_access, ACCESS_GET_SIGNAL, &f_quality, &f_strength ) )
f_quality = f_strength = -1;
- var_SetFloat( p_input, "signal-quality", f_quality );
- var_SetFloat( p_input, "signal-strength", f_strength );
+ input_SendEventSignal( p_input, f_quality, f_strength );
p_access->info.i_update &= ~INPUT_UPDATE_SIGNAL;
}
/* 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;
-
- 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;
- }
- }
-
+ return UpdateTitleSeekpoint( p_input,
+ p_access->info.i_title,
+ p_access->info.i_seekpoint );
return 1;
}
-/*****************************************************************************
- * 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 );
-}
-
/*****************************************************************************
* InputSourceNew:
*****************************************************************************/
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
{
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_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 */
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
if( count.i_int < list.p_list->i_count )
{
- int i_id = list.p_list->p_values[count.i_int].i_int;
- es_out_id_t *p_es = input_EsOutGetFromID( p_input->p->p_es_out, i_id );
+ const int i_id = list.p_list->p_values[count.i_int].i_int;
- es_out_Control( p_input->p->p_es_out, ES_OUT_SET_DEFAULT, p_es );
- es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ES, p_es );
+ 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 );
}
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
*****************************************************************************/