p_pgrm->psz_now_playing = NULL;
p_pgrm->psz_publisher = NULL;
p_pgrm->p_epg = NULL;
- p_pgrm->p_clock = input_clock_New( p_input->p->input.i_cr_average, p_sys->i_rate );
+ p_pgrm->p_clock = input_clock_New( p_input->p->i_cr_average, p_sys->i_rate );
if( !p_pgrm->p_clock )
{
free( p_pgrm );
p_input->p->p_sout = NULL;
p_input->p->b_out_pace_control = false;
p_input->i_pts_delay = 0;
+ p_input->p->i_cr_average = 0;
vlc_gc_incref( p_item ); /* Released in Destructor() */
p_input->p->p_item = p_item;
p_input->p->input.b_can_rate_control = true;
p_input->p->input.b_rescale_ts = true;
p_input->p->input.b_eof = false;
- p_input->p->input.i_cr_average = 0;
vlc_mutex_lock( &p_item->lock );
input_ControlVarInit( p_input );
/* */
- p_input->p->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
+ p_input->p->i_cr_average = var_GetInteger( p_input, "cr-average" );
if( !p_input->b_preparsing )
{
p_input->i_pts_delay -= i_desynch * 1000;
/* Update cr_average depending on the caching */
- p_master->i_cr_average *= (10 * p_input->i_pts_delay / 200000);
- p_master->i_cr_average /= 10;
- if( p_master->i_cr_average < 10 )
- p_master->i_cr_average = 10;
+ p_input->p->i_cr_average *= (10 * p_input->i_pts_delay / 200000);
+ p_input->p->i_cr_average /= 10;
+ if( p_input->p->i_cr_average < 10 )
+ p_input->p->i_cr_average = 10;
}
static void StartTitle( input_thread_t * p_input )
bool b_eof; /* eof of demuxer */
double f_fps;
- /* Clock average variation */
- int i_cr_average;
-
} input_source_t;
/** Private input fields */
bool b_out_pace_control; /* idem ? */
/* Main input properties */
- input_item_t *p_item;
+ /* Input item */
+ input_item_t *p_item;
+ /* Clock average variation */
+ int i_cr_average;
+ /* Main source */
input_source_t input;
- /* Slave demuxers (subs, and others) */
+ /* Slave sources (subs, and others) */
int i_slave;
input_source_t **slave;