/*****************************************************************************
- * input_clock.c: Clock/System date convertions, stream management
+ * clock.c: Clock/System date convertions, stream management
*****************************************************************************
* Copyright (C) 1999-2008 the VideoLAN team
* Copyright (C) 2008 Laurent Aimar
#include <vlc_common.h>
#include <vlc_input.h>
-#include "input_clock.h"
+#include "clock.h"
+#include <assert.h>
+
+/* TODO:
+ * - clean up locking once clock code is stable
+ *
+ */
/*
* DISCUSSION : SYNCHRONIZATION METHOD
* in all the FIFOs, but it may be not enough.
*/
-/* p_input->p->i_cr_average : Maximum number of samples used to compute the
+/* i_cr_average : Maximum number of samples used to compute the
* dynamic average value.
* We use the following formula :
* new_average = (old_average * c_average + new_sample_value) / (c_average +1)
*/
+
/*****************************************************************************
* Constants
*****************************************************************************/
static void AvgReset( average_t * );
static void AvgUpdate( average_t *, mtime_t i_value );
static mtime_t AvgGet( average_t * );
+static void AvgRescale( average_t *, int i_divider );
/* */
typedef struct
/* */
struct input_clock_t
{
+ /* */
+ vlc_mutex_t lock;
+
/* Reference point */
bool b_has_reference;
clock_point_t ref;
* It is used to detect unexpected stream discontinuities */
clock_point_t last;
- /* Maximal timestamp returned by input_clock_GetTS (in system unit) */
+ /* Maximal timestamp returned by input_clock_ConvertTS (in system unit) */
mtime_t i_ts_max;
/* Clock drift */
/* Current modifiers */
int i_rate;
+ mtime_t i_pts_delay;
+ bool b_paused;
+ mtime_t i_pause_date;
};
static mtime_t ClockStreamToSystem( input_clock_t *, mtime_t i_stream );
/*****************************************************************************
* input_clock_New: create a new clock
*****************************************************************************/
-input_clock_t *input_clock_New( int i_cr_average, int i_rate )
+input_clock_t *input_clock_New( int i_rate )
{
input_clock_t *cl = malloc( sizeof(*cl) );
if( !cl )
return NULL;
+ vlc_mutex_init( &cl->lock );
cl->b_has_reference = false;
cl->ref = clock_point_Create( 0, 0 );
cl->i_ts_max = 0;
cl->i_next_drift_update = 0;
- AvgInit( &cl->drift, i_cr_average );
+ AvgInit( &cl->drift, 10 );
cl->i_rate = i_rate;
+ cl->i_pts_delay = 0;
+ cl->b_paused = false;
+ cl->i_pause_date = 0;
return cl;
}
void input_clock_Delete( input_clock_t *cl )
{
AvgClean( &cl->drift );
+ vlc_mutex_destroy( &cl->lock );
free( cl );
}
{
bool b_reset_reference = false;
+ vlc_mutex_lock( &cl->lock );
+
if( ( !cl->b_has_reference ) ||
( i_ck_stream == 0 && cl->last.i_stream != 0 ) )
{
cl->i_next_drift_update = i_ck_system + CLOCK_FREQ/5; /* FIXME why that */
}
cl->last = clock_point_Create( i_ck_stream, i_ck_system );
+
+ vlc_mutex_unlock( &cl->lock );
}
/*****************************************************************************
*****************************************************************************/
void input_clock_Reset( input_clock_t *cl )
{
+ vlc_mutex_lock( &cl->lock );
+
cl->b_has_reference = false;
cl->ref = clock_point_Create( 0, 0 );
cl->i_ts_max = 0;
+
+ vlc_mutex_unlock( &cl->lock );
}
/*****************************************************************************
*****************************************************************************/
void input_clock_ChangeRate( input_clock_t *cl, int i_rate )
{
+ vlc_mutex_lock( &cl->lock );
+
/* Move the reference point */
if( cl->b_has_reference )
+ {
+ cl->last.i_system = ClockStreamToSystem( cl, cl->last.i_stream );
cl->ref = cl->last;
+ }
cl->i_rate = i_rate;
+
+ vlc_mutex_unlock( &cl->lock );
+}
+
+/*****************************************************************************
+ * input_clock_ChangePause:
+ *****************************************************************************/
+void input_clock_ChangePause( input_clock_t *cl, bool b_paused, mtime_t i_date )
+{
+ vlc_mutex_lock( &cl->lock );
+ assert( (!cl->b_paused) != (!b_paused) );
+
+ if( cl->b_paused )
+ {
+ const mtime_t i_duration = i_date - cl->i_pause_date;
+
+ if( cl->b_has_reference && i_duration > 0 )
+ {
+ cl->ref.i_system += i_duration;
+ cl->last.i_system += i_duration;
+ }
+ }
+ cl->i_pause_date = i_date;
+ cl->b_paused = b_paused;
+
+ vlc_mutex_unlock( &cl->lock );
}
/*****************************************************************************
*****************************************************************************/
mtime_t input_clock_GetWakeup( input_clock_t *cl )
{
- /* Not synchronized, we cannot wait */
+ mtime_t i_wakeup = 0;
+
+ vlc_mutex_lock( &cl->lock );
+
+ /* Synchronized, we can wait */
+ if( cl->b_has_reference )
+ i_wakeup = ClockStreamToSystem( cl, cl->last.i_stream );
+
+ vlc_mutex_unlock( &cl->lock );
+
+ return i_wakeup;
+}
+
+/*****************************************************************************
+ * input_clock_ConvertTS
+ *****************************************************************************/
+int input_clock_ConvertTS( input_clock_t *cl,
+ int *pi_rate, mtime_t *pi_ts0, mtime_t *pi_ts1,
+ mtime_t i_ts_bound )
+{
+ mtime_t i_pts_delay;
+
+ assert( pi_ts0 );
+ vlc_mutex_lock( &cl->lock );
+
+ if( pi_rate )
+ *pi_rate = cl->i_rate;
+
if( !cl->b_has_reference )
- return 0;
+ {
+ vlc_mutex_unlock( &cl->lock );
+ *pi_ts0 = 0;
+ if( pi_ts1 )
+ *pi_ts1 = 0;
+ return VLC_EGENERIC;
+ }
/* */
- return ClockStreamToSystem( cl, cl->last.i_stream );
-}
+ if( *pi_ts0 > 0 )
+ {
+ *pi_ts0 = ClockStreamToSystem( cl, *pi_ts0 + AvgGet( &cl->drift ) );
+ if( *pi_ts0 > cl->i_ts_max )
+ cl->i_ts_max = *pi_ts0;
+ *pi_ts0 += cl->i_pts_delay;
+ }
+
+ /* XXX we do not ipdate i_ts_max on purpose */
+ if( pi_ts1 && *pi_ts1 > 0 )
+ {
+ *pi_ts1 = ClockStreamToSystem( cl, *pi_ts1 + AvgGet( &cl->drift ) ) +
+ cl->i_pts_delay;
+ }
+
+ i_pts_delay = cl->i_pts_delay;
+ vlc_mutex_unlock( &cl->lock );
+ /* Check ts validity */
+ if( i_ts_bound != INT64_MAX &&
+ *pi_ts0 > 0 && *pi_ts0 >= mdate() + cl->i_pts_delay + i_ts_bound )
+ return VLC_EGENERIC;
+
+ return VLC_SUCCESS;
+}
/*****************************************************************************
- * input_clock_GetTS: manages a PTS or DTS
+ * input_clock_GetRate: Return current rate
*****************************************************************************/
-mtime_t input_clock_GetTS( input_clock_t *cl,
- mtime_t i_pts_delay, mtime_t i_ts )
+int input_clock_GetRate( input_clock_t *cl )
{
- mtime_t i_converted_ts;
+ int i_rate;
+
+ vlc_mutex_lock( &cl->lock );
+ i_rate = cl->i_rate;
+ vlc_mutex_unlock( &cl->lock );
+
+ return i_rate;
+}
+
+int input_clock_GetState( input_clock_t *cl,
+ mtime_t *pi_stream_start, mtime_t *pi_system_start,
+ mtime_t *pi_stream_duration, mtime_t *pi_system_duration )
+{
+ vlc_mutex_lock( &cl->lock );
if( !cl->b_has_reference )
- return 0;
+ {
+ vlc_mutex_unlock( &cl->lock );
+ return VLC_EGENERIC;
+ }
+
+ *pi_stream_start = cl->ref.i_stream;
+ *pi_system_start = cl->ref.i_system;
+
+ *pi_stream_duration = cl->last.i_stream - cl->ref.i_stream;
+ *pi_system_duration = cl->last.i_system - cl->ref.i_system;
+
+ vlc_mutex_unlock( &cl->lock );
+
+ return VLC_SUCCESS;
+}
+
+void input_clock_ChangeSystemOrigin( input_clock_t *cl, mtime_t i_system )
+{
+ vlc_mutex_lock( &cl->lock );
+
+ assert( cl->b_has_reference );
+ const mtime_t i_offset = i_system - cl->ref.i_system;
+
+ cl->ref.i_system += i_offset;
+ cl->last.i_system += i_offset;
+
+ vlc_mutex_unlock( &cl->lock );
+}
+
+#warning "input_clock_SetJitter needs more work"
+void input_clock_SetJitter( input_clock_t *cl,
+ mtime_t i_pts_delay, int i_cr_average )
+{
+ vlc_mutex_lock( &cl->lock );
+
+ /* TODO always save the value, and when rebuffering use the new one if smaller
+ * TODO when increasing -> force rebuffering
+ */
+ if( cl->i_pts_delay < i_pts_delay )
+ cl->i_pts_delay = i_pts_delay;
/* */
- i_converted_ts = ClockStreamToSystem( cl, i_ts + AvgGet( &cl->drift ) );
- if( i_converted_ts > cl->i_ts_max )
- cl->i_ts_max = i_converted_ts;
+ if( i_cr_average < 10 )
+ i_cr_average = 10;
- return i_converted_ts + i_pts_delay;
+ if( cl->drift.i_divider != i_cr_average )
+ AvgRescale( &cl->drift, i_cr_average );
+
+ vlc_mutex_unlock( &cl->lock );
}
/*****************************************************************************
{
return p_avg->i_value;
}
+static void AvgRescale( average_t *p_avg, int i_divider )
+{
+ const mtime_t i_tmp = p_avg->i_value * p_avg->i_divider + p_avg->i_residue;
+ p_avg->i_divider = i_divider;
+ p_avg->i_value = i_tmp / p_avg->i_divider;
+ p_avg->i_residue = i_tmp % p_avg->i_divider;
+}
projects / vlc / blobdiff