virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

vulkan_decode: use VK_KHR_video_maintenance2 if available

Browse Source
This commit is contained in:
Lynne
2025-03-14 13:23:36 +01:00
parent 67eb01b458
commit 31176b16ac
1 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
libavcodec/vulkan_decode.c
View File

@@ -1114,18 +1114,12 @@ int ff_vk_decode_uninit(AVCodecContext *avctx)
return 0; return 0;
} }
int ff_vk_decode_init(AVCodecContext *avctx) static int create_empty_session_parameters(AVCodecContext *avctx,
FFVulkanDecodeShared *ctx)
{ {
int err;
VkResult ret; VkResult ret;
FFVulkanDecodeContext *dec = avctx->internal->hwaccel_priv_data; FFVulkanContext *s = &ctx->s;
FFVulkanDecodeShared *ctx; FFVulkanFunctions *vk = &s->vkfn;
FFVulkanContext *s;
FFVulkanFunctions *vk;
int async_depth;
const VkVideoProfileInfoKHR *profile;
const FFVulkanDecodeDescriptor *vk_desc;
const VkPhysicalDeviceDriverProperties *driver_props;
VkVideoDecodeH264SessionParametersCreateInfoKHR h264_params = { VkVideoDecodeH264SessionParametersCreateInfoKHR h264_params = {
.sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR, .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR,
@@ -1144,7 +1138,31 @@ int ff_vk_decode_init(AVCodecContext *avctx)
avctx->codec_id == AV_CODEC_ID_HEVC ? (void *)&h265_params : avctx->codec_id == AV_CODEC_ID_HEVC ? (void *)&h265_params :
avctx->codec_id == AV_CODEC_ID_AV1 ? (void *)&av1_params : avctx->codec_id == AV_CODEC_ID_AV1 ? (void *)&av1_params :
NULL, NULL,
.videoSession = ctx->common.session,
}; };
ret = vk->CreateVideoSessionParametersKHR(s->hwctx->act_dev, &session_params_create,
s->hwctx->alloc, &ctx->empty_session_params);
if (ret != VK_SUCCESS) {
av_log(avctx, AV_LOG_ERROR, "Unable to create empty Vulkan video session parameters: %s!\n",
ff_vk_ret2str(ret));
return AVERROR_EXTERNAL;
}
return 0;
}
int ff_vk_decode_init(AVCodecContext *avctx)
{
int err;
FFVulkanDecodeContext *dec = avctx->internal->hwaccel_priv_data;
FFVulkanDecodeShared *ctx;
FFVulkanContext *s;
int async_depth;
const VkVideoProfileInfoKHR *profile;
const FFVulkanDecodeDescriptor *vk_desc;
const VkPhysicalDeviceDriverProperties *driver_props;
VkVideoSessionCreateInfoKHR session_create = { VkVideoSessionCreateInfoKHR session_create = {
.sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_CREATE_INFO_KHR, .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_CREATE_INFO_KHR,
}; };
@@ -1156,7 +1174,6 @@ int ff_vk_decode_init(AVCodecContext *avctx)
/* Initialize contexts */ /* Initialize contexts */
ctx = dec->shared_ctx; ctx = dec->shared_ctx;
s = &ctx->s; s = &ctx->s;
vk = &ctx->s.vkfn;
err = ff_vk_init(s, avctx, NULL, avctx->hw_frames_ctx); err = ff_vk_init(s, avctx, NULL, avctx->hw_frames_ctx);
if (err < 0) if (err < 0)
@@ -1179,7 +1196,6 @@ int ff_vk_decode_init(AVCodecContext *avctx)
return err; return err;
} }
session_create.flags = 0x0;
session_create.queueFamilyIndex = ctx->qf->idx; session_create.queueFamilyIndex = ctx->qf->idx;
session_create.maxCodedExtent = ctx->caps.maxCodedExtent; session_create.maxCodedExtent = ctx->caps.maxCodedExtent;
session_create.maxDpbSlots = ctx->caps.maxDpbSlots; session_create.maxDpbSlots = ctx->caps.maxDpbSlots;
@@ -1188,6 +1204,10 @@ int ff_vk_decode_init(AVCodecContext *avctx)
session_create.referencePictureFormat = session_create.pictureFormat; session_create.referencePictureFormat = session_create.pictureFormat;
session_create.pStdHeaderVersion = &vk_desc->ext_props; session_create.pStdHeaderVersion = &vk_desc->ext_props;
session_create.pVideoProfile = profile; session_create.pVideoProfile = profile;
#ifdef VK_KHR_video_maintenance2
if (ctx->s.extensions & FF_VK_EXT_VIDEO_MAINTENANCE_2)
session_create.flags = VK_VIDEO_SESSION_CREATE_INLINE_SESSION_PARAMETERS_BIT_KHR;
#endif
/* Create decode exec context for this specific main thread. /* Create decode exec context for this specific main thread.
* 2 async contexts per thread was experimentally determined to be optimal * 2 async contexts per thread was experimentally determined to be optimal
@@ -1203,7 +1223,7 @@ int ff_vk_decode_init(AVCodecContext *avctx)
if (err < 0) if (err < 0)
goto fail; goto fail;
if (profile) { if (!DECODER_IS_SDR(avctx->codec_id)) {
err = ff_vk_video_common_init(avctx, s, &ctx->common, &session_create); err = ff_vk_video_common_init(avctx, s, &ctx->common, &session_create);
if (err < 0) if (err < 0)
goto fail; goto fail;
@@ -1258,14 +1278,11 @@ int ff_vk_decode_init(AVCodecContext *avctx)
} }
} }
session_params_create.videoSession = ctx->common.session; if (!DECODER_IS_SDR(avctx->codec_id)) {
if (profile) { if (!(ctx->s.extensions & FF_VK_EXT_VIDEO_MAINTENANCE_2)) {
ret = vk->CreateVideoSessionParametersKHR(s->hwctx->act_dev, &session_params_create, err = create_empty_session_parameters(avctx, ctx);
s->hwctx->alloc, &ctx->empty_session_params); if (err < 0)
if (ret != VK_SUCCESS) { return err;
av_log(avctx, AV_LOG_ERROR, "Unable to create empty Vulkan video session parameters: %s!\n",
ff_vk_ret2str(ret));
return AVERROR_EXTERNAL;
} }
} else { } else {
/* For SDR decoders, this alignment value will be 0. Since this will make /* For SDR decoders, this alignment value will be 0. Since this will make