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

diff --git a/include/vlc_picture_pool.h b/include/vlc_picture_pool.h
index 7d373240c1a75d66ad876a4978ed433bb4b5172c..fe8e946320a5a47e4f709f0b3eaddc0bc26ce44c 100644 (file)
--- a/include/vlc_picture_pool.h
+++ b/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.

diff --git a/modules/codec/omxil/vout.c b/modules/codec/omxil/vout.c
index 88a8246644a8c84ca4efd377ff2e4af407e24336..a8e7740fa63f22221af3dd2b4eb8880adaa6af7a 100644 (file)
--- a/modules/codec/omxil/vout.c
+++ b/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();
 }

diff --git a/modules/hw/mmal/deinterlace.c b/modules/hw/mmal/deinterlace.c
index 58fcbb9f2fd091c34efd80ec8afee576489faa16..c290cf0e78ea7f38bc01c1db6cda123732924472 100644 (file)
--- a/modules/hw/mmal/deinterlace.c
+++ b/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);

diff --git a/modules/hw/mmal/vout.c b/modules/hw/mmal/vout.c
index f4be1a29e96cd728e6a1d9db50a94cb8c1e23ebe..adc151d77f9311eb2bbcbae3495de12c4ec46d12 100644 (file)
--- a/modules/hw/mmal/vout.c
+++ b/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])

diff --git a/modules/hw/vdpau/display.c b/modules/hw/vdpau/display.c
index 37caca38308f4f49c26d7c65ca9f617c6bde0e25..4fc2a9def75ec6cdaf467068c65f06bd4815eb7b 100644 (file)
--- a/modules/hw/vdpau/display.c
+++ b/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)

diff --git a/modules/video_output/aa.c b/modules/video_output/aa.c
index 5379185fb7da8eff42a279501ba409102d38581e..0f64ae1b0c8a4c9b948c79d1c08bc11aa2f5fc2c 100644 (file)
--- a/modules/video_output/aa.c
+++ b/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);

diff --git a/modules/video_output/android/opaque.c b/modules/video_output/android/opaque.c
index b3016344b8f309be3e7a0a8529f293476ca994a7..b06feb4af4a8e6e6a00579f3ea72333259c50988 100644 (file)
--- a/modules/video_output/android/opaque.c
+++ b/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);

diff --git a/modules/video_output/android/surface.c b/modules/video_output/android/surface.c
index ff93c7c4324f733834328ada253b248ae6fb7ecd..92e854a1b5a2ded880184ac57a1a818e596faeee 100644 (file)
--- a/modules/video_output/android/surface.c
+++ b/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);

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index c93f566971c5782930f2509b901b71295f330b9b..c082ef37e0bdd3aebac75172ef09e4daacc13154 100644 (file)
--- a/modules/video_output/caca.c
+++ b/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);

diff --git a/modules/video_output/decklink.cpp b/modules/video_output/decklink.cpp
index 5334eeed9a29017d5c60ba6bab7016cfdaadd716..95d6cff1912fa8a30930e8421a9204eeaffa4164 100644 (file)
--- a/modules/video_output/decklink.cpp
+++ b/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);

diff --git a/modules/video_output/directfb.c b/modules/video_output/directfb.c
index 5f4b3550651b80b120fe075edc610adda4f1f690..26fa0470edf3ac3fc8c65ad2f79b0696b00275f4 100644 (file)
--- a/modules/video_output/directfb.c
+++ b/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)

diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index a0a77f9011e6074dcef4356cd2514afd5e0cb54a..b860288df5612bc1f548759d242507405624fadb 100644 (file)
--- a/modules/video_output/fb.c
+++ b/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);
 

diff --git a/modules/video_output/kva.c b/modules/video_output/kva.c
index cefec9ad65de660289907c15522b02904d6d0c48..f8000c7991d657c5b4d26b8145bf0bc579ad35f1 100644 (file)
--- a/modules/video_output/kva.c
+++ b/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 );
 

diff --git a/modules/video_output/msw/direct2d.c b/modules/video_output/msw/direct2d.c
index e758afd4632007da2f89dcd8a196d4bc30f5110f..fb279d4ee2764f04e94d753f324143a7202f54b3 100644 (file)
--- a/modules/video_output/msw/direct2d.c
+++ b/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);
 

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 2f6a9c6cf3517211475b1fc66c8656785d48f328..6e141f4b9d92819624e1c1a25c673e2b99a4ce40 100644 (file)
--- a/modules/video_output/msw/direct3d.c
+++ b/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;
 }

diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c
index afaa8f8df3023791b345e2149c1334d143d8fb33..0de33f2b07225b314d872fa100ef022de27b0c6a 100644 (file)
--- a/modules/video_output/msw/directx.c
+++ b/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;
 }

diff --git a/modules/video_output/msw/wingdi.c b/modules/video_output/msw/wingdi.c
index 1886f8524eb73a8570837c8eee56428964690c8d..4f6c63906328de6d3e04665977657f7d4027eb19 100644 (file)
--- a/modules/video_output/msw/wingdi.c
+++ b/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)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 7525c4f4ceb98852a1000138be71486fdad7de01..f01b550d1fa8c009879f149a4b601f652967b79c 100644 (file)
--- a/modules/video_output/opengl.c
+++ b/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);
 }
 

diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index 990ff5a4caf312431907485b36ff013255e24a50..4206a318aba4a9e05b7d4188e05e9303bff2f5c8 100644 (file)
--- a/modules/video_output/sdl.c
+++ b/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);

diff --git a/modules/video_output/vdummy.c b/modules/video_output/vdummy.c
index 230a717ef80145343d3208d9d830e9860c122074..925897fd8d4336620e902bc9d16aa54f4f3a50bb 100644 (file)
--- a/modules/video_output/vdummy.c
+++ b/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);
 }
 

diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index 0b9efd0eb8b049bf4a7cb1cc75b9367e20609aa7..1d2783dc4c87d61e03409bd43c3c16ccaba09289 100644 (file)
--- a/modules/video_output/vmem.c
+++ b/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);
 }
 

diff --git a/modules/video_output/wayland/shm.c b/modules/video_output/wayland/shm.c
index b75edabed552ab851f7d0fa66f481f48b4af3ecb..92fa3f8af61b57830a366e11320055f607c21704 100644 (file)
--- a/modules/video_output/wayland/shm.c
+++ b/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;
 }
 

diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index df11beb4a47116acb3992122dbbe0f7039c8eb7f..44302ffbd35606e23f4775551083f580c6638367 100644 (file)
--- a/modules/video_output/xcb/x11.c
+++ b/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;
 }

diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index a4324a509f97f2ee684965373527b9999e90346e..bddc52b8f406e74989e74313c71412228f43c432 100644 (file)
--- a/modules/video_output/xcb/xvideo.c
+++ b/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,

diff --git a/modules/video_output/yuv.c b/modules/video_output/yuv.c
index 7eedcc99b2a73b5ff7c5cd1ef8b5876e6dd5ea46..9239bafb13eec57d7986f274f22989102dacbe68 100644 (file)
--- a/modules/video_output/yuv.c
+++ b/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);
 }

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 95952631914517d8a8c6231cf03647ea4f91e349..dcf591df06f5cea7ca53bb7932bc066dc06ff52b 100644 (file)
--- a/src/libvlccore.sym
+++ b/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

diff --git a/src/misc/picture_pool.c b/src/misc/picture_pool.c
index ce25461d48da5a7e781e1d1bfc7b84026e1386e1..53118a2ca8abe97527eea8a43c28b22ab58b2c0f 100644 (file)
--- a/src/misc/picture_pool.c
+++ b/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);

diff --git a/src/test/picture_pool.c b/src/test/picture_pool.c
index f5d4542ba87ac71cdae9a3e0fa281e6ebfc6bb70..93d70c02568671d9c95e8daa1adea436005f52b4 100644 (file)
--- a/src/test/picture_pool.c
+++ b/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);

diff --git a/src/video_output/display.c b/src/video_output/display.c
index ae2b8e3fb567898775df769908f5dfd02f56bfee..4c1b1333cf02d5cac33bcb39754d5f5a0cb14cef 100644 (file)
--- a/src/video_output/display.c
+++ b/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++)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 411b66f8ac244637070a226dc7a825972a2e62cb..2a6fe2af3f6c9daec0cfa2c6b0c6be2e7d91937e 100644 (file)
--- a/src/video_output/video_output.c
+++ b/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);

diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index 2e24d63be4f86e0685c4763e983de7c50f1d72c9..d172bcca0bfdacc9ebc5c7979a1f10850e7092c9 100644 (file)
--- a/src/video_output/vout_wrapper.c
+++ b/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);
 }
 
 /*****************************************************************************