[vlc-devel] [PATCH] dxva2: fixed incorrect acquiring/releasing of hw surfaces

[Jean-Baptiste Kempf]

Hey,

This seems nice, from a quick look. I'll see with Steve and apply :)

On Thu, 29 Jun 2017, at 21:28, Oliver Collyer wrote:
> I found that after using DXVA2 in a custom libVLC application I could no
> longer reset my D3D9 device, because some surfaces hadn't been released.
> 
> This was caused by two issues:
> 
> 1) failure to release the surfaces in DxDestroyVideoDecoder that were
> created by DxCreateVideoDecoder
> 2) incorrectly calling AcquirePictureSys on the newly created (as opposed
> to copied) surfaces
> 
> The result was that all the surfaces allocated had 2 references that were
> never released.
> 
> ---
>  modules/codec/avcodec/dxva2.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/modules/codec/avcodec/dxva2.c
> b/modules/codec/avcodec/dxva2.c
> index 31c8f67afb..6c1351853a 100644
> --- a/modules/codec/avcodec/dxva2.c
> +++ b/modules/codec/avcodec/dxva2.c
> @@ -178,12 +178,12 @@ static void d3d9_pic_context_destroy(struct
> picture_context_t *opaque)
>      }
>  }
>  
> -static struct va_pic_context *CreatePicContext(IDirect3DSurface9 *);
> +static struct va_pic_context *CreatePicContext(IDirect3DSurface9 *,
> bool);
>  
>  static struct picture_context_t *d3d9_pic_context_copy(struct
>  picture_context_t *ctx)
>  {
>      struct va_pic_context *src_ctx = (struct va_pic_context*)ctx;
> -    struct va_pic_context *pic_ctx =
> CreatePicContext(src_ctx->picsys.surface);
> +    struct va_pic_context *pic_ctx =
> CreatePicContext(src_ctx->picsys.surface, true);
>      if (unlikely(pic_ctx==NULL))
>          return NULL;
>      pic_ctx->va_surface = src_ctx->va_surface;
> @@ -191,7 +191,7 @@ static struct picture_context_t
> *d3d9_pic_context_copy(struct picture_context_t
>      return &pic_ctx->s;
>  }
>  
> -static struct va_pic_context *CreatePicContext(IDirect3DSurface9
> *surface)
> +static struct va_pic_context *CreatePicContext(IDirect3DSurface9
> *surface, bool copying)
>  {
>      struct va_pic_context *pic_ctx = calloc(1, sizeof(*pic_ctx));
>      if (unlikely(pic_ctx==NULL))
> @@ -199,14 +199,15 @@ static struct va_pic_context
> *CreatePicContext(IDirect3DSurface9 *surface)
>      pic_ctx->s.destroy = d3d9_pic_context_destroy;
>      pic_ctx->s.copy    = d3d9_pic_context_copy;
>      pic_ctx->picsys.surface = surface;
> -    AcquirePictureSys(&pic_ctx->picsys);
> +    if (copying)
> +        AcquirePictureSys(&pic_ctx->picsys);
>      return pic_ctx;
>  }
>  
>  static struct va_pic_context* NewSurfacePicContext(vlc_va_t *va, int
>  surface_index)
>  {
>      directx_sys_t *dx_sys = &va->sys->dx_sys;
> -    return CreatePicContext(dx_sys->hw_surface[surface_index]);
> +    return CreatePicContext(dx_sys->hw_surface[surface_index], false);
>  }
>  
>  static int Get(vlc_va_t *va, picture_t *pic, uint8_t **data)
> @@ -749,6 +750,8 @@ static void DxDestroyVideoDecoder(vlc_va_t *va)
>      {
>          IDirectXVideoDecoder_Release(dx_sys->decoder);
>          dx_sys->decoder = NULL;
> +        for (unsigned i = 0; i < dx_sys->va_pool.surface_count; i++)
> +            IDirect3DSurface9_Release(dx_sys->hw_surface[i]);
>      }
>  }
>  
> -- 
> 2.11.0
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel


-- 
Jean-Baptiste Kempf -  President
+33 672 704 734