From patchwork Sun Feb 18 08:45:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 46346 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp669824pzb; Sun, 18 Feb 2024 00:47:47 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV4AdghG37n7GqBqDxiLBkwxSZW/9xkl0q1dIsEg8PmoDOxFJz7ta49IrPtDUB/53Pg3n+15VxlHpCTz+3ohByOylfBmWEYEDWlXg== X-Google-Smtp-Source: AGHT+IEaRwvS4m9s6dhhc2YZdXV/hqXl5iPkD1uTrT4w7DJW4Q8bgEgmRXCLIIaNyjRMkB4ZEcew X-Received: by 2002:a19:520a:0:b0:512:ab6e:4b34 with SMTP id m10-20020a19520a000000b00512ab6e4b34mr838140lfb.66.1708246067416; Sun, 18 Feb 2024 00:47:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708246067; cv=none; d=google.com; s=arc-20160816; b=r68AII5OJvBJT4YpYOhlAJeueDcnR5Y1e7QXjpuh+WNf05Zb0tRluJg104DGlr8kfu 7E/gnVbLY5GRNF2R4IedLwhA6vM8aQqP4+f10ZEgXYbdauDiIvWDfeyj0PVLwn7Ixi6i hh5dgamNi0feYffywITVskMdGDjN5xF0vl/ObgsWGTC+ohzIs1Kv1S6ToIGSN4UKaorc K+SFWSvBiyPLiHBnhOadGITgKWOCJ+mEs5QqoPhOPLVWbqlIcX2/O11bM1d4j3uGEmPN V043y17c6jo52OSAlvfidWuPXyVHmug+UKBr63IqyfsxABtEwIsaLDaSVT65ejn1JXx4 6XBg== 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:dkim-signature:delivered-to; bh=RPALaffz8+9WNRnEIznWyzRN+5MN4WmTuLmgEg0CBu0=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=FHLQpBL5HMR9QiHU4LLLgWyVO6CfOwUy37acy2Xbad5viqu41/7fZaCbP5Vj4ZEXOZ o+uE7Y0w7WGZun3c6qxzJdm/4dv6nGPMYWHV0vnBmJnHOKqBD3a5vrR/z4itmCN1h9tx jXQmYjuFceyJv/o8boZXloMCnaCJnYYXOknX+k/qVXYg1azlsiADhTm/PT3/VmR91m1J si+w/d3+u02MMH/s6Q79A/ZnN5FodUXlYYzUD4DTd/fo+Tm34e3Rmh3c5+fWiRgu3XN1 KWdlkKxwLW6g0K3dwi7dWoPgRQNp3/q2I4nxEyaZaCfsHyynQwLsWsysrvlMgzgqsWuK Pezw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=LiuDKkQH; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k5-20020a1709065fc500b00a3c5e118910si1465620ejv.725.2024.02.18.00.47.47; Sun, 18 Feb 2024 00:47:47 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=LiuDKkQH; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68DB268D361; Sun, 18 Feb 2024 10:46:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 012AD68D353 for ; Sun, 18 Feb 2024 10:46:42 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708246008; x=1739782008; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QUD3wrSb7kMWjainmgjomnEQ9amIovshWswAWEuhEsA=; b=LiuDKkQHC86gt6HfFxpZVeqyyLEjONvYg4czp0b+B2wkjIrUY8IiqHCl 376qY3Y28i0HtGXcAHHStH4rXAA2xYkrUEWn6bkGAIbuFPMPCjPXnpbaY xW4PEvhj7oHtS2DUcIX7dkQG9TcOvsckwkVLvFdEJRmc3ZIPqgTJOrahv R4nS72coS8H9u3/NQs+cSYRrDikM/pk94bFOFRF74daz6BdLd82NEEqdX UoUuRfMgmnNgQumT8W18HB/U7zHhEiQbJ9LMvB5v5VEIBrK+1JwyHR+KS k950LsSifjYFK/vPqqWFFsjd9QwABCfK6Dh+/MBAVnfGogbvRWO7CWMXL Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10987"; a="2203528" X-IronPort-AV: E=Sophos;i="6.06,168,1705392000"; d="scan'208";a="2203528" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2024 00:46:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,168,1705392000"; d="scan'208";a="35264903" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.66]) by fmviesa001.fm.intel.com with ESMTP; 18 Feb 2024 00:46:35 -0800 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Feb 2024 16:45:26 +0800 Message-ID: <20240218084529.554-7-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240218084529.554-1-tong1.wu@intel.com> References: <20240218084529.554-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 7/9] avutil/hwcontext_d3d12va: add Flags for resource creation 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: JMiz4k4J46Xr From: Tong Wu Flags field is added to support diffferent resource creation. Signed-off-by: Tong Wu --- doc/APIchanges | 3 +++ libavutil/hwcontext_d3d12va.c | 2 +- libavutil/hwcontext_d3d12va.h | 8 ++++++++ libavutil/version.h | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 4e94132cf0..e1ed7334db 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2024-01-xx - xxxxxxxxxx - lavu 58.40.100 - hwcontext_d3d12va.h + Add AVD3D12VAFramesContext.flags + 2024-02-16 - xxxxxxxxxx - lavu 58.39.100 - pixfmt.h Add AV_VIDEO_MAX_PLANES diff --git a/libavutil/hwcontext_d3d12va.c b/libavutil/hwcontext_d3d12va.c index 3acd5ac43a..b9984a4151 100644 --- a/libavutil/hwcontext_d3d12va.c +++ b/libavutil/hwcontext_d3d12va.c @@ -237,7 +237,7 @@ static AVBufferRef *d3d12va_pool_alloc(void *opaque, size_t size) .Format = hwctx->format, .SampleDesc = {.Count = 1, .Quality = 0 }, .Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN, - .Flags = D3D12_RESOURCE_FLAG_NONE, + .Flags = hwctx->flags, }; frame = av_mallocz(sizeof(AVD3D12VAFrame)); diff --git a/libavutil/hwcontext_d3d12va.h b/libavutil/hwcontext_d3d12va.h index ff06e6f2ef..608dbac97f 100644 --- a/libavutil/hwcontext_d3d12va.h +++ b/libavutil/hwcontext_d3d12va.h @@ -129,6 +129,14 @@ typedef struct AVD3D12VAFramesContext { * If unset, will be automatically set. */ DXGI_FORMAT format; + + /** + * This field is used to specify options for working with resources. + * If unset, this will be D3D12_RESOURCE_FLAG_NONE. + * + * @see: https://learn.microsoft.com/en-us/windows/win32/api/d3d12/ne-d3d12-d3d12_resource_flags. + */ + D3D12_RESOURCE_FLAGS flags; } AVD3D12VAFramesContext; #endif /* AVUTIL_HWCONTEXT_D3D12VA_H */ diff --git a/libavutil/version.h b/libavutil/version.h index 9f45af93df..3fbc292a68 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 58 -#define LIBAVUTIL_VERSION_MINOR 39 +#define LIBAVUTIL_VERSION_MINOR 40 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \