[vlc-commits] [Git][videolan/vlc][master] 2 commits: vout: fix code style

[Romain Vimont (@rom1v)]

Romain Vimont pushed to branch master at VideoLAN / VLC


Commits:
203c06bf by Romain Vimont at 2022-01-14T11:53:15+00:00
vout: fix code style

- - - - -
f37fcb13 by Romain Vimont at 2022-01-14T11:53:15+00:00
vout: ignore RenderPicture() failure

Even if RenderPicture() returns an error, this is not a reason to
increase the deadline of the next rendering.

- - - - -


1 changed file:

- src/video_output/video_output.c


Changes:

=====================================
src/video_output/video_output.c
=====================================
@@ -1258,7 +1258,8 @@ static int RenderPicture(vout_thread_sys_t *sys, bool render_now)
             vlc_clock_Lock(sys->clock);
 
             bool timed_out = false;
-            while (!timed_out) {
+            while (!timed_out)
+            {
                 vlc_tick_t deadline;
                 if (vlc_clock_IsPaused(sys->clock))
                     deadline = max_deadline;
@@ -1272,7 +1273,7 @@ static int RenderPicture(vout_thread_sys_t *sys, bool render_now)
 
                 system_pts = deadline;
                 timed_out = vlc_clock_Wait(sys->clock, deadline);
-            };
+            }
 
             vlc_clock_Unlock(sys->clock);
         }
@@ -1417,8 +1418,8 @@ static vlc_tick_t DisplayPicture(vout_thread_sys_t *vout)
     /* display the picture immediately */
     render_now |= sys->displayed.current->b_force;
 
-    int ret = RenderPicture(vout, render_now);
-    if (render_now || ret != VLC_SUCCESS)
+    RenderPicture(vout, render_now);
+    if (render_now)
         return vlc_tick_now() + VOUT_REDISPLAY_DELAY;
 
     /* Prepare the next picture immediately without waiting */



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/da971f893c49a87c10aff2f1246ac4dea00796ee...f37fcb13798849686808ed0b33c45b46b4f138ad

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/da971f893c49a87c10aff2f1246ac4dea00796ee...f37fcb13798849686808ed0b33c45b46b4f138ad
You're receiving this email because of your account on code.videolan.org.