From patchwork Tue Aug 31 07:24:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 29901 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4685323iov; Tue, 31 Aug 2021 00:27:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzrt7eIzdWrN/GTeW2PEhtjUnaqFnp9cNZ21HJf4ik2j8kYiWRlp3/u2yM9JEnDyTaMtZB X-Received: by 2002:a17:906:4cc1:: with SMTP id q1mr30479451ejt.415.1630394829237; Tue, 31 Aug 2021 00:27:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630394829; cv=none; d=google.com; s=arc-20160816; b=M+XAouBDLhMZKqAxvXs8uBsOfe+t81Kh9TZ1nZZ5A9YyR/rOiMcBoYU+Luav9rHrsK 3qAZVgSgj6vy+ebzcuKGhz6AOQgo3+f7FofVtFLqqtE3NqGZX5FKAzpa2aJOlsybIEm/ Zqxe7qsyXj/p0+kDQjwrXPWTfAf8bFxXBCUnw30Rmyknbp25wQiOIwWLi+q8O+7ermZc +01+ThkedGn8MblNH0N+4BL1tQFx+vVIIoB6g51OSo2AdjCUFw/As1BkrTqs/uBE+t/a LiqSLh6w50k+9FzEETYc+QJJID7Kq9f1QKRN916MJIq9UUl40X+TLKychR/4FSPZZljh uyPA== 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:references:in-reply-to :message-id:date:to:from:delivered-to; bh=KTcIXLozmHy9eAyvxWmQIIiex77TS01nEMNIk0d4XEM=; b=E00OyajeVgkhWiG7e8wZcR3grcbPvJkHjbQdXMg9Ly93q9BRcuohqQ3a1scvB+4qYD yDc37MIznPg08MQdwwIxQH37sQdu2srzSi72mHUCBVpFIy3eEVZxRZAEMprlZEPPijTi sWWQnx7tlveAEuorQ4yJJZZyVcHtoweALUIlFWsrGW04Gd2cKt5KkDoa1BnyPFzK/Wgs 72QLeexWHQS0VmY4broMRtu4tnU+wcXFPDamNR0ZbvPzC5N1l1BPU+KGKivMLDhtEt1y o+2mkjuppx2QHytiUlf/AhCVpdZI+TAZQ61gxv3Ma9EWL+pCaXaoaw1xOWU5BvRa0giB Nt3A== 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 fl21si1229948ejc.273.2021.08.31.00.27.08; Tue, 31 Aug 2021 00:27:09 -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 6C09C689F59; Tue, 31 Aug 2021 10:27:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34593689E61 for ; Tue, 31 Aug 2021 10:26:55 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10092"; a="215291843" X-IronPort-AV: E=Sophos;i="5.84,365,1620716400"; d="scan'208";a="215291843" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 00:26:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,365,1620716400"; d="scan'208";a="540905108" 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:52 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Aug 2021 15:24:22 +0800 Message-Id: <20210831072430.303090-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210831072430.303090-1-wenbin.chen@intel.com> References: <20210831072430.303090-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [V2 02/10] libavutil/hwcontext_vulkan: fix a tile mismatch problem 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: 2agv8F/un1m3 We should configure VkImageSubresource according to tiling rather than extension. We use extension to set tiling only when we map from drm. Normally the output VkImages are not created in this way, and it will report error when we map these VkImage to drm, so we should configure VkImageSubresource according to tiling rather than extension. Now fix it. Signed-off-by: Wenbin Chen --- libavutil/hwcontext_vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 94fdad7f06..88db5b8b70 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -2888,7 +2888,7 @@ static int vulkan_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst, for (int i = 0; i < drm_desc->nb_layers; i++) { VkSubresourceLayout layout; VkImageSubresource sub = { - .aspectMask = p->extensions & EXT_DRM_MODIFIER_FLAGS ? + .aspectMask = f->tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT ? VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT : VK_IMAGE_ASPECT_COLOR_BIT, };