From patchwork Thu Feb 29 05:33:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 46644 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp379736pzb; Wed, 28 Feb 2024 21:36:12 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVdekemuk0xNx1jYRVvcbSJbMw7ucVcjLyBhpHAU4gOqUAT3raBZYszDnVelR+ALb9LiNeVny4tTRCwIWSJCop8vgUfNGkr0X9/ZQ== X-Google-Smtp-Source: AGHT+IHSukfPNZAzBHVOv31rztm2cSAO5gWNxQ9fIWR+RqX+Kdj5h+07jUFaDx8SM/gOBkkA/tbx X-Received: by 2002:a17:906:311a:b0:a3e:8c93:8431 with SMTP id 26-20020a170906311a00b00a3e8c938431mr631276ejx.2.1709184971793; Wed, 28 Feb 2024 21:36:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709184971; cv=none; d=google.com; s=arc-20160816; b=v8EqQKrcEEM1HlcILfnsGM97MmHVulzvTt4FG/s6Ltf/Gv58nmDsFYki1d9TI917M7 GLnJqZr+kbooy2/L6plRfL2coT9T5UUUxHXxR2GfKOZa7/9XY3FfgabGXjzpbHchN2Jw y0Rh6w9h+Kn+ohtMfkULICo3TqLP9IZqk7PPzEc6c7mF+w88OmxCZwkhPVJ/tKaZDA/z 23v6gO+zEH5bRFnD5jJU5nox03px/DIq2U88Eglg4qknbsQKvbmiKEJtDvXsxchsCl63 jgpBLliTAVPEWgdhCLVfqxyVn8+Fosikq5JL8DPXKMt+e/Mq+3fk0gw2n7NN9qiagWPK vazA== 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=jI1VOYrFILQBQGipLF7HB+kG7/00fSvhWcN3ytyhRMo=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=j8aJMg4HOmvqxOzrhSSof50Pckf/79N/2k4/2EkCySGBBzcXhOKfiZrev3hQPTeBZG LTu0it3ODnPJGQjnCGI3qNc6MFmTlhY3MpXzAAkUkHf7Pj6F/74LOgt3dseQ++z+kxMu xlQbLeM8l+8c0WVcxuykTLw4L6ypNpaN862866XrpJySlwq9QbFnKDhs5409g9uiolO9 pkHhST5GUDcH8aDDCJkakUuRh54FtDxV/D1Pv6tGJewRhBj/Alfdl/cn2k0vn0nJfrRr 1oR29dSUL3OzAghueqLuIxoSY9KDzaG30EHyPR517t2pXhQDz4I5lPAFznxXykPso2tJ YntA==; 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=VF6j1y6o; 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 lf9-20020a170906ae4900b00a3f84e8ba8bsi264593ejb.213.2024.02.28.21.36.11; Wed, 28 Feb 2024 21:36:11 -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=VF6j1y6o; 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 EBCBC68C60C; Thu, 29 Feb 2024 07:35:06 +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.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DB0E68D04F for ; Thu, 29 Feb 2024 07:34:56 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709184902; x=1740720902; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yJu3kM2vOIpRN03vDjOC5Jj6nvkds7G2ICbh3npS6v8=; b=VF6j1y6o4T6he7pkZcSsN7CWyDizBaahmZCXf5+cHq6on1KVi/j3Y3ta +MlvXNrIsOuHVNG4e7iopwKtCDbH+5UWAU9XhRrrqmlVdBWLiVy02HD4B QTXgtD/rRGDhfUaMzLByJ4TkEe4dOEfKQ9hqn6c/QqoGfVfbFcN8/nYA3 A1/kjxIfrhiEs7XVVOAP+OxkLmNQDrjjyQEPYphxq5cGxB9AD1mSjOZh0 qWpK3+D4BJMPRujy6CVSpGu9MempJQ0MBk9wihiG+c0Wf2TN4uKpf4t/t UNep3gy4j9cYzAxaa6ut2ER1mlTYsQNpWxebT2GUx2Ub/fwDBe8U/ZGsl g==; X-IronPort-AV: E=McAfee;i="6600,9927,10998"; a="3797832" X-IronPort-AV: E=Sophos;i="6.06,192,1705392000"; d="scan'208";a="3797832" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2024 21:34:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,192,1705392000"; d="scan'208";a="30870264" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.66]) by fmviesa002.fm.intel.com with ESMTP; 28 Feb 2024 21:34:48 -0800 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Feb 2024 13:33:23 +0800 Message-ID: <20240229053326.75-7-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240229053326.75-1-tong1.wu@intel.com> References: <20240229053326.75-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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: RckZR6x7jfDd 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 10f6667e9e..66c2408883 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-26 - xxxxxxxxxx - lavf 60.22.101 - avformat.h AV_DISPOSITION_DEPENDENT may now also be used for video streams intended to be merged with other video streams for presentation. 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, \