[FFmpeg-devel] [PATCH V3 1/4] lavc/vaapi_encode: Change the slice/parameter buffers to dynamic alloc.

[Mark Thompson]

On 18/08/17 03:13, Jun Zhao wrote:
> V3: - Making pic->slices be VAAPIEncodeSlice* instead of VAAPIEncodeSlice**.
>     - Fix resource (vaBuffer) lead when realloc pic->param_buffers fail.
>     - Adjust max_slices location in VAAPIEncodeContext.
>     - Re-work distributing the macro-blocks for multi-slices function.    
> V2: Change the slice/parameter buffers to dynamic alloc and split
>     the mutil-slice support for AVC/HEVC.
> 
> From 4b2414cf589b8b64639e87c2ab1b4045099b8ba0 Mon Sep 17 00:00:00 2001
> From: Jun Zhao <jun.zhao at intel.com>
> Date: Mon, 31 Jul 2017 22:46:23 -0400
> Subject: [PATCH V3 1/4] lavc/vaapi_encode: Change the slice/parameter buffers
>  to dynamic alloc.
> 
> Change the slice/parameter buffers to be allocated dynamically.
> 
> Signed-off-by: Wang, Yi A <yi.a.wang at intel.com>
> Signed-off-by: Jun Zhao <jun.zhao at intel.com>
> ---
>  libavcodec/vaapi_encode.c | 44 ++++++++++++++++++++++++++++++++------------
>  libavcodec/vaapi_encode.h |  6 ++----
>  2 files changed, 34 insertions(+), 16 deletions(-)

Right, looks much nicer.  Some comments below.

> 
> diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
> index 2de5f76cab..afc3970d44 100644
> --- a/libavcodec/vaapi_encode.c
> +++ b/libavcodec/vaapi_encode.c
> @@ -36,13 +36,18 @@ static int vaapi_encode_make_packed_header(AVCodecContext *avctx,
>      VAAPIEncodeContext *ctx = avctx->priv_data;
>      VAStatus vas;
>      VABufferID param_buffer, data_buffer;
> +    VABufferID *tmp;
>      VAEncPackedHeaderParameterBuffer params = {
>          .type = type,
>          .bit_length = bit_len,
>          .has_emulation_bytes = 1,
>      };
>  
> -    av_assert0(pic->nb_param_buffers + 2 <= MAX_PARAM_BUFFERS);
> +    tmp = av_realloc_array(pic->param_buffers, sizeof(*tmp), pic->nb_param_buffers + 2);
> +    if (!tmp) {
> +        return AVERROR(ENOMEM);
> +    }
> +    pic->param_buffers = tmp;
>  
>      vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
>                           VAEncPackedHeaderParameterBufferType,
> @@ -77,9 +82,14 @@ static int vaapi_encode_make_param_buffer(AVCodecContext *avctx,
>  {
>      VAAPIEncodeContext *ctx = avctx->priv_data;
>      VAStatus vas;
> +    VABufferID *tmp;
>      VABufferID buffer;
>  
> -    av_assert0(pic->nb_param_buffers + 1 <= MAX_PARAM_BUFFERS);
> +    tmp = av_realloc_array(pic->param_buffers, sizeof(*tmp), pic->nb_param_buffers + 1);
> +    if (!tmp) {
> +        return AVERROR(ENOMEM);
> +    }
> +    pic->param_buffers = tmp;
>  
>      vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
>                           type, len, 1, data, &buffer);
> @@ -313,15 +323,14 @@ static int vaapi_encode_issue(AVCodecContext *avctx,
>          }
>      }
>  
> -    av_assert0(pic->nb_slices <= MAX_PICTURE_SLICES);
> +    pic->slices = av_mallocz(pic->nb_slices * sizeof(*slice));

av_mallocz_array(pic->nb_slices, sizeof(*pic->slices))

> +    if (!pic->slices) {
> +        err = AVERROR(ENOMEM);
> +        goto fail;
> +    }
>      for (i = 0; i < pic->nb_slices; i++) {
> -        slice = av_mallocz(sizeof(*slice));
> -        if (!slice) {
> -            err = AVERROR(ENOMEM);
> -            goto fail;
> -        }
> +        slice = &pic->slices[i];
>          slice->index = i;
> -        pic->slices[i] = slice;
>  
>          if (ctx->codec->slice_params_size > 0) {
>              slice->codec_slice_params = av_mallocz(ctx->codec->slice_params_size);
> @@ -425,8 +434,16 @@ fail_with_picture:
>  fail:
>      for(i = 0; i < pic->nb_param_buffers; i++)
>          vaDestroyBuffer(ctx->hwctx->display, pic->param_buffers[i]);
> +    for (i = 0; i < pic->nb_slices; i++) {
> +        if (pic->slices && &pic->slices[i]) {

Something funny going on here?  "&pic->slices[i]", being an address, is always true.

> +            av_freep(&pic->slices[i].priv_data);
> +            av_freep(&pic->slices[i].codec_slice_params);
> +        }
> +    }
>  fail_at_end:
>      av_freep(&pic->codec_picture_params);
> +    av_freep(&pic->param_buffers);
> +    av_freep(&pic->slices);
>      av_frame_free(&pic->recon_image);
>      av_buffer_unref(&pic->output_buffer_ref);
>      pic->output_buffer = VA_INVALID_ID;
> @@ -535,15 +552,18 @@ static int vaapi_encode_free(AVCodecContext *avctx,
>          vaapi_encode_discard(avctx, pic);
>  
>      for (i = 0; i < pic->nb_slices; i++) {
> -        av_freep(&pic->slices[i]->priv_data);
> -        av_freep(&pic->slices[i]->codec_slice_params);
> -        av_freep(&pic->slices[i]);
> +        if (pic->slices && &pic->slices[i]) {

Likewise.

> +            av_freep(&pic->slices[i].priv_data);
> +            av_freep(&pic->slices[i].codec_slice_params);
> +        }
>      }
>      av_freep(&pic->codec_picture_params);
>  
>      av_frame_free(&pic->input_image);
>      av_frame_free(&pic->recon_image);
>  
> +    av_freep(&pic->param_buffers);
> +    av_freep(&pic->slices);
>      // Output buffer should already be destroyed.
>      av_assert0(pic->output_buffer == VA_INVALID_ID);
>  
> diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h
> index 0edf27e4cb..e9aaec6f74 100644
> --- a/libavcodec/vaapi_encode.h
> +++ b/libavcodec/vaapi_encode.h
> @@ -35,8 +35,6 @@ enum {
>      MAX_CONFIG_ATTRIBUTES  = 4,
>      MAX_GLOBAL_PARAMS      = 4,
>      MAX_PICTURE_REFERENCES = 2,
> -    MAX_PICTURE_SLICES     = 112,
> -    MAX_PARAM_BUFFERS      = 128,
>      MAX_REORDER_DELAY      = 16,
>      MAX_PARAM_BUFFER_SIZE  = 1024,
>  };
> @@ -73,7 +71,7 @@ typedef struct VAAPIEncodePicture {
>      VASurfaceID     recon_surface;
>  
>      int          nb_param_buffers;
> -    VABufferID      param_buffers[MAX_PARAM_BUFFERS];
> +    VABufferID      *param_buffers;
>  
>      AVBufferRef    *output_buffer_ref;
>      VABufferID      output_buffer;
> @@ -85,7 +83,7 @@ typedef struct VAAPIEncodePicture {
>      struct VAAPIEncodePicture *refs[MAX_PICTURE_REFERENCES];
>  
>      int          nb_slices;
> -    VAAPIEncodeSlice *slices[MAX_PICTURE_SLICES];
> +    VAAPIEncodeSlice *slices;
>  } VAAPIEncodePicture;
>  
>  typedef struct VAAPIEncodeContext {
> -- 
> 2.11.0
> 

Thanks,

- Mark