From patchwork Tue Aug 31 07:24:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 29892 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4685219iov; Tue, 31 Aug 2021 00:26:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVUibZ9D/TjZYfJW74dJ8ein/MLWkuc+vYT99fuGGS07qt0tllfFY9t+PjdogscJcWZB87 X-Received: by 2002:a17:907:7704:: with SMTP id kw4mr28668975ejc.23.1630394818871; Tue, 31 Aug 2021 00:26:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630394818; cv=none; d=google.com; s=arc-20160816; b=oMHJD1/NZAG3namQSi9WINLbTQOyEDtkp+cLZhTTnAx4NmAtWAdzezInyrUgrxxRVy UEITV24U0aRRQiXsKQpmqAnft2KLHe3dCwzBazRnJCjr3X79VWlAXh9XhhhT8Nn9unZN OiPJ6jC+9DFGOvX/cklgREzU6ogm8UxBB94zbQ0WZvKLe9A9WZWsDQJ/5Qm/d3Pi//tF o0JNb9Sq8DTPn51Rw0AiEpU1BEaIjSTvXGnHcdDNVGvkgxt70M3ChwsO1vBJ18qVwVFn VBi+Txr9dN++mWgyigvPX521TzCBECHVViaodqGCmXqIj0q/YXBUx7/a8OBaWVPUNYWx sw2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=affs3WuOkBcNV05wxV/DtuErCL2uXsBwCe5hvVkfLqo=; b=IdtTnDMwU1N6FWBhH0wwJGTNt17diiE4A0GR2sf7r0UbCUcfar21n8X25TIsAdIM/h FR5Dlt0qJMX6GW6zn7pV/6IxgEwMPWCMs8ejTRUIrhRLUaMye4E8myBWpqCmIHMSwEPx alTunOtNfCX2baNHGQOv4T/diSdc+Q14yDydqSkcZqSaVTzw/i0/VpDf2lRiaShXULlQ ykFtGKfaA1CJCdqPcFK5Kfp3xKixMoHXLjVTnYDS05ksNKLprHKgRHzeZxwa8g0c024C KiExiJ5SycNOd/b5+lzcQEykRwy3ATRskez/Lr6UfWYJE0bZQ6GtwyeZx4jkaq6JwmQR xoHA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id aq21si17512617ejc.637.2021.08.31.00.26.57; Tue, 31 Aug 2021 00:26:58 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5CD036899DA; Tue, 31 Aug 2021 10:26:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8686680749 for ; Tue, 31 Aug 2021 10:26:45 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10092"; a="282133617" X-IronPort-AV: E=Sophos;i="5.84,365,1620716400"; d="scan'208";a="282133617" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 00:26:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,365,1620716400"; d="scan'208";a="540905078" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.5]) by fmsmga002.fm.intel.com with ESMTP; 31 Aug 2021 00:26:42 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Aug 2021 15:24:21 +0800 Message-Id: <20210831072430.303090-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [V2 01/10] libavfilter/vulkan: Fix problem when device have queue_count greater than 1 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: Wenbin Chen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IlLUQlgFnQI4 If the descriptorSetCount is greater than the number of setLayouts, vkAllocateDescriptorSets will report error. Now fix it. Now the following command can run on the device that has queue_count greater than one: ffmpeg -v verbose -init_hw_device vulkan=vul:0 -filter_hw_device vul -i input1080p.264 -vf "hwupload=extra_hw_frames=16,scale_vulkan=1920:1080, hwdownload,format=yuv420p" -f rawvideo output.yuv Signed-off-by: Wenbin Chen --- libavfilter/vulkan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vulkan.c b/libavfilter/vulkan.c index 337c8d7d5a..e5b070b3e6 100644 --- a/libavfilter/vulkan.c +++ b/libavfilter/vulkan.c @@ -1160,7 +1160,7 @@ void ff_vk_update_descriptor_set(AVFilterContext *avctx, VulkanPipeline *pl, VulkanFilterContext *s = avctx->priv; vkUpdateDescriptorSetWithTemplate(s->hwctx->act_dev, - pl->desc_set[s->cur_queue_idx * pl->desc_layout_num + set_id], + pl->desc_set[set_id], pl->desc_template[set_id], s); } @@ -1179,7 +1179,7 @@ int ff_vk_init_pipeline_layout(AVFilterContext *avctx, VulkanPipeline *pl) VkResult ret; VulkanFilterContext *s = avctx->priv; - pl->descriptor_sets_num = pl->desc_layout_num * s->queue_count; + pl->descriptor_sets_num = pl->desc_layout_num; { /* Init descriptor set pool */ VkDescriptorPoolCreateInfo pool_create_info = {