[vlc-devel] [PATCH] display: remove the flag telling the module might call SendEventPicturesInvalid

Steve Lhomme robux4 at ycbcr.xyz
Fri Oct 25 08:31:50 CEST 2019


It's only used as an assert telling the module might call it when it's called.

In the past it was used to allow direct rendering or not from the display pool.
---
 include/vlc_vout_display.h             | 1 -
 modules/video_output/win32/direct3d9.c | 2 --
 src/video_output/display.c             | 1 -
 3 files changed, 4 deletions(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index 189260cad99..cf702ad6cf7 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -105,7 +105,6 @@ typedef struct vout_display_cfg {
  *
  */
 typedef struct {
-    bool has_pictures_invalid;              /* Can handle VOUT_DISPLAY_RESET_PICTURES */
     bool can_scale_spu;                     /* Handles subpictures with a non default zoom factor */
     const vlc_fourcc_t *subpicture_chromas; /* List of supported chromas for subpicture rendering. */
 } vout_display_info_t;
diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c
index 6d686b4aa44..b75ac2e323b 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -1704,8 +1704,6 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
     }
 
     /* Setup vout_display now that everything is fine */
-    vd->info.has_pictures_invalid = !is_d3d9_opaque(fmt.i_chroma);
-
     if (var_InheritBool(vd, "direct3d9-hw-blending") &&
         sys->d3dregion_format != D3DFMT_UNKNOWN &&
         (sys->d3d_dev.caps.SrcBlendCaps  & D3DPBLENDCAPS_SRCALPHA) &&
diff --git a/src/video_output/display.c b/src/video_output/display.c
index bc92d8df723..c174a542793 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -360,7 +360,6 @@ void vout_display_SendEventPicturesInvalid(vout_display_t *vd)
     vout_display_priv_t *osys = container_of(vd, vout_display_priv_t, display);
 
     msg_Err(vd, "picture buffers invalidated asynchronously");
-    assert(vd->info.has_pictures_invalid);
     atomic_store_explicit(&osys->reset_pictures, true, memory_order_release);
 #else
     (void) vd;
-- 
2.17.1



More information about the vlc-devel mailing list