[FFmpeg-devel] [PATCH v8 12/15] avcodec/vaapi_encode: extract a free funtion to base layer

[Mark Thompson]

On 18/04/2024 09:59, tong1.wu-at-intel.com at ffmpeg.org wrote:
> From: Tong Wu <tong1.wu at intel.com>
> 
> Signed-off-by: Tong Wu <tong1.wu at intel.com>
> ---
>  libavcodec/hw_base_encode.c | 11 +++++++++++
>  libavcodec/hw_base_encode.h |  2 ++
>  libavcodec/vaapi_encode.c   |  6 +-----
>  3 files changed, 14 insertions(+), 5 deletions(-)

"... free funtion to ..."

While I do approve of fun, maybe this should be a function.

> diff --git a/libavcodec/hw_base_encode.c b/libavcodec/hw_base_encode.c
> index af85bb99aa..812668f3f2 100644
> --- a/libavcodec/hw_base_encode.c
> +++ b/libavcodec/hw_base_encode.c
> @@ -751,6 +751,17 @@ fail:
>      return err;
>  }
>  
> +int ff_hw_base_encode_free(AVCodecContext *avctx, HWBaseEncodePicture *pic)
> +{
> +    av_frame_free(&pic->input_image);
> +    av_frame_free(&pic->recon_image);
> +
> +    av_buffer_unref(&pic->opaque_ref);
> +    av_freep(&pic->priv_data);
> +
> +    return 0;
> +}
> +
>  int ff_hw_base_encode_init(AVCodecContext *avctx)
>  {
>      HWBaseEncodeContext *ctx = avctx->priv_data;
> diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h
> index 7686cf9501..d566980efc 100644
> --- a/libavcodec/hw_base_encode.h
> +++ b/libavcodec/hw_base_encode.h
> @@ -222,6 +222,8 @@ int ff_hw_base_init_gop_structure(AVCodecContext *avctx, uint32_t ref_l0, uint32
>  
>  int ff_hw_base_get_recon_format(AVCodecContext *avctx, const void *hwconfig, enum AVPixelFormat *fmt);
>  
> +int ff_hw_base_encode_free(AVCodecContext *avctx, HWBaseEncodePicture *pic);
> +
>  int ff_hw_base_encode_init(AVCodecContext *avctx);
>  
>  int ff_hw_base_encode_close(AVCodecContext *avctx);
> diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
> index ee4cf42baf..08792c07c5 100644
> --- a/libavcodec/vaapi_encode.c
> +++ b/libavcodec/vaapi_encode.c
> @@ -878,17 +878,13 @@ static int vaapi_encode_free(AVCodecContext *avctx,
>              av_freep(&pic->slices[i].codec_slice_params);
>      }
>  
> -    av_frame_free(&base_pic->input_image);
> -    av_frame_free(&base_pic->recon_image);
> -
> -    av_buffer_unref(&base_pic->opaque_ref);
> +    ff_hw_base_encode_free(avctx, base_pic);
>  
>      av_freep(&pic->param_buffers);
>      av_freep(&pic->slices);
>      // Output buffer should already be destroyed.
>      av_assert0(pic->output_buffer == VA_INVALID_ID);
>  
> -    av_freep(&base_pic->priv_data);
>      av_freep(&pic->codec_picture_params);
>      av_freep(&pic->roi);
>  

Thanks,

- Mark