[vlc-devel] [PATCH 5/5] video_output: remove the unused display pool

[Steve Lhomme]

All decoders and filters use their own pool/allocator.
---
 src/video_output/video_output.c |  7 -------
 src/video_output/vout_private.h |  2 --
 src/video_output/vout_wrapper.c | 14 --------------
 3 files changed, 23 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 3f75c81844d..44595ad5cd9 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1691,7 +1691,6 @@ static int vout_Start(vout_thread_sys_t *vout, vlc_video_context *vctx, const vo
     vlc_mouse_Init(&sys->mouse);
 
     sys->decoder_fifo = picture_fifo_New();
-    sys->private.display_pool = NULL;
 
     sys->filter.configuration = NULL;
     video_format_Copy(&sys->filter.src_fmt, &sys->original);
@@ -1772,8 +1771,6 @@ static int vout_Start(vout_thread_sys_t *vout, vlc_video_context *vctx, const vo
         vout_SetDisplayAspect(sys->display, num, den);
     vlc_mutex_unlock(&sys->display_lock);
 
-    assert(sys->private.display_pool != NULL);
-
     sys->displayed.current       = NULL;
     sys->displayed.next          = NULL;
     sys->displayed.decoded       = NULL;
@@ -1877,9 +1874,6 @@ static void vout_ReleaseDisplay(vout_thread_sys_t *vout)
         filter_DeleteBlend(sys->spu_blend);
 
     /* Destroy the rendering display */
-    if (sys->private.display_pool != NULL)
-        vout_FlushUnlocked(vout, true, INT64_MAX);
-
     vlc_mutex_lock(&sys->display_lock);
     vout_CloseWrapper(&vout->obj, &sys->private, sys->display);
     sys->display = NULL;
@@ -1902,7 +1896,6 @@ static void vout_ReleaseDisplay(vout_thread_sys_t *vout)
         picture_fifo_Delete(sys->decoder_fifo);
         sys->decoder_fifo = NULL;
     }
-    assert(sys->private.display_pool == NULL);
 
     if (sys->mouse_event)
         sys->mouse_event(NULL, sys->mouse_opaque);
diff --git a/src/video_output/vout_private.h b/src/video_output/vout_private.h
index cb4c0bde6a8..04557fcdfd6 100644
--- a/src/video_output/vout_private.h
+++ b/src/video_output/vout_private.h
@@ -42,8 +42,6 @@ struct vout_thread_private_t
         bool        has_deint;
         vlc_tick_t  date;
     } interlacing;
-
-    picture_pool_t  *display_pool;
 };
 
 /* */
diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index 6e751f4c238..21a8a080aaf 100644
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -83,16 +83,6 @@ vout_display_t *vout_OpenWrapper(vout_thread_t *vout, vout_thread_private_t *sys
     const unsigned reserved_picture = DISPLAY_PICTURE_COUNT +
                                       kept_picture;
 
-    sys->display_pool = vout_GetPool(vd, reserved_picture);
-    if (sys->display_pool == NULL)
-        goto error;
-
-#ifndef NDEBUG
-    if ( picture_pool_GetSize(sys->display_pool) < reserved_picture )
-        msg_Warn(vout, "Not enough display buffers in the pool, requested %u got %u",
-                 reserved_picture, picture_pool_GetSize(sys->display_pool));
-#endif
-
 #ifdef _WIN32
     var_Create(vout, "video-wallpaper", VLC_VAR_BOOL|VLC_VAR_DOINHERIT);
     var_AddCallback(vout, "video-wallpaper", Forward, vd);
@@ -111,10 +101,6 @@ error:
  *****************************************************************************/
 void vout_CloseWrapper(vout_thread_t *vout, vout_thread_private_t *sys, vout_display_t *vd)
 {
-    assert(sys->display_pool);
-
-    sys->display_pool = NULL;
-
 #ifdef _WIN32
     var_DelCallback(vout, "video-wallpaper", Forward, vd);
 #endif
-- 
2.26.2