Commit b51fa630 authored by Laurent Aimar's avatar Laurent Aimar

Auto reset rate to source rate when no more buffered data.

parent fc75017b
......@@ -638,14 +638,27 @@ static void *TsRun( vlc_object_t *p_thread )
const mtime_t i_duration = cmd.i_date - p_sys->i_rate_date;
p_sys->i_rate_delay = i_duration * p_sys->i_rate / p_sys->i_rate_source - i_duration;
}
if( p_sys->i_cmd_delay + p_sys->i_rate_delay < 0 )
{
/* Auto reset to rate 1.0 */
msg_Warn( p_sys->p_input, "es out timeshift: auto reset rate to %d", p_sys->i_rate_source );
i_deadline = cmd.i_date + p_sys->i_cmd_delay + p_sys->i_rate_delay;
p_sys->i_cmd_delay = 0;
if( p_sys->i_cmd_delay + p_sys->i_rate_delay < 0 )
p_sys->i_rate_date = -1;
p_sys->i_rate_delay = 0;
p_sys->i_rate = p_sys->i_rate_source;
if( !es_out_SetRate( p_sys->p_out, p_sys->i_rate_source, p_sys->i_rate ) )
{
/* TODO handle when we cannot go faster anymore */
msg_Err( p_sys->p_input, "FIXME rate underflow" );
vlc_value_t val = { .i_int = p_sys->i_rate };
/* Warn back input
* FIXME it is perfectly safe BUT it is ugly as it may hide a
* rate change requested by user */
input_ControlPush( p_sys->p_input, INPUT_CONTROL_SET_RATE, &val );
}
}
i_deadline = cmd.i_date + p_sys->i_cmd_delay + p_sys->i_rate_delay;
vlc_cleanup_run();
......
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