virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavfi/vulkan: fix issues the previous commit introduced

Browse Source 
One typo and one think-before-you-paste.
This commit is contained in:
Lynne 2021-11-16 11:19:10 +01:00
parent bd55552d69
commit 20c66fe2f9
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vulkan.c
View File

@ -119,7 +119,7 @@ void ff_vk_qf_init(AVFilterContext *avctx, FFVkQueueFamilyCtx *qf,
av_assert0(0); /* Should never happen */ av_assert0(0); /* Should never happen */
} }
if (qf->actual_queues) if (!nb_queues)
qf->nb_queues = qf->actual_queues; qf->nb_queues = qf->actual_queues;
else else
qf->nb_queues = nb_queues; qf->nb_queues = nb_queues;
@ -1258,10 +1258,10 @@ void ff_vk_update_descriptor_set(AVFilterContext *avctx, FFVulkanPipeline *pl,
/* If a set has never been updated, update all queues' sets. */ /* If a set has never been updated, update all queues' sets. */
if (!pl->desc_set_initialized[set_id]) { if (!pl->desc_set_initialized[set_id]) {
for (int i = 0; i < pl->qf->nb_queues; i++) { for (int i = 0; i < pl->qf->nb_queues; i++) {
set_id = set_id*pl->qf->nb_queues + i; int idx = set_id*pl->qf->nb_queues + i;
vk->UpdateDescriptorSetWithTemplate(s->hwctx->act_dev, vk->UpdateDescriptorSetWithTemplate(s->hwctx->act_dev,
pl->desc_set[set_id], pl->desc_set[idx],
pl->desc_template[set_id], pl->desc_template[idx],
s); s);
} }
pl->desc_set_initialized[set_id] = 1; pl->desc_set_initialized[set_id] = 1;