Commit b72b3e53 authored by Laurent Aimar's avatar Laurent Aimar

Removed one dependency of the clock on input_thread_t.

parent abc4689a
......@@ -300,10 +300,8 @@ mtime_t input_clock_GetWakeup( input_clock_t *cl, input_thread_t *p_input )
if( !cl->b_has_reference )
return 0;
/* We must not wait if not pace controled, or we are not the
* master clock */
if( !p_input->b_can_pace_control || !cl->b_master ||
p_input->p->b_out_pace_control )
/* We must not wait if we are not the master clock */
if( !cl->b_master )
return 0;
/* */
......
......@@ -355,7 +355,13 @@ mtime_t input_EsOutGetWakeup( es_out_t *out )
if( !p_sys->p_pgrm )
return 0;
return input_clock_GetWakeup( p_sys->p_pgrm->p_clock, p_sys->p_input );
/* We do not have a wake up date if the input cannot have its speed
* controlled or sout is imposing its own */
if( !p_input->b_can_pace_control || p_input->p->b_out_pace_control )
return 0;
return input_clock_GetWakeup( p_sys->p_pgrm->p_clock );
}
static void EsOutDiscontinuity( es_out_t *out, bool b_flush, bool b_audio )
......
......@@ -366,7 +366,7 @@ void input_clock_ResetPCR( input_clock_t * );
mtime_t input_clock_GetTS( input_clock_t *, mtime_t i_pts_delay, mtime_t );
void input_clock_SetRate( input_clock_t *cl, int i_rate );
void input_clock_SetMaster( input_clock_t *cl, bool b_master );
mtime_t input_clock_GetWakeup( input_clock_t *cl, input_thread_t * );
mtime_t input_clock_GetWakeup( input_clock_t *cl );
/* Subtitles */
char **subtitles_Detect( input_thread_t *, char* path, const char *fname );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment