Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/vulkan_decode: Factor creating session params out, fix leak

Browse Source 
All Vulkan HWAccels share the same boilerplate code for creating
session params and this includes a common bug: In case actually
creating the video session parameters fails, the buffer destined
to hold them leaks; in case of HEVC this is also true if
get_data_set_buf() fails.

This commit factors this code out and fixes the leak.

Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
pull/390/head
Andreas Rheinhardt 1 year ago
parent dfac782b13
commit c1b6235d41
5 changed files with 44 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      libavcodec/vulkan_av1.c
  2. 31
      libavcodec/vulkan_decode.c
  3. 5
      libavcodec/vulkan_decode.h
  4. 28
      libavcodec/vulkan_h264.c
  5. 27
      libavcodec/vulkan_hevc.c

28
libavcodec/vulkan_av1.c
Unescape View File

@ -104,12 +104,9 @@ static int vk_av1_fill_pict(AVCodecContext *avctx, const AV1Frame **ref_src,
static int vk_av1_create_params(AVCodecContext *avctx, AVBufferRef **buf)
{
VkResult ret;
const AV1DecContext *s = avctx->priv_data;
FFVulkanDecodeContext *dec = avctx->internal->hwaccel_priv_data;
FFVulkanDecodeShared *ctx = (FFVulkanDecodeShared *)dec->shared_ref->data;
FFVulkanFunctions *vk = &ctx->s.vkfn;
const AV1RawSequenceHeader *seq = s->raw_seq;
@ -118,10 +115,7 @@ static int vk_av1_create_params(AVCodecContext *avctx, AVBufferRef **buf)
VkVideoDecodeAV1SessionParametersCreateInfoMESA av1_params;
VkVideoSessionParametersCreateInfoKHR session_params_create;
AVBufferRef *tmp;
VkVideoSessionParametersKHR *par = av_malloc(sizeof(*par));
if (!par)
return AVERROR(ENOMEM);
int err;
av1_sequence_header = (StdVideoAV1MESASequenceHeader) {
.flags = (StdVideoAV1MESASequenceHeaderFlags) {
@ -189,26 +183,12 @@ static int vk_av1_create_params(AVCodecContext *avctx, AVBufferRef **buf)
.videoSessionParametersTemplate = NULL,
};
/* Create session parameters */
ret = vk->CreateVideoSessionParametersKHR(ctx->s.hwctx->act_dev, &session_params_create,
ctx->s.hwctx->alloc, par);
if (ret != VK_SUCCESS) {
av_log(avctx, AV_LOG_ERROR, "Unable to create Vulkan video session parameters: %s!\n",
ff_vk_ret2str(ret));
return AVERROR_EXTERNAL;
}
tmp = av_buffer_create((uint8_t *)par, sizeof(*par), ff_vk_decode_free_params,
ctx, 0);
if (!tmp) {
ff_vk_decode_free_params(ctx, (uint8_t *)par);
return AVERROR(ENOMEM);
}
err = ff_vk_decode_create_params(buf, avctx, ctx, &session_params_create);
if (err < 0)
return err;
av_log(avctx, AV_LOG_DEBUG, "Created frame parameters\n");
*buf = tmp;
return 0;
}

31
libavcodec/vulkan_decode.c
Unescape View File

@ -1057,7 +1057,7 @@ int ff_vk_frame_params(AVCodecContext *avctx, AVBufferRef *hw_frames_ctx)
return err;
}
void ff_vk_decode_free_params(void *opaque, uint8_t *data)
static void vk_decode_free_params(void *opaque, uint8_t *data)
{
FFVulkanDecodeShared *ctx = opaque;
FFVulkanFunctions *vk = &ctx->s.vkfn;
@ -1067,6 +1067,35 @@ void ff_vk_decode_free_params(void *opaque, uint8_t *data)
av_free(par);
}
int ff_vk_decode_create_params(AVBufferRef **par_ref, void *logctx, FFVulkanDecodeShared *ctx,
const VkVideoSessionParametersCreateInfoKHR *session_params_create)
{
VkVideoSessionParametersKHR *par = av_malloc(sizeof(*par));
const FFVulkanFunctions *vk = &ctx->s.vkfn;
VkResult ret;
if (!par)
return AVERROR(ENOMEM);
/* Create session parameters */
ret = vk->CreateVideoSessionParametersKHR(ctx->s.hwctx->act_dev, session_params_create,
ctx->s.hwctx->alloc, par);
if (ret != VK_SUCCESS) {
av_log(logctx, AV_LOG_ERROR, "Unable to create Vulkan video session parameters: %s!\n",
ff_vk_ret2str(ret));
av_free(par);
return AVERROR_EXTERNAL;
}
*par_ref = av_buffer_create((uint8_t *)par, sizeof(*par),
vk_decode_free_params, ctx, 0);
if (!*par_ref) {
vk_decode_free_params(ctx, (uint8_t *)par);
return AVERROR(ENOMEM);
}
return 0;
}
int ff_vk_decode_uninit(AVCodecContext *avctx)
{
FFVulkanDecodeContext *dec = avctx->internal->hwaccel_priv_data;

5
libavcodec/vulkan_decode.h
Unescape View File

@ -156,9 +156,10 @@ int ff_vk_get_decode_buffer(FFVulkanDecodeContext *ctx, AVBufferRef **buf,
void *create_pNext, size_t size);
/**
* Free VkVideoSessionParametersKHR.
* Create VkVideoSessionParametersKHR wrapped in an AVBufferRef.
*/
void ff_vk_decode_free_params(void *opaque, uint8_t *data);
int ff_vk_decode_create_params(AVBufferRef **par_ref, void *logctx, FFVulkanDecodeShared *ctx,
const VkVideoSessionParametersCreateInfoKHR *session_params_create);
/**
* Flush decoder.

28
libavcodec/vulkan_h264.c
Unescape View File

@ -285,10 +285,9 @@ static void set_pps(const PPS *pps, const SPS *sps,
static int vk_h264_create_params(AVCodecContext *avctx, AVBufferRef **buf)
{
VkResult ret;
int err;
FFVulkanDecodeContext *dec = avctx->internal->hwaccel_priv_data;
FFVulkanDecodeShared *ctx = (FFVulkanDecodeShared *)dec->shared_ref->data;
FFVulkanFunctions *vk = &ctx->s.vkfn;
const H264Context *h = avctx->priv_data;
/* SPS */
@ -319,11 +318,6 @@ static int vk_h264_create_params(AVCodecContext *avctx, AVBufferRef **buf)
.videoSessionParametersTemplate = NULL,
};
AVBufferRef *tmp;
VkVideoSessionParametersKHR *par = av_malloc(sizeof(*par));
if (!par)
return AVERROR(ENOMEM);
/* SPS list */
for (int i = 0; i < FF_ARRAY_ELEMS(h->ps.sps_list); i++) {
if (h->ps.sps_list[i]) {
@ -347,27 +341,13 @@ static int vk_h264_create_params(AVCodecContext *avctx, AVBufferRef **buf)
h264_params.maxStdSPSCount = h264_params_info.stdSPSCount;
h264_params.maxStdPPSCount = h264_params_info.stdPPSCount;
/* Create session parameters */
ret = vk->CreateVideoSessionParametersKHR(ctx->s.hwctx->act_dev, &session_params_create,
ctx->s.hwctx->alloc, par);
if (ret != VK_SUCCESS) {
av_log(avctx, AV_LOG_ERROR, "Unable to create Vulkan video session parameters: %s!\n",
ff_vk_ret2str(ret));
return AVERROR_EXTERNAL;
}
tmp = av_buffer_create((uint8_t *)par, sizeof(*par), ff_vk_decode_free_params,
ctx, 0);
if (!tmp) {
ff_vk_decode_free_params(ctx, (uint8_t *)par);
return AVERROR(ENOMEM);
}
err = ff_vk_decode_create_params(buf, avctx, ctx, &session_params_create);
if (err < 0)
return err;
av_log(avctx, AV_LOG_DEBUG, "Created frame parameters: %i SPS %i PPS\n",
h264_params_info.stdSPSCount, h264_params_info.stdPPSCount);
*buf = tmp;
return 0;
}

27
libavcodec/vulkan_hevc.c
Unescape View File

@ -650,11 +650,9 @@ static void set_vps(const HEVCVPS *vps,
static int vk_hevc_create_params(AVCodecContext *avctx, AVBufferRef **buf)
{
int err;
VkResult ret;
const HEVCContext *h = avctx->priv_data;
FFVulkanDecodeContext *dec = avctx->internal->hwaccel_priv_data;
FFVulkanDecodeShared *ctx = (FFVulkanDecodeShared *)dec->shared_ref->data;
FFVulkanFunctions *vk = &ctx->s.vkfn;
VkVideoDecodeH265SessionParametersAddInfoKHR h265_params_info = {
.sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_KHR,
@ -677,11 +675,6 @@ static int vk_hevc_create_params(AVCodecContext *avctx, AVBufferRef **buf)
AVBufferRef *data_set;
HEVCHeaderSet *hdr;
AVBufferRef *tmp;
VkVideoSessionParametersKHR *par = av_malloc(sizeof(*par));
if (!par)
return AVERROR(ENOMEM);
for (int i = 0; h->ps.vps_list[i]; i++)
nb_vps++;
@ -725,29 +718,15 @@ static int vk_hevc_create_params(AVCodecContext *avctx, AVBufferRef **buf)
h265_params.maxStdPPSCount = h265_params_info.stdPPSCount;
h265_params.maxStdVPSCount = h265_params_info.stdVPSCount;
/* Create session parameters */
ret = vk->CreateVideoSessionParametersKHR(ctx->s.hwctx->act_dev, &session_params_create,
ctx->s.hwctx->alloc, par);
err = ff_vk_decode_create_params(buf, avctx, ctx, &session_params_create);
av_buffer_unref(&data_set);
if (ret != VK_SUCCESS) {
av_log(avctx, AV_LOG_ERROR, "Unable to create Vulkan video session parameters: %s!\n",
ff_vk_ret2str(ret));
return AVERROR_EXTERNAL;
}
tmp = av_buffer_create((uint8_t *)par, sizeof(*par), ff_vk_decode_free_params,
ctx, 0);
if (!tmp) {
ff_vk_decode_free_params(ctx, (uint8_t *)par);
return AVERROR(ENOMEM);
}
if (err < 0)
return err;
av_log(avctx, AV_LOG_DEBUG, "Created frame parameters: %i SPS %i PPS %i VPS\n",
h265_params_info.stdSPSCount, h265_params_info.stdPPSCount,
h265_params_info.stdVPSCount);
*buf = tmp;
return 0;
}

Write Preview
Loading…
Cancel
Save