lavc/vaapi_encode_h265: Use surface alignment

This is needed to correctly set conformance window crop with Mesa AMD.

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
This commit is contained in:
David Rosca 2024-10-22 17:26:59 +02:00 committed by Timo Rothenpieler
parent bcfbf2bac8
commit d0facac679

View File

@ -951,8 +951,10 @@ static av_cold int vaapi_encode_h265_get_encoder_caps(AVCodecContext *avctx)
"min CB size %dx%d.\n", priv->ctu_size, priv->ctu_size, "min CB size %dx%d.\n", priv->ctu_size, priv->ctu_size,
priv->min_cb_size, priv->min_cb_size); priv->min_cb_size, priv->min_cb_size);
base_ctx->surface_width = FFALIGN(avctx->width, priv->min_cb_size); base_ctx->surface_width = FFALIGN(avctx->width,
base_ctx->surface_height = FFALIGN(avctx->height, priv->min_cb_size); FFMAX(priv->min_cb_size, priv->common.surface_alignment_width));
base_ctx->surface_height = FFALIGN(avctx->height,
FFMAX(priv->min_cb_size, priv->common.surface_alignment_height));
base_ctx->slice_block_width = base_ctx->slice_block_height = priv->ctu_size; base_ctx->slice_block_width = base_ctx->slice_block_height = priv->ctu_size;