[vlc-devel] [PATCH] [RFC] input: only get a wakeup time when the demuxer can control pace

Steve Lhomme robux4 at videolabs.io
Wed Jun 22 12:54:32 CEST 2016


---
 src/input/input.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index 0fc442f..4067ce5 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -681,9 +681,6 @@ static void MainLoop( input_thread_t *p_input, bool b_interactive )
     bool b_pause_after_eof = b_interactive &&
                              var_InheritBool( p_input, "play-and-pause" );
 
-    demux_t *p_demux = p_input->p->master->p_demux;
-    const bool b_can_demux = p_demux->pf_demux != NULL;
-
     while( !input_Stopped( p_input ) && p_input->p->i_state != ERROR_S )
     {
         mtime_t i_wakeup = -1;
@@ -703,7 +700,7 @@ static void MainLoop( input_thread_t *p_input, bool b_interactive )
 
                 MainLoopDemux( p_input, &b_force_update );
 
-                if( b_can_demux )
+                if( p_input->p->b_can_pace_control )
                     i_wakeup = es_out_GetWakeup( p_input->p->p_es_out );
                 if( b_force_update )
                     i_intf_update = 0;
-- 
2.8.2



More information about the vlc-devel mailing list