[vlc-devel] [PATCH 2/2] vout: remove has_pictures_invalid flag

[Steve Lhomme]

You are missing this very important line:

http://git.videolan.org/?p=vlc.git;a=blob;f=src/video_output/vout_wrapper.c;h=61046f2be0f35e25df846acadfe9adac5fd7bdf9;hb=HEAD#l96

I think the invalid picture can be removed after we have done the push. 
But for now it still serves a purpose.

On 2019-06-14 6:49, Rémi Denis-Courmont wrote:
> ---
>   include/vlc_vout_display.h             | 1 -
>   modules/video_output/win32/direct3d9.c | 1 -
>   src/video_output/display.c             | 1 -
>   3 files changed, 3 deletions(-)
> 
> diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
> index 97a6c96c1b..96af8ca756 100644
> --- a/include/vlc_vout_display.h
> +++ b/include/vlc_vout_display.h
> @@ -106,7 +106,6 @@ typedef struct vout_display_cfg {
>    */
>   typedef struct {
>       bool is_slow;                           /* The picture memory has slow read/write */
> -    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 da4f4a8e7c..f5e9fef856 100644
> --- a/modules/video_output/win32/direct3d9.c
> +++ b/modules/video_output/win32/direct3d9.c
> @@ -1773,7 +1773,6 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
>   
>       /* Setup vout_display now that everything is fine */
>       vd->info.is_slow = false;
> -    vd->info.has_pictures_invalid = !is_d3d9_opaque(fmt.i_chroma);
>   
>       if (var_InheritBool(vd, "direct3d9-hw-blending") &&
>           sys->d3dregion_format != D3DFMT_UNKNOWN &&
> diff --git a/src/video_output/display.c b/src/video_output/display.c
> index a996694a51..953ff7b132 100644
> --- a/src/video_output/display.c
> +++ b/src/video_output/display.c
> @@ -367,7 +367,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.20.1
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>