virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

lavc/vaapi_encode: Query surface alignment

Browse Source 
It needs to create temporary config to query surface attribute.

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
This commit is contained in:
David Rosca 2024-10-22 17:26:58 +02:00 committed by Timo Rothenpieler
parent 72a3656e84
commit bcfbf2bac8
2 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
libavcodec/vaapi_encode.c
View File

@ -1133,6 +1133,68 @@ fail:
return err; return err;
} }
static av_cold int vaapi_encode_surface_alignment(av_unused AVCodecContext *avctx)
{
#if VA_CHECK_VERSION(1, 21, 0)
VAAPIEncodeContext *ctx = avctx->priv_data;
VASurfaceAttrib *attr_list = NULL;
unsigned int attr_count = 0;
VAConfigID va_config;
VAStatus vas;
int err = 0;
vas = vaCreateConfig(ctx->hwctx->display,
ctx->va_profile, ctx->va_entrypoint,
NULL, 0, &va_config);
if (vas != VA_STATUS_SUCCESS) {
av_log(avctx, AV_LOG_ERROR, "Failed to create temp encode pipeline "
"configuration: %d (%s).\n", vas, vaErrorStr(vas));
return AVERROR(EIO);
}
vas = vaQuerySurfaceAttributes(ctx->hwctx->display, va_config,
0, &attr_count);
if (vas != VA_STATUS_SUCCESS) {
av_log(avctx, AV_LOG_ERROR, "Failed to query surface attributes: "
"%d (%s).\n", vas, vaErrorStr(vas));
err = AVERROR_EXTERNAL;
goto fail;
}
attr_list = av_malloc(attr_count * sizeof(*attr_list));
if (!attr_list) {
err = AVERROR(ENOMEM);
goto fail;
}
vas = vaQuerySurfaceAttributes(ctx->hwctx->display, va_config,
attr_list, &attr_count);
if (vas != VA_STATUS_SUCCESS) {
av_log(avctx, AV_LOG_ERROR, "Failed to query surface attributes: "
"%d (%s).\n", vas, vaErrorStr(vas));
err = AVERROR_EXTERNAL;
goto fail;
}
for (unsigned int i = 0; i < attr_count; i++) {
if (attr_list[i].type == VASurfaceAttribAlignmentSize) {
ctx->surface_alignment_width =
1 << (attr_list[i].value.value.i & 0xf);
ctx->surface_alignment_height =
1 << ((attr_list[i].value.value.i & 0xf0) >> 4);
break;
}
}
fail:
av_freep(&attr_list);
vaDestroyConfig(ctx->hwctx->display, va_config);
return err;
#else
return 0;
#endif
}
static const VAAPIEncodeRCMode vaapi_encode_rc_modes[] = { static const VAAPIEncodeRCMode vaapi_encode_rc_modes[] = {
// Bitrate Quality // Bitrate Quality
// | Maxrate | HRD/VBV // | Maxrate | HRD/VBV
@ -2111,6 +2173,10 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx)
if (err < 0) if (err < 0)
goto fail; goto fail;
err = vaapi_encode_surface_alignment(avctx);
if (err < 0)
goto fail;
if (ctx->codec->get_encoder_caps) { if (ctx->codec->get_encoder_caps) {
err = ctx->codec->get_encoder_caps(avctx); err = ctx->codec->get_encoder_caps(avctx);
if (err < 0) if (err < 0)

4
libavcodec/vaapi_encode.h
View File

@ -260,6 +260,10 @@ typedef struct VAAPIEncodeContext {
* This is a RefStruct reference. * This is a RefStruct reference.
*/ */
VABufferID *coded_buffer_ref; VABufferID *coded_buffer_ref;
// Surface alignment required by driver.
int surface_alignment_width;
int surface_alignment_height;
} VAAPIEncodeContext; } VAAPIEncodeContext;
typedef struct VAAPIEncodeType { typedef struct VAAPIEncodeType {