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

vulkan: flexibly allocate temporary imageviews

Browse Source 
No reason to allocate 16 when 3 will do.
This commit is contained in:
Lynne 2024-09-21 08:03:40 +02:00
parent 1445102e68
commit c4048013e5
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavutil/vulkan.c
View File

@ -1176,8 +1176,8 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat pixfmt)
} }
typedef struct ImageViewCtx { typedef struct ImageViewCtx {
VkImageView views[AV_NUM_DATA_POINTERS];
int nb_views; int nb_views;
VkImageView views[];
} ImageViewCtx; } ImageViewCtx;
static void destroy_imageviews(void *opaque, uint8_t *data) static void destroy_imageviews(void *opaque, uint8_t *data)
@ -1206,7 +1206,8 @@ int ff_vk_create_imageviews(FFVulkanContext *s, FFVkExecContext *e,
const int nb_images = ff_vk_count_images(vkf); const int nb_images = ff_vk_count_images(vkf);
const int nb_planes = av_pix_fmt_count_planes(hwfc->sw_format); const int nb_planes = av_pix_fmt_count_planes(hwfc->sw_format);
ImageViewCtx *iv = av_mallocz(sizeof(*iv)); const size_t buf_size = sizeof(int) + nb_planes*sizeof(VkImageView);
ImageViewCtx *iv = av_mallocz(buf_size);
if (!iv) if (!iv)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -1243,7 +1244,7 @@ int ff_vk_create_imageviews(FFVulkanContext *s, FFVkExecContext *e,
iv->nb_views++; iv->nb_views++;
} }
buf = av_buffer_create((uint8_t *)iv, sizeof(*iv), destroy_imageviews, s, 0); buf = av_buffer_create((uint8_t *)iv, buf_size, destroy_imageviews, s, 0);
if (!buf) { if (!buf) {
err = AVERROR(ENOMEM); err = AVERROR(ENOMEM);
goto fail; goto fail;