lavc/vaapi_encode_h265: Use surface alignment

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

David Rosca committed 2 years ago

Commit d0facac1 parent bcfbf2b1 file · +4 −2Browse files

Unified · Split

libavcodec/vaapi_encode_h265.c+4−2

@@ -951,8 +951,10 @@ static av_cold int vaapi_encode_h265_get_encoder_caps(AVCodecContext *avctx) · 950 unmodified lines
951	"min CB size %dx%d.\n", priv->ctu_size, priv->ctu_size,	951	"min CB size %dx%d.\n", priv->ctu_size, priv->ctu_size,
952	priv->min_cb_size, priv->min_cb_size);	952	priv->min_cb_size, priv->min_cb_size);
953		953
954	base_ctx->surface_width = FFALIGN(avctx->width, priv->min_cb_size);	954	base_ctx->surface_width = FFALIGN(avctx->width,
955	base_ctx->surface_height = FFALIGN(avctx->height, priv->min_cb_size);	955	FFMAX(priv->min_cb_size, priv->common.surface_alignment_width));
		956	base_ctx->surface_height = FFALIGN(avctx->height,
		957	FFMAX(priv->min_cb_size, priv->common.surface_alignment_height));
956		958
957	base_ctx->slice_block_width = base_ctx->slice_block_height = priv->ctu_size;	959	base_ctx->slice_block_width = base_ctx->slice_block_height = priv->ctu_size;
958		960