har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avutil/hwcontext_vulkan: Fix leaks in map_from_drm

Browse Source 
Also simplify error handing.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili 2024-02-20 20:08:57 +08:00
parent 6f9730cb28
commit 03275b0f09
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavutil/hwcontext_vulkan.c
View File

@ -2632,7 +2632,8 @@ static int vulkan_map_from_drm_frame_desc(AVHWFramesContext *hwfc, AVVkFrame **f
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
av_log(hwctx, AV_LOG_ERROR, "Failed to create semaphore: %s\n", av_log(hwctx, AV_LOG_ERROR, "Failed to create semaphore: %s\n",
ff_vk_ret2str(ret)); ff_vk_ret2str(ret));
return AVERROR_EXTERNAL; err = AVERROR_EXTERNAL;
goto fail;
} }
/* We'd import a semaphore onto the one we created using /* We'd import a semaphore onto the one we created using
@ -2751,14 +2752,7 @@ static int vulkan_map_from_drm_frame_desc(AVHWFramesContext *hwfc, AVVkFrame **f
return 0; return 0;
fail: fail:
for (int i = 0; i < desc->nb_layers; i++) { vulkan_frame_free(hwfc, f);
vk->DestroyImage(hwctx->act_dev, f->img[i], hwctx->alloc);
vk->DestroySemaphore(hwctx->act_dev, f->sem[i], hwctx->alloc);
}
for (int i = 0; i < desc->nb_objects; i++)
vk->FreeMemory(hwctx->act_dev, f->mem[i], hwctx->alloc);
av_free(f);
return err; return err;
} }