[vlc-commits] [Git][videolan/vlc][master] 4 commits: vlc_vout_display: remove unused vlc_picture_pool include

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
8f621cbe by Steve Lhomme at 2022-03-23T19:42:26+00:00
vlc_vout_display: remove unused vlc_picture_pool include

- - - - -
7582609a by Steve Lhomme at 2022-03-23T19:42:26+00:00
nvdec: remove unused includes

- - - - -
50404ced by Steve Lhomme at 2022-03-23T19:42:26+00:00
mmal: remove unused picture pool code

pic_pool is always NULL

- - - - -
9c6922e9 by Steve Lhomme at 2022-03-23T19:42:26+00:00
egl_surfacetexture: add missing vlc_picture_pool.h include

- - - - -


4 changed files:

- include/vlc_vout_display.h
- modules/hw/mmal/vout.c
- modules/hw/nvdec/nvdec.c
- modules/video_filter/egl_surfacetexture.c


Changes:

=====================================
include/vlc_vout_display.h
=====================================
@@ -25,7 +25,6 @@
 
 #include <vlc_es.h>
 #include <vlc_picture.h>
-#include <vlc_picture_pool.h>
 #include <vlc_subpicture.h>
 #include <vlc_actions.h>
 #include <vlc_mouse.h>


=====================================
modules/hw/mmal/vout.c
=====================================
@@ -126,8 +126,6 @@ typedef struct vout_display_sys_t {
     // included with the main pic
     MMAL_BUFFER_HEADER_T * subpic_bufs[SUBS_MAX];
 
-    picture_pool_t * pic_pool;
-
     struct vout_isp_conf_s {
         MMAL_COMPONENT_T *component;
         MMAL_PORT_T * input;
@@ -585,14 +583,6 @@ static int configure_display(vout_display_t *vd, const video_format_t *fmt)
     return 0;
 }
 
-static void kill_pool(vout_display_sys_t * const sys)
-{
-    if (sys->pic_pool != NULL) {
-        picture_pool_Release(sys->pic_pool);
-        sys->pic_pool = NULL;
-    }
-}
-
 static void vd_display(vout_display_t *vd, picture_t *p_pic)
 {
     vout_display_sys_t * const sys = vd->sys;
@@ -691,7 +681,6 @@ static int vd_reset_pictures(vout_display_t *vd, video_format_t *fmt)
 {
     vout_display_sys_t * const sys = vd->sys;
     msg_Warn(vd, "Reset Pictures");
-    kill_pool(sys);
     *fmt = *vd->source; // Take (nearly) whatever source wants to give us
     fmt->i_chroma = req_chroma(fmt);  // Adjust chroma to something we can actually deal with
     return VLC_SUCCESS;
@@ -1006,8 +995,6 @@ static void CloseMmalVout(vout_display_t * vd)
     vout_display_sys_t * const sys = vd->sys;
     char response[20]; /* answer is hvs_update_fields=%1d */
 
-    kill_pool(sys);
-
     vc_tv_unregister_callback_full(tvservice_cb, vd);
 
     // Shouldn't be anything here - but just in case


=====================================
modules/hw/nvdec/nvdec.c
=====================================
@@ -28,8 +28,6 @@
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_messages.h>
-#include <vlc_picture_pool.h>
-#include <vlc_atomic.h>
 
 #define FFNV_LOG_FUNC(logctx, msg, ...)        msg_Err((vlc_object_t*)logctx, msg, __VA_ARGS__)
 #define FFNV_DEBUG_LOG_FUNC(logctx, msg, ...)  msg_Dbg((vlc_object_t*)logctx, msg, __VA_ARGS__)


=====================================
modules/video_filter/egl_surfacetexture.c
=====================================
@@ -28,6 +28,7 @@
 #include <vlc_filter.h>
 #include <vlc_opengl.h>
 #include <vlc_vout_display.h>
+#include <vlc_picture_pool.h>
 #include <vlc_atomic.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/ee3f780e520b9445e528f1547a153b197ea725ed...9c6922e93552525656c4e805b41db24552790358

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/ee3f780e520b9445e528f1547a153b197ea725ed...9c6922e93552525656c4e805b41db24552790358
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance