src/video_output/video_output.c

@@ -1371,28 +1371,14 @@ static vlc_tick_t DisplayPicture(vout_thread_sys_t *vout)
 
     UpdateDeinterlaceFilter(sys);
 
-    bool render_now = true;
     const vlc_tick_t system_now = vlc_tick_now();
     const vlc_tick_t render_delay = vout_chrono_GetHigh(&sys->chrono.render) + VOUT_MWAIT_TOLERANCE;
     const bool first = !sys->displayed.current;
 
-    /* FIXME/XXX we must redisplay the last decoded picture (because
-    * of potential vout updated, or filters update or SPU update)
-    * For now a high update period is needed but it could be removed
-    * if and only if:
-    * - vout module emits events from themselves.
-    * - *and* SPU is modified to emit an event or a deadline when needed.
-    *
-    * So it will be done later.
-    */
-    bool refresh = false;
-
     picture_t *next = NULL;
     if (first)
     {
         next = PreparePicture(vout, true, false);
-        if (!next)
-            return vlc_tick_now() + VOUT_REDISPLAY_DELAY; /* Unknown deadline */
     }
     else if (!paused)
     {
@@ -1410,46 +1396,45 @@ static vlc_tick_t DisplayPicture(vout_thread_sys_t *vout)
         }
     }
 
-    vlc_tick_t date_refresh = VLC_TICK_MAX;
-
     if (next != NULL)
     {
-        const vlc_tick_t swap_next_pts =
-            vlc_clock_ConvertToSystem(sys->clock, vlc_tick_now(),
-                                        next->date, sys->rate);
-        if (likely(swap_next_pts != VLC_TICK_MAX))
-            date_refresh = swap_next_pts - render_delay;
-
-        // next frame will still need some waiting before display
-        render_now = false;
-
         if (likely(sys->displayed.current != NULL))
             picture_Release(sys->displayed.current);
         sys->displayed.current = next;
+
+        // next frame will still need some waiting before display, we don't need
+        // to render now
+        // display forced picture immediately
+        bool render_now = sys->displayed.current->b_force;
+
+        RenderPicture(vout, render_now);
+        if (!render_now)
+            /* Prepare the next picture immediately without waiting */
+            return VLC_TICK_INVALID;
     }
     else if (likely(sys->displayed.date != VLC_TICK_INVALID))
     {
         // next date we need to display again the current picture
-        date_refresh = sys->displayed.date + VOUT_REDISPLAY_DELAY - render_delay;
-        refresh = date_refresh <= system_now;
-        render_now = refresh;
-    }
-
-    if (!first && !refresh && next == NULL) {
-        // nothing changed, wait until the next deadline or a control
-        vlc_tick_t max_deadline = vlc_tick_now() + VOUT_REDISPLAY_DELAY;
-        return __MIN(date_refresh, max_deadline);
+        vlc_tick_t date_refresh = sys->displayed.date + VOUT_REDISPLAY_DELAY - render_delay;
+        /* FIXME/XXX we must redisplay the last decoded picture (because
+        * of potential vout updated, or filters update or SPU update)
+        * For now a high update period is needed but it could be removed
+        * if and only if:
+        * - vout module emits events from themselves.
+        * - *and* SPU is modified to emit an event or a deadline when needed.
+        *
+        * So it will be done later.
+        */
+        if (date_refresh > system_now) {
+            // nothing changed, wait until the next deadline or a control
+            vlc_tick_t max_deadline = vlc_tick_now() + VOUT_REDISPLAY_DELAY;
+            return __MIN(date_refresh, max_deadline);
+        }
+        RenderPicture(vout, true);
     }
 
-    /* display the picture immediately */
-    render_now |= sys->displayed.current->b_force;
-
-    RenderPicture(vout, render_now);
-    if (render_now)
-        return vlc_tick_now() + VOUT_REDISPLAY_DELAY;
-
-    /* Prepare the next picture immediately without waiting */
-    return VLC_TICK_INVALID;
+    // wait until the next deadline or a control
+    return vlc_tick_now() + VOUT_REDISPLAY_DELAY;
 }
 
 void vout_ChangePause(vout_thread_t *vout, bool is_paused, vlc_tick_t date)