[vlc-devel] [PATCH 15/17] video_output: rename deadline to next_render in ThreadDisplayPicture

[Steve Lhomme]

---
 src/video_output/video_output.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 711b15393b6..a1aa5122027 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1467,10 +1467,10 @@ static int ThreadDisplayRenderPicture(vout_thread_sys_t *vout, bool is_forced)
     return VLC_SUCCESS;
 }
 
-static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline)
+static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *next_render)
 {
     vout_thread_sys_t *sys = vout;
-    bool frame_by_frame = !deadline;
+    bool frame_by_frame = !next_render;
     bool paused = sys->pause.is_on;
     bool first = !sys->displayed.current;
 
@@ -1485,8 +1485,8 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline)
     }
     vlc_mutex_unlock(&sys->filter.lock);
 
-    if (deadline)
-        *deadline = VLC_TICK_INVALID;
+    if (next_render)
+        *next_render = VLC_TICK_INVALID;
 
     if (first)
         if (ThreadDisplayPreparePicture(vout, true, frame_by_frame, &paused)) /* FIXME not sure it is ok */
@@ -1516,7 +1516,7 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline)
         vlc_tick_t date_refresh = sys->displayed.date + VOUT_REDISPLAY_DELAY;
         refresh = date_refresh <= system_now;
         if (!frame_by_frame)
-            *deadline = date_refresh;
+            *next_render = date_refresh;
     }
 
     if (!paused && sys->displayed.next) {
@@ -1532,8 +1532,8 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline)
         else
         {
             if (!frame_by_frame) {
-                if (*deadline == VLC_TICK_INVALID || *deadline > next_system_pts)
-                    *deadline = next_system_pts;
+                if (*next_render == VLC_TICK_INVALID || *next_render > next_system_pts)
+                    *next_render = next_system_pts;
             }
 
             if (next_system_pts <= system_now)
-- 
2.26.2