videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

input: use VLC_TICK_INVALID for time/length

This commit is contained in:
Thomas Guillem 2019-08-29 11:31:59 +02:00
parent 5ae87e748e
commit d348527277
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/input/es_out.c
View File

@ -3290,11 +3290,14 @@ static int EsOutVaControlLocked( es_out_t *out, int i_query, va_list args )
else
i_delay = 0;
i_time -= i_delay;
if( i_time < 0 )
i_time = 0;
if( i_time != VLC_TICK_INVALID )
{
i_time -= i_delay;
if( i_time < VLC_TICK_0 )
i_time = VLC_TICK_0;
}
if( i_length > 0 )
if( i_length != VLC_TICK_INVALID )
f_position -= (double)i_delay / i_length;
if( f_position < 0 )
f_position = 0;

18
src/input/input.c
View File

@ -298,7 +298,7 @@ static input_thread_t *Create( vlc_object_t *p_parent,
priv->b_thumbnailing = option == INPUT_CREATE_OPTION_THUMBNAILING;
priv->b_can_pace_control = true;
priv->i_start = 0;
priv->i_time = 0;
priv->i_time = VLC_TICK_INVALID;
priv->i_stop = 0;
priv->i_title_offset = input_priv(p_input)->i_seekpoint_offset = 0;
priv->i_state = INIT_S;
@ -527,7 +527,7 @@ static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed )
if( p_priv->i_stop > 0 )
{
if( demux_Control( p_demux, DEMUX_GET_TIME, &p_priv->i_time ) )
p_priv->i_time = 0;
p_priv->i_time = VLC_TICK_INVALID;
if( p_priv->i_stop <= p_priv->i_time )
i_ret = VLC_DEMUXER_EOF;
@ -611,8 +611,8 @@ static void MainLoopStatistics( input_thread_t *p_input )
{
input_thread_private_t *priv = input_priv(p_input);
double f_position = 0.0;
vlc_tick_t i_time = 0;
vlc_tick_t i_length = 0;
vlc_tick_t i_time;
vlc_tick_t i_length;
/* update input status variables */
if( demux_Control( priv->master->p_demux,
@ -620,11 +620,11 @@ static void MainLoopStatistics( input_thread_t *p_input )
f_position = 0.0;
if( demux_Control( priv->master->p_demux, DEMUX_GET_TIME, &i_time ) )
i_time = 0;
i_time = VLC_TICK_INVALID;
input_priv(p_input)->i_time = i_time;
if( demux_Control( priv->master->p_demux, DEMUX_GET_LENGTH, &i_length ) )
i_length = 0;
i_length = VLC_TICK_INVALID;
es_out_SetTimes( priv->p_es_out, f_position, i_time, i_length );
@ -1269,11 +1269,11 @@ static int Init( input_thread_t * p_input )
/* Init length */
vlc_tick_t i_length;
if( demux_Control( master->p_demux, DEMUX_GET_LENGTH, &i_length ) )
i_length = 0;
if( i_length <= 0 )
i_length = VLC_TICK_INVALID;
if( i_length == VLC_TICK_INVALID )
i_length = input_item_GetDuration( priv->p_item );
input_SendEventTimes( p_input, 0.0, 0, i_length );
input_SendEventTimes( p_input, 0.0, VLC_TICK_INVALID, i_length );
if( !priv->b_preparsing )
{