virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avfilter/vf_libplacebo: Use new vulkan queue API

Browse Source 
Fixes deprecation warning.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili
2025-06-16 22:37:01 +08:00
committed by Niklas Haas
parent 04ceabe2ba
commit 93987c03ec
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libavfilter/vf_libplacebo.c
View File

@ -647,8 +647,7 @@ static int init_vulkan(AVFilterContext *avctx, const AVVulkanDeviceContext *hwct
if (hwctx) { if (hwctx) {
#if PL_API_VER >= 278 #if PL_API_VER >= 278
/* Import libavfilter vulkan context into libplacebo */ struct pl_vulkan_import_params import_params = {
s->vulkan = pl_vulkan_import(s->log, pl_vulkan_import_params(
.instance = hwctx->inst, .instance = hwctx->inst,
.get_proc_addr = hwctx->get_proc_addr, .get_proc_addr = hwctx->get_proc_addr,
.phys_device = hwctx->phys_dev, .phys_device = hwctx->phys_dev,
@ -660,20 +659,39 @@ static int init_vulkan(AVFilterContext *avctx, const AVVulkanDeviceContext *hwct
.unlock_queue = unlock_queue, .unlock_queue = unlock_queue,
.queue_ctx = avctx->hw_device_ctx->data, .queue_ctx = avctx->hw_device_ctx->data,
.queue_graphics = { .queue_graphics = {
.index = hwctx->queue_family_index, .index = VK_QUEUE_FAMILY_IGNORED,
.count = hwctx->nb_graphics_queues, .count = 0,
}, },
.queue_compute = { .queue_compute = {
.index = hwctx->queue_family_comp_index, .index = VK_QUEUE_FAMILY_IGNORED,
.count = hwctx->nb_comp_queues, .count = 0,
}, },
.queue_transfer = { .queue_transfer = {
.index = hwctx->queue_family_tx_index, .index = VK_QUEUE_FAMILY_IGNORED,
.count = hwctx->nb_tx_queues, .count = 0,
}, },
/* This is the highest version created by hwcontext_vulkan.c */ /* This is the highest version created by hwcontext_vulkan.c */
.max_api_version = VK_API_VERSION_1_3, .max_api_version = VK_API_VERSION_1_3,
)); };
for (int i = 0; i < hwctx->nb_qf; i++) {
const AVVulkanDeviceQueueFamily *qf = &hwctx->qf[i];
if (qf->flags & VK_QUEUE_GRAPHICS_BIT) {
import_params.queue_graphics.index = qf->idx;
import_params.queue_graphics.count = qf->num;
}
if (qf->flags & VK_QUEUE_COMPUTE_BIT) {
import_params.queue_compute.index = qf->idx;
import_params.queue_compute.count = qf->num;
}
if (qf->flags & VK_QUEUE_TRANSFER_BIT) {
import_params.queue_transfer.index = qf->idx;
import_params.queue_transfer.count = qf->num;
}
}
/* Import libavfilter vulkan context into libplacebo */
s->vulkan = pl_vulkan_import(s->log, &import_params);
#else #else
av_log(s, AV_LOG_ERROR, "libplacebo version %s too old to import " av_log(s, AV_LOG_ERROR, "libplacebo version %s too old to import "
"Vulkan device, remove it or upgrade libplacebo to >= 5.278\n", "Vulkan device, remove it or upgrade libplacebo to >= 5.278\n",