picture_pool: remove ..._Delete(), use ..._Release() directly

include/vlc_picture_pool.h

@@ -86,7 +86,7 @@ VLC_API picture_pool_t * picture_pool_NewFromFormat(const video_format_t *,
  * All pictures must already be released to the pool. The pool will then
  * released them.
  */
-VLC_API void picture_pool_Delete( picture_pool_t * );
+VLC_API void picture_pool_Release( picture_pool_t * );
 
 /**
  * It retreives a picture_t from a pool.

modules/codec/omxil/vout.c

@@ -374,7 +374,7 @@ static void Close(vlc_object_t *p_this)
     }
 
     if (p_sys->pool)
-        picture_pool_Delete(p_sys->pool);
+        picture_pool_Release(p_sys->pool);
     free(p_sys);
     DeinitOmxCore();
 }

modules/hw/mmal/deinterlace.c

@@ -326,7 +326,7 @@ static void Close(filter_t *filter)
         mmal_component_release(sys->component);
 
     if (sys->picture_pool)
-        picture_pool_Delete(sys->picture_pool);
+        picture_pool_Release(sys->picture_pool);
 
     vlc_mutex_destroy(&sys->mutex);
     free(sys->pictures);

modules/hw/mmal/vout.c

@@ -348,7 +348,7 @@ static void Close(vlc_object_t *object)
         mmal_component_release(sys->component);
 
     if (sys->picture_pool)
-        picture_pool_Delete(sys->picture_pool);
+        picture_pool_Release(sys->picture_pool);
     else
         for (i = 0; i < sys->num_buffers; ++i)
             if (sys->pictures[i])

modules/hw/vdpau/display.c

@@ -153,7 +153,7 @@ static void PoolFree(vout_display_t *vd, picture_pool_t *pool)
 
     if (sys->current != NULL)
         picture_Release(sys->current);
-    picture_pool_Delete(pool);
+    picture_pool_Release(pool);
 }
 
 static picture_pool_t *Pool(vout_display_t *vd, unsigned requested_count)

modules/video_output/aa.c

@@ -159,7 +159,7 @@ static void Close(vlc_object_t *object)
     vout_display_sys_t *sys = vd->sys;
 
     if (sys->pool)
-        picture_pool_Delete(sys->pool);
+        picture_pool_Release(sys->pool);
     aa_close(sys->aa_context);
     free(sys);
 }
@@ -242,7 +242,7 @@ static int Control(vout_display_t *vd, int query, va_list args)
 
     case VOUT_DISPLAY_RESET_PICTURES:
         if (sys->pool)
-            picture_pool_Delete(sys->pool);
+            picture_pool_Release(sys->pool);
         sys->pool = NULL;
 
         vd->fmt.i_width  = aa_imgwidth(sys->aa_context);

modules/video_output/android/opaque.c

@@ -263,7 +263,7 @@ static void Close(vlc_object_t *p_this)
     vout_display_t *vd = (vout_display_t *)p_this;
     vout_display_sys_t *sys = vd->sys;
 
-    picture_pool_Delete(sys->pool);
+    picture_pool_Release(sys->pool);
     if (sys->window)
         sys->native_window.winRelease(sys->window);
     dlclose(sys->p_library);

modules/video_output/android/surface.c

@@ -300,7 +300,7 @@ static void Close(vlc_object_t *p_this)
     vout_display_t *vd = (vout_display_t *)p_this;
     vout_display_sys_t *sys = vd->sys;
 
-    picture_pool_Delete(sys->pool);
+    picture_pool_Release(sys->pool);
     if (sys->window)
         sys->native_window.winRelease(sys->window);
     dlclose(sys->p_library);

modules/video_output/caca.c

@@ -207,7 +207,7 @@ static int Open(vlc_object_t *object)
 error:
     if (sys) {
         if (sys->pool)
-            picture_pool_Delete(sys->pool);
+            picture_pool_Release(sys->pool);
         if (sys->dither)
             cucul_free_dither(sys->dither);
         if (sys->dp)
@@ -232,7 +232,7 @@ static void Close(vlc_object_t *object)
     vout_display_sys_t *sys = vd->sys;
 
     if (sys->pool)
-        picture_pool_Delete(sys->pool);
+        picture_pool_Release(sys->pool);
     if (sys->dither)
         cucul_free_dither(sys->dither);
     caca_free_display(sys->dp);

modules/video_output/decklink.cpp

@@ -765,7 +765,7 @@ static void CloseVideo(vlc_object_t *p_this)
     vout_display_sys_t *sys = vd->sys;
 
     if (sys->pool)
-        picture_pool_Delete(sys->pool);
+        picture_pool_Release(sys->pool);
 
     if (sys->pic_nosignal)
         picture_Release(sys->pic_nosignal);

modules/video_output/directfb.c

@@ -173,7 +173,7 @@ static void Close(vlc_object_t *object)
     vout_display_sys_t *sys = vd->sys;
 
     if (sys->pool)
-        picture_pool_Delete(sys->pool);
+        picture_pool_Release(sys->pool);
 
     IDirectFBSurface *primary = sys->primary;
     if (primary)

modules/video_output/fb.c

@@ -330,7 +330,7 @@ static void Close(vlc_object_t *object)
     vout_display_sys_t *sys = vd->sys;
 
     if (sys->pool)
-        picture_pool_Delete(sys->pool);
+        picture_pool_Release(sys->pool);
     if (!sys->is_hw_accel && sys->picture)
         picture_Release(sys->picture);
 

modules/video_output/kva.c

@@ -359,7 +359,7 @@ static void Close ( vlc_object_t *object )
     DosWaitThread( &sys->tid, DCWW_WAIT );
 
     if( sys->pool )
-        picture_pool_Delete( sys->pool );
+        picture_pool_Release( sys->pool );
 
     DosCloseEventSem( sys->ack_event );
 

modules/video_output/msw/direct2d.c

@@ -173,7 +173,7 @@ static void Close(vlc_object_t *object)
     D2D_DestroyRenderTarget(vd);
 
     if (vd->sys->pool)
-        picture_pool_Delete(vd->sys->pool);
+        picture_pool_Release(vd->sys->pool);
 
     CommonClean(vd);
 

modules/video_output/msw/direct3d.c

@@ -1032,7 +1032,7 @@ static void Direct3DDestroyPool(vout_display_t *vd)
         IDirect3DSurface9_Release(picsys->surface);
         if (picsys->fallback)
             picture_Release(picsys->fallback);
-        picture_pool_Delete(sys->pool);
+        picture_pool_Release(sys->pool);
     }
     sys->pool = NULL;
 }

modules/video_output/msw/directx.c

@@ -1273,7 +1273,7 @@ static void DirectXDestroyPool(vout_display_t *vd)
 
     if (sys->pool) {
         DirectXDestroyPictureResource(vd);
-        picture_pool_Delete(sys->pool);
+        picture_pool_Release(sys->pool);
     }
     sys->pool = NULL;
 }

modules/video_output/msw/wingdi.c

@@ -305,7 +305,7 @@ static void Clean(vout_display_t *vd)
     vout_display_sys_t *sys = vd->sys;
 
     if (sys->pool)
-        picture_pool_Delete(sys->pool);
+        picture_pool_Release(sys->pool);
     sys->pool = NULL;
 
     if (sys->off_dc)

modules/video_output/opengl.c

@@ -750,7 +750,7 @@ void vout_display_opengl_Delete(vout_display_opengl_t *vgl)
         vlc_gl_Unlock(vgl->gl);
     }
     if (vgl->pool)
-        picture_pool_Delete(vgl->pool);
+        picture_pool_Release(vgl->pool);
     free(vgl);
 }
 

modules/video_output/sdl.c

@@ -371,7 +371,7 @@ static void Close(vlc_object_t *object)
     vout_display_sys_t *sys = vd->sys;
 
     if (sys->pool)
-        picture_pool_Delete(sys->pool);
+        picture_pool_Release(sys->pool);
 
     if (sys->overlay) {
         SDL_LockYUVOverlay(sys->overlay);
@@ -537,7 +537,7 @@ static int Control(vout_display_t *vd, int query, va_list args)
 
         /* */
         if (sys->pool)
-            picture_pool_Delete(sys->pool);
+            picture_pool_Release(sys->pool);
         sys->pool = NULL;
 
         vout_display_PlacePicture(&sys->place, &vd->source, vd->cfg, !sys->overlay);

modules/video_output/vdummy.c

@@ -125,7 +125,7 @@ static void Close(vlc_object_t *object)
     vout_display_sys_t *sys = vd->sys;
 
     if (sys->pool)
-        picture_pool_Delete(sys->pool);
+        picture_pool_Release(sys->pool);
     free(sys);
 }
 

modules/video_output/vmem.c

@@ -240,7 +240,7 @@ static void Close(vlc_object_t *object)
 
     if (sys->cleanup)
         sys->cleanup(sys->opaque);
-    picture_pool_Delete(sys->pool);
+    picture_pool_Release(sys->pool);
     free(sys);
 }
 

modules/video_output/wayland/shm.c

@@ -234,7 +234,7 @@ static void ResetPictures(vout_display_t *vd)
     if (sys->pool == NULL)
         return;
 
-    picture_pool_Delete(sys->pool);
+    picture_pool_Release(sys->pool);
     sys->pool = NULL;
 }
 

modules/video_output/xcb/x11.c

@@ -544,6 +544,6 @@ static void ResetPictures (vout_display_t *vd)
         for (unsigned i = 0; i < MAX_PICTURES; i++)
             xcb_shm_detach (sys->conn, sys->seg_base + i);
 
-    picture_pool_Delete (sys->pool);
+    picture_pool_Release (sys->pool);
     sys->pool = NULL;
 }

modules/video_output/xcb/xvideo.c

@@ -605,7 +605,7 @@ static void Close (vlc_object_t *obj)
     vout_display_sys_t *p_sys = vd->sys;
 
     if (p_sys->pool)
-        picture_pool_Delete (p_sys->pool);
+        picture_pool_Release (p_sys->pool);
 
     /* show the default cursor */
     xcb_change_window_attributes (p_sys->conn, p_sys->embed->handle.xid, XCB_CW_CURSOR,

modules/video_output/yuv.c

@@ -182,7 +182,7 @@ static void Close(vlc_object_t *object)
     vout_display_sys_t *sys = vd->sys;
 
     if (sys->pool)
-        picture_pool_Delete(sys->pool);
+        picture_pool_Release(sys->pool);
     fclose(sys->f);
     free(sys);
 }

src/libvlccore.sym

@@ -301,7 +301,7 @@ picture_fifo_Push
 picture_New
 picture_NewFromFormat
 picture_NewFromResource
-picture_pool_Delete
+picture_pool_Release
 picture_pool_Get
 picture_pool_GetSize
 picture_pool_New

src/misc/picture_pool.c

@@ -56,7 +56,7 @@ struct picture_pool_t {
     vlc_mutex_t lock;
 };
 
-static void picture_pool_Release(picture_pool_t *pool)
+void picture_pool_Release(picture_pool_t *pool)
 {
     bool destroy;
 
@@ -231,11 +231,6 @@ error:
     return NULL;
 }
 
-void picture_pool_Delete(picture_pool_t *pool)
-{
-    picture_pool_Release(pool);
-}
-
 picture_t *picture_pool_Get(picture_pool_t *pool)
 {
     vlc_mutex_lock(&pool->lock);

src/test/picture_pool.c

@@ -85,8 +85,8 @@ static void test(bool zombie)
         for (unsigned i = 0; i < PICTURES; i++)
             picture_Release(pics[i]);
 
-    picture_pool_Delete(reserve);
-    picture_pool_Delete(pool);
+    picture_pool_Release(reserve);
+    picture_pool_Release(pool);
 
     if (zombie)
         for (unsigned i = 0; i < PICTURES; i++)
@@ -104,8 +104,8 @@ int main(void)
     reserve = picture_pool_Reserve(pool, PICTURES / 2);
     assert(reserve != NULL);
 
-    picture_pool_Delete(reserve);
-    picture_pool_Delete(pool);
+    picture_pool_Release(reserve);
+    picture_pool_Release(pool);
 
     test(false);
     test(true);

src/video_output/display.c

@@ -1482,7 +1482,7 @@ static void SplitterClose(vout_display_t *vd)
     video_splitter_Delete(splitter);
 
     if (sys->pool)
-        picture_pool_Delete(sys->pool);
+        picture_pool_Release(sys->pool);
 
     /* */
     for (int i = 0; i < sys->count; i++)

src/video_output/video_output.c

@@ -1185,7 +1185,7 @@ static void ThreadReset(vout_thread_t *vout)
 
         if (vout->p->private_pool != NULL) {
             count = picture_pool_GetSize(vout->p->private_pool);
-            picture_pool_Delete(vout->p->private_pool);
+            picture_pool_Release(vout->p->private_pool);
         }
 
         leaks = picture_pool_Reset(vout->p->decoder_pool);

src/video_output/vout_wrapper.c

@@ -167,10 +167,10 @@ void vout_EndWrapper(vout_thread_t *vout)
 
     assert(!sys->display.filtered);
     if (sys->private_pool)
-        picture_pool_Delete(sys->private_pool);
+        picture_pool_Release(sys->private_pool);
 
     if (sys->decoder_pool != sys->display_pool)
-        picture_pool_Delete(sys->decoder_pool);
+        picture_pool_Release(sys->decoder_pool);
 }
 
 /*****************************************************************************