[vlc-commits] Revert "input: es_out: compute position from buffering only on update"
vlc/vlc-3.0 | branch: master | Francois Cartegnie | Thu Feb 22 16:17:41 2018 +0100| [d37c6b039f49cea54570069cd79c3a262098bb19] | committer: Francois Cartegnie Revert "input: es_out: compute position from buffering only on update" This reverts commit 5e3a04980044b94bfd5aa38390846544a43a4c21. That does not behave well with streams not updating position... "growing" (cherry picked from commit 3b5024d930a74bd73b42c1d3b6ca243cbe166f9c) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=d37c6b039f49cea54570069cd79c3a262098bb19 --- src/input/es_out.c | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/input/es_out.c b/src/input/es_out.c index 69cd7bc7b9..b86e684f8d 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -175,9 +175,6 @@ struct es_out_sys_t /* Used only to limit debugging output */ int i_prev_stream_level; - -/* For positions updates */ -double f_prev_position; }; static es_out_id_t *EsOutAdd( es_out_t *, const es_format_t * ); @@ -335,7 +332,6 @@ es_out_t *input_EsOutNew( input_thread_t *p_input, int i_rate ) p_sys->b_buffering = true; p_sys->i_preroll_end = -1; p_sys->i_prev_stream_level = -1; -p_sys->f_prev_position = -1; return out; } @@ -2793,10 +2789,10 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args ) input_SendEventLength( p_sys->p_input, i_length ); -if( !p_sys->b_buffering && f_position != p_sys->f_prev_position ) +if( !p_sys->b_buffering ) { mtime_t i_delay; -p_sys->f_prev_position = f_position; + /* Fix for buffering delay */ if( !input_priv(p_sys->p_input)->p_sout || !input_priv(p_sys->p_input)->b_out_pace_control ) ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Revert "input: es_out: compute position from buffering only on update"
vlc | branch: master | Francois Cartegnie | Thu Feb 22 16:17:41 2018 +0100| [3b5024d930a74bd73b42c1d3b6ca243cbe166f9c] | committer: Francois Cartegnie Revert "input: es_out: compute position from buffering only on update" This reverts commit 5e3a04980044b94bfd5aa38390846544a43a4c21. That does not behave well with streams not updating position... "growing" > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3b5024d930a74bd73b42c1d3b6ca243cbe166f9c --- src/input/es_out.c | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/input/es_out.c b/src/input/es_out.c index b6f8cd20ac..9ec3e7059b 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -175,9 +175,6 @@ struct es_out_sys_t /* Used only to limit debugging output */ int i_prev_stream_level; - -/* For positions updates */ -double f_prev_position; }; static es_out_id_t *EsOutAdd( es_out_t *, const es_format_t * ); @@ -335,7 +332,6 @@ es_out_t *input_EsOutNew( input_thread_t *p_input, int i_rate ) p_sys->b_buffering = true; p_sys->i_preroll_end = -1; p_sys->i_prev_stream_level = -1; -p_sys->f_prev_position = -1; return out; } @@ -2787,10 +2783,10 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args ) input_SendEventLength( p_sys->p_input, i_length ); -if( !p_sys->b_buffering && f_position != p_sys->f_prev_position ) +if( !p_sys->b_buffering ) { mtime_t i_delay; -p_sys->f_prev_position = f_position; + /* Fix for buffering delay */ if( !input_priv(p_sys->p_input)->p_sout || !input_priv(p_sys->p_input)->b_out_pace_control ) ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits