[vlc-devel] [PATCH 2/4] display: remove unused vout_display_SendEventPicturesInvalid()

[Steve Lhomme]

And related internal variable/functions.
---
 include/vlc_vout_display.h |  2 --
 src/libvlccore.sym         |  1 -
 src/video_output/display.c | 50 +++++---------------------------------
 3 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index 2a0b593a13e..96f582a609c 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -430,8 +430,6 @@ static inline void vout_display_Display(vout_display_t *vd, picture_t *picture)
 VLC_API
 void vout_display_SetSize(vout_display_t *vd, unsigned width, unsigned height);
 
-VLC_API void vout_display_SendEventPicturesInvalid(vout_display_t *vd);
-
 static inline void vout_display_SendEventMousePressed(vout_display_t *vd, int button)
 {
     vout_window_ReportMousePressed(vd->cfg->window, button);
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 2b750873fcd..31fcd37cbab 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -722,7 +722,6 @@ vout_window_ReportWindowed
 vout_window_ReportFullscreen
 vout_display_GetDefaultDisplaySize
 vout_display_PlacePicture
-vout_display_SendEventPicturesInvalid
 vout_display_New
 vout_display_Delete
 vout_display_Prepare
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 0112425ac14..2d05d8e9325 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -305,9 +305,6 @@ typedef struct {
      /* filters to convert the vout source to fmt, NULL means no conversion
       * can be done and nothing will be displayed */
     filter_chain_t *converters;
-#ifdef _WIN32
-    bool reset_pictures; // set/read under the same lock as the control
-#endif
     picture_pool_t *pool;
 } vout_display_priv_t;
 
@@ -385,19 +382,6 @@ static int VoutDisplayCreateRender(vout_display_t *vd)
     return ret;
 }
 
-void vout_display_SendEventPicturesInvalid(vout_display_t *vd)
-{
-#ifdef _WIN32
-    vout_display_priv_t *osys = container_of(vd, vout_display_priv_t, display);
-
-    msg_Err(vd, "picture buffers invalidated asynchronously");
-    osys->reset_pictures = true;
-#else
-    (void) vd;
-    vlc_assert_unreachable();
-#endif
-}
-
 static void VoutDisplayCropRatio(int *left, int *top, int *right, int *bottom,
                                  const video_format_t *source,
                                  unsigned num, unsigned den)
@@ -472,10 +456,6 @@ static void vout_display_Reset(vout_display_t *vd)
 {
     vout_display_priv_t *osys = container_of(vd, vout_display_priv_t, display);
 
-#ifdef _WIN32
-    osys->reset_pictures = false;
-#endif
-
     if (osys->converters != NULL) {
         filter_chain_Delete(osys->converters);
         osys->converters = NULL;
@@ -492,18 +472,6 @@ static void vout_display_Reset(vout_display_t *vd)
         msg_Err(vd, "Failed to adjust render format");
 }
 
-static bool vout_display_CheckReset(vout_display_t *vd)
-{
-#ifdef _WIN32
-    vout_display_priv_t *osys = container_of(vd, vout_display_priv_t, display);
-
-    return osys->reset_pictures;
-#else
-    VLC_UNUSED(vd);
-#endif
-    return false;
-}
-
 static int vout_UpdateSourceCrop(vout_display_t *vd)
 {
     vout_display_priv_t *osys = container_of(vd, vout_display_priv_t, display);
@@ -627,7 +595,7 @@ void vout_UpdateDisplaySourceProperties(vout_display_t *vd, const video_format_t
         err2 = vout_UpdateSourceCrop(vd);
     }
 
-    if (err1 || err2 || vout_display_CheckReset(vd))
+    if (err1 || err2)
         vout_display_Reset(vd);
 }
 
@@ -637,8 +605,7 @@ void vout_display_SetSize(vout_display_t *vd, unsigned width, unsigned height)
 
     osys->cfg.display.width  = width;
     osys->cfg.display.height = height;
-    if (vout_display_Control(vd, VOUT_DISPLAY_CHANGE_DISPLAY_SIZE, &osys->cfg)
-        || vout_display_CheckReset(vd))
+    if (vout_display_Control(vd, VOUT_DISPLAY_CHANGE_DISPLAY_SIZE, &osys->cfg))
         vout_display_Reset(vd);
 }
 
@@ -651,7 +618,7 @@ void vout_SetDisplayFilled(vout_display_t *vd, bool is_filled)
 
     osys->cfg.is_display_filled = is_filled;
     if (vout_display_Control(vd, VOUT_DISPLAY_CHANGE_DISPLAY_FILLED,
-                             &osys->cfg) || vout_display_CheckReset(vd))
+                             &osys->cfg))
         vout_display_Reset(vd);
 }
 
@@ -665,8 +632,7 @@ void vout_SetDisplayZoom(vout_display_t *vd, unsigned num, unsigned den)
 
     osys->cfg.zoom.num = num;
     osys->cfg.zoom.den = den;
-    if (vout_display_Control(vd, VOUT_DISPLAY_CHANGE_ZOOM, &osys->cfg) ||
-        vout_display_CheckReset(vd))
+    if (vout_display_Control(vd, VOUT_DISPLAY_CHANGE_ZOOM, &osys->cfg))
         vout_display_Reset(vd);
 }
 
@@ -684,8 +650,7 @@ void vout_SetDisplayAspect(vout_display_t *vd, unsigned dar_num, unsigned dar_de
         sar_den = 0;
     }
 
-    if (vout_SetSourceAspect(vd, sar_num, sar_den) ||
-        vout_display_CheckReset(vd))
+    if (vout_SetSourceAspect(vd, sar_num, sar_den))
         vout_display_Reset(vd);
 }
 
@@ -707,7 +672,7 @@ void vout_SetDisplayCrop(vout_display_t *vd,
         osys->crop.num    = crop_num;
         osys->crop.den    = crop_den;
 
-        if (vout_UpdateSourceCrop(vd)|| vout_display_CheckReset(vd))
+        if (vout_UpdateSourceCrop(vd))
             vout_display_Reset(vd);
     }
 }
@@ -756,9 +721,6 @@ vout_display_t *vout_display_New(vlc_object_t *parent,
     osys->cfg.display.height = display_height;
     osys->cfg.window_props.width = osys->cfg.window_props.height = 0;
 
-#ifdef _WIN32
-    osys->reset_pictures = false;
-#endif
     osys->pool = NULL;
 
     osys->source = *source;
-- 
2.26.2