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 2FF684F3B7 for ; Mon, 16 Jun 2025 14:37:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id A261968DBBD; Mon, 16 Jun 2025 17:37:12 +0300 (EEST) Received: from out203-205-221-242.mail.qq.com (out203-205-221-242.mail.qq.com [203.205.221.242]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id B1CAD68DBBD for ; Mon, 16 Jun 2025 17:37:09 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1750084621; bh=N5jDyBsFWzKtmSjUwPdWGMdbH+vtTPTEpH98Fb79fkk=; h=From:To:Cc:Subject:Date; b=PTP3Hl3uTZE09tfRAw2Odq7X7h6/jGo2NR10FpH/MVx1V2v+Qfz+hNuYqRKM45Hag Ph/W8nutxdLAGKlL+KqT+xbns/9FAEx8TB8xjCXpSv+/m/ibVl0ALTbN1u8DZM2aOI /PfNQS8WZoJw+mPnCBpS1p8FAM34jUCw7NyyatJs= Received: from localhost.localdomain ([119.147.10.242]) by newxmesmtplogicsvrszb16-1.qq.com (NewEsmtp) with SMTP id 9403EE19; Mon, 16 Jun 2025 22:37:00 +0800 X-QQ-mid: xmsmtpt1750084620t1nud0ssu Message-ID: X-QQ-XMAILINFO: NRsgaNGnQ1mY+G7iO6SLZyDT4X/zU522p3uiUjuXyqyhigG2lO9X9GzzEaAxkJ 6RCMn1v87q18vt3kFaMyEKb8iFR/wVOwbe0hIs/OnsBQN81kbZXiw5qgDUSry9To6mtZQLvcHp5K lyCFOY3Vw2HcC16a1rKQLL1230zL2TrfHUYakQ5qgLFQnQ2QzqFDMu8VvLQZ8dHU0+Gbx0/FieYP RkK+VH44UUQ1gyoVWE4McNN5s9iI4S/Tz9DuFttxUeR8s+kexDqA+DAKk0mU9d5xx8SPc7MDnlG7 tpEl63zu+yRCYa/QZrLxcOQ+GGdkjOzihbjWCTPyDB4Y0eiao7kOeqqlvYdQBfIWetxOkvU0Xmev JswUkcg7HC+IsN64G3eYlkks7oKSfgdqastQgp5ER2nxywuqMLLqXVYex45EmPHWnYz3qpC/Qndc fRxBMfp6jLnzYw0AJrsw5hZQrN8b7/GEClx83PxXG2CS+T65dqcrE19fUhlUrB7+i/qEJlhDYLBD of2S+ustZzeVsg7oydtP/4MS/dMuPAgzQow/1IYPcx9nwGd+Uk5x4sarAGSZ0r4o4aOPZFvcpy/3 JFD4Qov493sWIbG28/k5xFmaNUhHEUEApJmVlhIeWYOhRcsofOJYPFcwhhkKeQH22eGRulgoaVJ4 G6Caflkz+skz2aT3J3OwL2G1TzWKeZrPAphFzVCWrQotH6NQkRuDd9Bl5/mnDOOtA+3MTbPqysL7 IPNBfsXJzASoy44kyFWyQRuZxdiKSxuJYdGTM8o0788uuxu2TFXycniKd3NY65rP6rAZCuuRTbmx LrKxPTK/lD4lKJajGxCtEA9CYUVLCm9KYPoItZZLyUhuarZdVdty2B4ovtAZ65ySASqBLsQFBLsG ZqYx5tTkjFa026NvlarMcgH/9dzV696vpn3AKYtCavSRwyoUhUKeTV9EfAPtB7sF7mmu4pMU69pV vJlYvGFE6pZxDUkHzQQgSUpvwMMaHpEI3UOQkyfEjOuIlzicd1Hp4kgInUYkrWMghZwHfMllbko8 sxMCcDTg== X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jun 2025 22:37:01 +0800 X-OQ-MSGID: <20250616143701.451661-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [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: From: Zhao Zhili Fixes deprecation warning. Signed-off-by: Zhao Zhili --- 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".