From patchwork Tue Aug 31 01:43:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 29887 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4497280iov; Mon, 30 Aug 2021 18:46:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhe789w0vK2dzJrXSS3FanBFk2XPnLan1kEojzrQ9gw5fPyB8bUyHVr7GxO+U3ZHTqOGUu X-Received: by 2002:a05:6402:705:: with SMTP id w5mr27247367edx.344.1630374370680; Mon, 30 Aug 2021 18:46:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630374370; cv=none; d=google.com; s=arc-20160816; b=MDYk0AKAVIqX+ghCDvBcU5bhPUPjzTQohKvEnRPKfB3Q9TMvM4F6NcL+EpEcwOQOq1 rCnxSv0N3DXkwB47ZvX3zCaeF2R4/u7Rl9GUXQg8neJ/NMo715eu70ptq3C7Ii2Wu7vx pkqLTCs5uJulq/HjSUV9Vh/hXHZAbIBy0FEGfH4e8pq8BkbMuQAELsbjNfBsJPeNkE/5 EcuuV2/XgFhDMYhaDvEFVs1pCFPmDql/ow/u/dl9bdvrK08cV7w/zUkcXLbq88cM3L7+ Sc6Is3a+6OxK0YXYQq/ullKM4LkwZl0lJdBNHDcaJHtdlqJrYOh1WRA94/ttg75eqF9x CYww== 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=kVgwr5ZeHboqzR8FCVefUaNEBf2O/bez/rC42kUuE/8=; b=YHcgK85CPm/3H1yigd4bqgTnTf2asmLOyj/wXgS+I7z0qK7I5pr5bpw//h+zDPUBZA HEgjgqjRAeKyMJ00nB3P7qK2vvQeR+kiN82szMhgHvC7KVNC/4SerMMo0f02ZPkxZCkr P6fcC6S0It3Mxg0Yp/9sSsYo9+R46q6wHiwBGvxAPisdlnW5RUVCe+YwL38GwMb73jDN 3nLXOvvRU21F+903q9LKqUlPPzQrHmuGRHa6Msx3Io7KZUrcJOHcBLpPAuyk94eM4Kge x9hRNZkmNpRAn6zoDHH7GWJybwFtlY4DYML/aJGYFzsrADR+6bYQbRekpEw6waSjktMP efhA== 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 y18si15660117ejh.298.2021.08.30.18.46.10; Mon, 30 Aug 2021 18:46:10 -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 1F5E568A2BD; Tue, 31 Aug 2021 04:45:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B98F5689FB2 for ; Tue, 31 Aug 2021 04:45:50 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10092"; a="216531701" X-IronPort-AV: E=Sophos;i="5.84,365,1620716400"; d="scan'208";a="216531701" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2021 18:45:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,365,1620716400"; d="scan'208";a="530827029" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.5]) by FMSMGA003.fm.intel.com with ESMTP; 30 Aug 2021 18:45:42 -0700 From: wenbin.chen@intel.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Aug 2021 09:43:30 +0800 Message-Id: <20210831014338.134086-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210831014338.134086-1-wenbin.chen@intel.com> References: <20210831014338.134086-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: "Chen,Wenbin" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DpZ0OJFYzS1e From: "Chen,Wenbin" 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, };