From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 1E3664F3BB for ; Mon, 16 Jun 2025 17:07:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id A778D68DAEC; Mon, 16 Jun 2025 20:07:04 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 3635868DA96 for ; Mon, 16 Jun 2025 20:06:58 +0300 (EEST) Received: from haasn.dev (unknown [10.30.1.1]) by haasn.dev (Postfix) with UTF8SMTP id E4A1D406B8; Mon, 16 Jun 2025 19:06:57 +0200 (CEST) Date: Mon, 16 Jun 2025 19:06:57 +0200 Message-ID: <20250616190657.GB89656@haasn.xyz> From: Niklas Haas To: ffmpeg-devel@ffmpeg.org In-Reply-To: References: MIME-Version: 1.0 Content-Disposition: inline Subject: Re: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_libplacebo: Use new vulkan queue API X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Mon, 16 Jun 2025 22:37:01 +0800 Zhao Zhili wrote: > From: Zhao Zhili > > Fixes deprecation warning. > > Signed-off-by: Zhao Zhili LGTM, thanks. > --- > libavfilter/vf_libplacebo.c | 36 +++++++++++++++++++++++++++--------- > 1 file changed, 27 insertions(+), 9 deletions(-) > > diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c > index 9ff64053cc..e9049710c2 100644 > --- a/libavfilter/vf_libplacebo.c > +++ b/libavfilter/vf_libplacebo.c > @@ -647,8 +647,7 @@ static int init_vulkan(AVFilterContext *avctx, const AVVulkanDeviceContext *hwct > > if (hwctx) { > #if PL_API_VER >= 278 > - /* Import libavfilter vulkan context into libplacebo */ > - s->vulkan = pl_vulkan_import(s->log, pl_vulkan_import_params( > + struct pl_vulkan_import_params import_params = { > .instance = hwctx->inst, > .get_proc_addr = hwctx->get_proc_addr, > .phys_device = hwctx->phys_dev, > @@ -660,20 +659,39 @@ static int init_vulkan(AVFilterContext *avctx, const AVVulkanDeviceContext *hwct > .unlock_queue = unlock_queue, > .queue_ctx = avctx->hw_device_ctx->data, > .queue_graphics = { > - .index = hwctx->queue_family_index, > - .count = hwctx->nb_graphics_queues, > + .index = VK_QUEUE_FAMILY_IGNORED, > + .count = 0, > }, > .queue_compute = { > - .index = hwctx->queue_family_comp_index, > - .count = hwctx->nb_comp_queues, > + .index = VK_QUEUE_FAMILY_IGNORED, > + .count = 0, > }, > .queue_transfer = { > - .index = hwctx->queue_family_tx_index, > - .count = hwctx->nb_tx_queues, > + .index = VK_QUEUE_FAMILY_IGNORED, > + .count = 0, > }, > /* This is the highest version created by hwcontext_vulkan.c */ > .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 > av_log(s, AV_LOG_ERROR, "libplacebo version %s too old to import " > "Vulkan device, remove it or upgrade libplacebo to >= 5.278\n", > -- > 2.25.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".