[vlc-commits] video_output: set interlacing.has_deint when deinterlacing changes

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Aug 19 07:51:21 2020 +0200| [b125e51be9039909bda6691e903469476baf0b19] | committer: Steve Lhomme

video_output: set interlacing.has_deint when deinterlacing changes

Before calling ThreadChangeFilters().

No need to pass a value for deinterlacing anymore.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b125e51be9039909bda6691e903469476baf0b19
---

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

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 7c5fe1b612..59eba1880b 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -957,8 +957,7 @@ typedef struct {
     config_chain_t *cfg;
 } vout_filter_t;
 
-static void ThreadChangeFilters(vout_thread_sys_t *vout,
-                                const bool *new_deinterlace)
+static void ThreadChangeFilters(vout_thread_sys_t *vout)
 {
     vout_thread_sys_t *sys = vout;
     ThreadFilterFlush(vout, true);
@@ -970,9 +969,6 @@ static void ThreadChangeFilters(vout_thread_sys_t *vout,
     vlc_array_init(&array_static);
     vlc_array_init(&array_interactive);
 
-    if (new_deinterlace != NULL)
-        sys->private.interlacing.has_deint = *new_deinterlace;
-
     if (sys->private.interlacing.has_deint)
     {
         vout_filter_t *e = malloc(sizeof(*e));
@@ -1134,7 +1130,7 @@ static int ThreadDisplayPreparePicture(vout_thread_sys_t *vout, bool reuse,
                         vlc_video_context_Release(sys->filter.src_vctx);
                     sys->filter.src_vctx = pic_vctx ? vlc_video_context_Hold(pic_vctx) : NULL;
 
-                    ThreadChangeFilters(vout, NULL);
+                    ThreadChangeFilters(vout);
                 }
             }
         }
@@ -1484,7 +1480,8 @@ static int ThreadDisplayPicture(vout_thread_sys_t *vout, vlc_tick_t *deadline)
     if (sys->filter.changed ||
         sys->private.interlacing.has_deint != sys->filter.new_interlaced)
     {
-        ThreadChangeFilters(vout, &sys->filter.new_interlaced);
+        sys->private.interlacing.has_deint = sys->filter.new_interlaced;
+        ThreadChangeFilters(vout);
     }
     vlc_mutex_unlock(&sys->filter.lock);