[vlc-devel] [PATCH 4/5] video_output: remove unused vout_GetPicture

Steve Lhomme robux4 at ycbcr.xyz
Fri Aug 14 10:25:38 CEST 2020


---
 include/vlc_vout.h              |  1 -
 src/libvlccore.sym              |  1 -
 src/video_output/video_output.c | 23 -----------------------
 3 files changed, 25 deletions(-)

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 64bc35012f3..a10bf42266d 100644
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -119,7 +119,6 @@ VLC_API int vout_GetSnapshot( vout_thread_t *p_vout,
                               const char *psz_format, vlc_tick_t i_timeout );
 
 /* */
-VLC_API picture_t * vout_GetPicture( vout_thread_t * );
 VLC_API void vout_PutPicture( vout_thread_t *, picture_t * );
 
 /* Subpictures channels ID */
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index ed43c17715c..c729a58d830 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -694,7 +694,6 @@ vlm_New
 vout_Close
 vout_Hold
 vout_Release
-vout_GetPicture
 vout_PutPicture
 vout_PutSubpicture
 vout_RegisterSubpictureChannel
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 30bcd43678a..3f75c81844d 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -455,32 +455,9 @@ void vout_SetSpuHighlight( vout_thread_t *vout,
         spu_SetHighlight(sys->spu, spu_hl);
 }
 
-/**
- * Allocates a video output picture buffer.
- *
- * Either vout_PutPicture() or picture_Release() must be used to return the
- * buffer to the video output free buffer pool.
- *
- * You may use picture_Hold() (paired with picture_Release()) to keep a
- * read-only reference.
- */
-picture_t *vout_GetPicture(vout_thread_t *vout)
-{
-    vout_thread_sys_t *sys = VOUT_THREAD_TO_SYS(vout);
-    assert(!sys->dummy);
-    picture_t *picture = picture_pool_Wait(sys->private.display_pool);
-    if (likely(picture != NULL)) {
-        picture_Reset(picture);
-        video_format_CopyCropAr(&picture->format, &sys->original);
-    }
-    return picture;
-}
-
 /**
  * It gives to the vout a picture to be displayed.
  *
- * The given picture MUST comes from vout_GetPicture.
- *
  * Becareful, after vout_PutPicture is called, picture_t::p_next cannot be
  * read/used.
  */
-- 
2.26.2



More information about the vlc-devel mailing list