On Do, 2024-03-07 at 00:55 +0100, Araz Iusubov wrote:
> This commit fixes issues with AMD HEVC encoding.
> By default AMD hevc encoder asks for the alignment 64x16, while FFMPEG VAAPI
> has 16x16.
> Adding support for customzied surface size from VASurfaceAttribAlignmentSize
s/customzied/customized
Thanks
Haihao
> in VAAPI version 1.21.0.
>
> To: primeadv...@gmail.com
>
> Signed-off-by: Araz Iusubov
> ---
> libavcodec/vaapi_encode.c | 11 +++
> libavutil/hwcontext.h | 7 +++
> libavutil/hwcontext_vaapi.c | 5 +
> 3 files changed, 23 insertions(+)
>
> diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
> index 808b79c0c7..dc1b7465b7 100644
> --- a/libavcodec/vaapi_encode.c
> +++ b/libavcodec/vaapi_encode.c
> @@ -2700,6 +2700,17 @@ static av_cold int
> vaapi_encode_create_recon_frames(AVCodecContext *avctx)
> av_log(avctx, AV_LOG_DEBUG, "Using %s as format of "
> "reconstructed frames.\n", av_get_pix_fmt_name(recon_format));
>
> + if (constraints->log2_alignment) {
> + ctx->surface_width = FFALIGN(avctx->width,
> + 1 << (constraints->log2_alignment & 0xf));
> + ctx->surface_height = FFALIGN(avctx->height,
> + 1 << ((constraints->log2_alignment & 0xf0) >>
> 4));
> + av_log(avctx, AV_LOG_VERBOSE, "Using customized alignment size "
> + "[%dx%d].\n",
> + (1 << (constraints->log2_alignment & 0xf)),
> + (1 << ((constraints->log2_alignment & 0xf0) >> 4)));
> + }
> +
> if (ctx->surface_width < constraints->min_width ||
> ctx->surface_height < constraints->min_height ||
> ctx->surface_width > constraints->max_width ||
> diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h
> index df7733fe5e..5725245be4 100644
> --- a/libavutil/hwcontext.h
> +++ b/libavutil/hwcontext.h
> @@ -481,6 +481,13 @@ typedef struct AVHWFramesConstraints {
> */
> int max_width;
> int max_height;
> +
> + /**
> + * The frame width/height log2 alignment when available
> + * the lower 4 bits, width; another 4 bits, height
> + * (Zero is not applied, use the default value)
> + */
> + int log2_alignment;
> } AVHWFramesConstraints;
>
> /**
> diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
> index 2c75f5f5b1..161623bc27 100644
> --- a/libavutil/hwcontext_vaapi.c
> +++ b/libavutil/hwcontext_vaapi.c
> @@ -294,6 +294,11 @@ static int vaapi_frames_get_constraints(AVHWDeviceContext
> *hwdev,
> case VASurfaceAttribMaxHeight:
> constraints->max_height = attr_list[i].value.value.i;
> break;
> +#if VA_CHECK_VERSION(1, 21, 0)
> + case VASurfaceAttribAlignmentSize:
> + constraints->log2_alignment = attr_list[i].value.value.i;
> + break;
> +#endif
> }
> }
> if (pix_fmt_count == 0) {
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".