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 572064F197 for ; Mon, 16 Jun 2025 14:37:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 3E4C868DD4E; Mon, 16 Jun 2025 17:37:10 +0300 (EEST) Received: from xmbghk7.mail.qq.com (xmbghk7.mail.qq.com [43.163.128.50]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 8B8EE68D867 for ; Mon, 16 Jun 2025 17:37:06 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1750084617; bh=JeLtUSnhMuI7puvBQa+tkBAIcsj2JdGu0oJeKqauRSY=; h=From:To:Cc:Subject:Date; b=SSoyUEBVYr2aNWrrnNlXIIf244l1uH4FcgO8j8JcElZy7RAthoX0xQDJ23lb0C2/3 gkJyKBajpieWNZMKO+fp2PpuzHeK52H9ymEvzQXo/lF1sa3d8oK9d7tC59oZO3M28B +8oA7hFytUbmDTIhCE3CRwQ7RMd+b1lkbBufy4Hg= Received: from localhost.localdomain ([119.147.10.242]) by newxmesmtplogicsvrszgpua8-0.qq.com (NewEsmtp) with SMTP id 9382582B; Mon, 16 Jun 2025 22:36:56 +0800 X-QQ-mid: xmsmtpt1750084616t1m0j2gym Message-ID: X-QQ-XMAILINFO: M7GSL7ENTetlxHUfCCMXe1j8orNGamG5WmD2e4odDPH6vGEGrymInDPM1qA8ZX 9wwooS1Rwz2QiEXIrqyM5P4kBVFxprSY01JQY37FoB1ELBzg2bpB1Sfj/p+codEJfqTBmiW9weFa KWEPGuCzMtaTYhDmebqHLQYE6g+gimSKB4fFTtL1DYJKFGsfOugdvzT7gkufcaqjwhE5d+pDH2gd 4mj0kxs/CwUQn4xK4VHRkz5HrUU8x3TVVXUxKXSjazR3qfHCdklEVDEnSybM4pFYVWH5dVSSKSES GVxx7fEvWo2IjYK3oNI53wBQ7aMmFFy3RRCyZPBVqsmylC7/w8oH2LVWnJwAkqloEW9uYzNPgDJ9 tZlkPd5RMQNt19fjuD3fcp7w7zrsTN3/vR9ZSCmA9j50b7UeQ1GXcsoi2ARbjEgcyK4jFdvzwiTH iVRUKvuZaFunHHgnHQ6O2x2yy30tsMN8cTANJN0yzCDRGKOfdsbOYJdOmvUoYoM+LQzxco9IvlyP nObMkXWvBzbQIyp0rmiZgfg98pV2URPThURK2ja0GiDDkgSduLKrIA1PN0LNnzvPrZcwFz5ab6bO P8jbrNpf6B05wj+6DA9EkKuSb7RT0pp/ZR7iB4416W8lUPG3oh1sLQvGLHc145lXcUP5fuos3W4V pIglygOnijQ8LogrbO190gj0srS/lzlxdO7fxV5xcdv6DNq8LFrVFEReffRBjGQ8IAFRIySCLoIK 2+6y4O8KNJejt7aAZ9AC1+HERA2mhoSdBQhb+/ZxOc5bNej9XGenjlOJXMOxouXSuHxzmENLUV62 CqjgjvocFHfJol+iYorrpNnWT2ys1UfvmzjzRtCjVujqfwHEvEs9/MztGZTqYmOtl40RM5hX48RF 7/zzGBfnHXbvkvTY/+YK9L8HzDJMUGGIL92CaFm7TEftPVkgTW0iapfKoJWiwvGJ0Zbs/BNmQOiD 434BBQPFDKC7VS1lKigqPEOOxb+RkJjifODA65nHCJ+tbrSjJtLR0IvbjmVwevJqRliLKwrXsuB4 Nm1z2dSg== X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jun 2025 22:36:57 +0800 X-OQ-MSGID: <20250616143657.451585-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] fftools/ffplay_renderer: 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 --- fftools/ffplay_renderer.c | 73 +++++++++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 19 deletions(-) diff --git a/fftools/ffplay_renderer.c b/fftools/ffplay_renderer.c index b702c2883f..699cd6ecd0 100644 --- a/fftools/ffplay_renderer.c +++ b/fftools/ffplay_renderer.c @@ -259,8 +259,8 @@ static int create_vk_by_hwcontext(VkRenderer *renderer, ctx->get_proc_addr = hwctx->get_proc_addr; ctx->inst = hwctx->inst; - ctx->placebo_vulkan = pl_vulkan_import(ctx->vk_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, @@ -272,18 +272,36 @@ static int create_vk_by_hwcontext(VkRenderer *renderer, .unlock_queue = hwctx_unlock_queue, .queue_ctx = dev, .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, }, - )); + }; + 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; + } + } + + ctx->placebo_vulkan = pl_vulkan_import(ctx->vk_log, &import_params); if (!ctx->placebo_vulkan) return AVERROR_EXTERNAL; @@ -408,21 +426,38 @@ static int create_vk_by_placebo(VkRenderer *renderer, vk_dev_ctx->enabled_dev_extensions = ctx->placebo_vulkan->extensions; vk_dev_ctx->nb_enabled_dev_extensions = ctx->placebo_vulkan->num_extensions; - vk_dev_ctx->queue_family_index = ctx->placebo_vulkan->queue_graphics.index; - vk_dev_ctx->nb_graphics_queues = ctx->placebo_vulkan->queue_graphics.count; - - vk_dev_ctx->queue_family_tx_index = ctx->placebo_vulkan->queue_transfer.index; - vk_dev_ctx->nb_tx_queues = ctx->placebo_vulkan->queue_transfer.count; - - vk_dev_ctx->queue_family_comp_index = ctx->placebo_vulkan->queue_compute.index; - vk_dev_ctx->nb_comp_queues = ctx->placebo_vulkan->queue_compute.count; + int nb_qf = 0; + vk_dev_ctx->qf[nb_qf] = (AVVulkanDeviceQueueFamily) { + .idx = ctx->placebo_vulkan->queue_graphics.index, + .num = ctx->placebo_vulkan->queue_graphics.count, + .flags = VK_QUEUE_GRAPHICS_BIT, + }; + nb_qf++; + vk_dev_ctx->qf[nb_qf] = (AVVulkanDeviceQueueFamily) { + .idx = ctx->placebo_vulkan->queue_transfer.index, + .num = ctx->placebo_vulkan->queue_transfer.count, + .flags = VK_QUEUE_TRANSFER_BIT, + }; + nb_qf++; + vk_dev_ctx->qf[nb_qf] = (AVVulkanDeviceQueueFamily) { + .idx = ctx->placebo_vulkan->queue_compute.index, + .num = ctx->placebo_vulkan->queue_compute.count, + .flags = VK_QUEUE_COMPUTE_BIT, + }; + nb_qf++; ret = get_decode_queue(renderer, &decode_index, &decode_count); if (ret < 0) return ret; - vk_dev_ctx->queue_family_decode_index = decode_index; - vk_dev_ctx->nb_decode_queues = decode_count; + vk_dev_ctx->qf[nb_qf] = (AVVulkanDeviceQueueFamily) { + .idx = decode_index, + .num = decode_count, + .flags = VK_QUEUE_VIDEO_DECODE_BIT_KHR, + }; + nb_qf++; + + vk_dev_ctx->nb_qf = nb_qf; ret = av_hwdevice_ctx_init(ctx->hw_device_ref); if (ret < 0) -- 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".