From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id BD84D47FF9 for ; Wed, 8 Nov 2023 01:08:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BDE4368CCE2; Wed, 8 Nov 2023 03:08:24 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C595468CCBE for ; Wed, 8 Nov 2023 03:08:17 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699405703; x=1730941703; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=BIa6t8MdWBSC4ErLANLb6yzF61aoHJVcCQcPrU21LAo=; b=B5NPE5dRKei4DhVafbL/fOkyliaK+BXDTtATZXKjahhVvgducB08pW+W Kgv7B7bhPObNvn/WluCRvRN+ScCM7ZZyTI/dvCveIOu+6x9yelDxlAIwZ BHdOn59HkcYmlzMqoOJLR8SHWjTvF2nVqa2ZtxoawpODiM+JliKKVF50T 4Q3Gz5rAsP+V3v+47cTFAZj3eU/Msh3ZJL2B6w+nIT4O5GWimOqhqVjJv 4bXjD+J+fY+BiUsGotMMt+OoWhMydIwFuk5IGbhvBKyQWxR6J6DglH356 jbWd7JiA7XigVvIZBNMUvorzkeqMOC5nCHtGBZD4gPxR8tlqV2kIDtYLN A==; X-IronPort-AV: E=McAfee;i="6600,9927,10887"; a="475890973" X-IronPort-AV: E=Sophos;i="6.03,285,1694761200"; d="scan'208";a="475890973" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 17:08:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,285,1694761200"; d="scan'208";a="10623337" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orviesa001.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 07 Nov 2023 17:08:15 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Tue, 7 Nov 2023 17:08:14 -0800 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Tue, 7 Nov 2023 17:08:14 -0800 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34 via Frontend Transport; Tue, 7 Nov 2023 17:08:14 -0800 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.100) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.34; Tue, 7 Nov 2023 17:08:13 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SOSzUrqjXM5TKVezDR7XguxUs5UYqjYZrQDX7inwE+MjbSYtOE0AQ+wgWn4CaBs0FwDh3FuRg0BGy/UuNmQHQp3zg2NaedGiDZ+80estl+3hRofQFQGGVsBKHrNTagLiVy0UQT+8g0tdGon351vBZBthAMY2nei6tEkQiIyDd8cNQYEI0pGG+8ABASQ1xn6UODpW4KbD3lR21krXrGMKPR6KZey4ss12Via8/Ljh+Lh9NxLh8YWcugzqr8rF9sAoCzYP6xQFDGHSB0EdowcgjF3nGgoshDzg038nyjVVxt2EyVTf2zikQGrcSE+HuB52Ue8+YEBosbouZBahN/p6qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CaM+GEva9GA9+VEpKu+0O9Eut1zEqdTCU9wsoH6US/g=; b=FBbwNXlyFtLoeZzKCBu1byplWrQ1lAF0Qsp/DW6x6eikAvLzbygTch2NuJTnRzxCiIbtZ24xPKZcv6WcM7E5wyNPh/FMG3iMPDL4zk41bkCpMaT/LyJawYG4xq5KMSprwpTkJViO82qqPK9nRwnroFif8rbJj5+EPFMy6hfHdOszdQOf6p/5t7DM/42fEqvn/Ya60cXq5HuBWhNEl63CO8O9O+9D9TXq6jQp/3/gblls55YAqBUOswZHwaXG+2b3m6U+o+ZwsRnB58+SuDTQ0kr3rH51IQewwd6o2WTI9ifRYjXfh7cj2ob3u6HiuUVr2qwcZ/yImfXWnpO8ZOYzkg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from SN6PR11MB2990.namprd11.prod.outlook.com (2603:10b6:805:cf::21) by DM6PR11MB4739.namprd11.prod.outlook.com (2603:10b6:5:2a0::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.29; Wed, 8 Nov 2023 01:08:11 +0000 Received: from SN6PR11MB2990.namprd11.prod.outlook.com ([fe80::ad9a:2554:d386:75e5]) by SN6PR11MB2990.namprd11.prod.outlook.com ([fe80::ad9a:2554:d386:75e5%3]) with mapi id 15.20.6954.028; Wed, 8 Nov 2023 01:08:11 +0000 From: "Wu, Tong1" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v9 1/9] libavutil: add hwcontext_d3d12va and AV_PIX_FMT_D3D12 Thread-Index: AQHaEd/OjE6SdP8M30ulow6jZ1g6VbBvm/Ew Date: Wed, 8 Nov 2023 01:08:10 +0000 Message-ID: References: <20231108010552.52-1-tong1.wu@intel.com> In-Reply-To: <20231108010552.52-1-tong1.wu@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SN6PR11MB2990:EE_|DM6PR11MB4739:EE_ x-ms-office365-filtering-correlation-id: ec0370f5-4e47-4352-258e-08dbdff72ccf x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ir0jXPFk01LZVEGk9KEFEpwUd3Mj9JNwBIGIM3uN/K4oaOy7SZaUrbk59D5U7Za0R1zsazgOA48nley0qppM0H8Jhm7Cwx5hfM8ZRMr8/12ieEmxjvQyaFgLPr7rrj7+ApPB9D0cvaGlIMPHX3YFqE5TzGRxxMPvAsT9wk7GqzszVR9dwKEx6ALnHf7xCGDbSyZewnr1LpLpj+CdoRmq633PY7UzRC0GHn6Wcjgtm/hbuvI0TYv6oK5B3iGVq3aYt+qMfYBsbBPWwrfgTNzlL6MUJvUrakGsDXJ8XkKLC5oDXF+PL3UJIe9dUYLMpCXzRfvf3GHwtNkKwX87r4h9oy3SvcEOUEXxh8j5zQF37xxpCgEYkZM19bhh1OmKMW3u/StaeID5qd8bQlRU9orqkfpqL5/4qVp5eElo1sez7gFFImHwsrxxR0k5bSBsWruH6+N4B9GO/7fuQg2zV2rb6M7WMEjJjGyTixwxYLbGU/xHa+uSYz9pWRrkY0PkHq+mrgjxVJkr73vtKNkGCkFcnbiA5isp+1G5kNahWqtPF+gPHq1UVf6bUKf1bi3/zdeZ5Blf8PqZ6Y5YN4U4RUj4Y1mMrC7LbLYprQTcu3YqXs55jHT7P+/lFsvGSmL+XVSwAPr4rFYWU3jzC/vGZuzqjZTNRd2nF7wXU0VYlZ6x+d2E+hC5ZWyTSWbN4bu03P+k x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR11MB2990.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(396003)(39860400002)(366004)(376002)(346002)(136003)(230922051799003)(230173577357003)(230273577357003)(64100799003)(1800799009)(186009)(451199024)(66946007)(316002)(478600001)(966005)(82960400001)(71200400001)(45080400002)(66446008)(76116006)(66556008)(64756008)(6916009)(19627235002)(26005)(6506007)(7696005)(9686003)(4326008)(8676002)(52536014)(8936002)(2906002)(30864003)(66476007)(4001150100001)(41300700001)(5660300002)(33656002)(86362001)(38070700009)(83380400001)(38100700002)(122000001)(66899024)(55016003)(2004002)(579004)(559001)(309714004); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?aRznXRkb8oshwpn+ff3+BAWS2XjWbn6nWbsIMDoX4ncJQLWedpHff2UwsXha?= =?us-ascii?Q?jokZwgezc7Ec0ZLmoYW1QZXIpbmjpAy0sXNcChS20Wf1ceqW76y/rEqPp7Rv?= =?us-ascii?Q?PfoWRGo254uPNTidnXkuPSMlewv2G/ZA30Y566qGLBb65vJOgcpY/tnA03TY?= =?us-ascii?Q?FCNXYS3caKKwAhSLpKqsS/peNXxA50R05AfejMdOkrfUeEws8i1EGIdAjo07?= =?us-ascii?Q?xB/Wm4m/BH+81Unk1/P+omJDNuJPmf81/kucNfXMdK6ZPGfXWjv+xnyFgRQx?= =?us-ascii?Q?NSQnQsVIlAj/VRirSj2/sZLR3X0lH2ztQL8Qk3YLbMqWB2E8FtMNim1RTThJ?= =?us-ascii?Q?iNWwDvrlzbx93H0fArOQFoWW6+4E6LUGp5QrYhppQqTrXHz631sS7OYQ+Jun?= =?us-ascii?Q?6RX4JoeNKiIZa7NPkhN2fIbMfN5/vojXtsTDybp9WzUY/hg+EeIYu+H4u7b+?= =?us-ascii?Q?idl7WkfuJFDuNaSPLUQrch8vXFVaBKJHYkOaa/bYnOZlLOdCXcUG+YJgEoP2?= =?us-ascii?Q?rZeh146oytL74GLtL5xHikSZngr1jcV+qNgzLRcZKWzkUT/eD60Ku5/7b46x?= =?us-ascii?Q?fugSz8eluyEo5wjwJP8FQ5eIgH6EdUpHNOzVXF3H9lwQqPtgb1zs26VcgBIV?= =?us-ascii?Q?r7dE3xQrstEH1m4qrwIc95+H6WKrwWNszDpptNY5HT9KNJ3lBw442QRNCecA?= =?us-ascii?Q?ahXTgpCTvKGtzL6Pt63e8/hUHQtUUiuCQ8BMKCTjvHo78E7uN1KmZq3sqZCC?= =?us-ascii?Q?SBaFUZGrz0ZeLiov2J1DZa4/px/vSnpVxBDSmMX3ZRQAeICk+RGtp+Ga7FlZ?= =?us-ascii?Q?2ZicB4QxRV0iEJoyZNPJMOdMFRIQqu5Xj7twhOdCimoCaJICWiVFTeFikLRX?= =?us-ascii?Q?96DyHrH1Xf+5w8VFsitlk6VDEgE2qH6MwYaZZ01vyagMdUG+EFfgu3lozSRV?= =?us-ascii?Q?ZL57cDliJhJYCI+d3XqL+s5wz0+19cReSAXwqQIBMWQjd0zTN429dpGOm/sS?= =?us-ascii?Q?Ki1jDQpw0hL9W49gcPZz8qRKUkgYLipi4B2HekupfcK8vIMBsHS0YVC71GEM?= =?us-ascii?Q?2lebZu/ecqKRivSxsqDu7ItplAm2/mDpThXWESAS55LuBsm3qVWaDrF5+mJ7?= =?us-ascii?Q?lVZuY9rZd6Ev/xPsavddw/4KgEu4mwpLCis2hUgztZ3ajA6g8K1HSj3cFrwP?= =?us-ascii?Q?WhznivVTYBr6EPfCGupdDNgd27RNjdexeD4JRdw57PSphM1VlTGizSXZJRnK?= =?us-ascii?Q?DIzIUoTQOuIifTDNCFKkctPaDLDhmkuAHl3jiBuwhaBHordxatzmSFO0mj7b?= =?us-ascii?Q?BcWnO78g0M3xz7ccgI6QdHGnhuaoHvle2y5TXo87bDvcyQMruVdXMOx52YZw?= =?us-ascii?Q?XwhjjDIWqtA4xGPU8B9JTEindAh6pYAsN6kuiyhZsNGqAmRZHoLmYHOrl+pk?= =?us-ascii?Q?fFNxJan5QvIJhtvAr+TDiwSMnUKkLSERdU7C7wTPvm2HTM++5owVJxlomGnE?= =?us-ascii?Q?nxBBm6E6udcOh2MT6b40P6xOagK3ZekMyXUDVFL6YAtUZq4dDeCd+/uTVE4v?= =?us-ascii?Q?O5eTfz7Weydhjl4dV5I=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2990.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec0370f5-4e47-4352-258e-08dbdff72ccf X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Nov 2023 01:08:10.4600 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Ktr4skKy3HXhzI1lMfTl90k7jbteB4oRV5NTP1aalwN3NIVZrAEQ7b7VuUZPmm6N3cFKEGaDBrBXn3/8zujWeQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4739 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v9 1/9] libavutil: add hwcontext_d3d12va and AV_PIX_FMT_D3D12 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: Wu Jianhua Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Since 6.1 release has branched out. Resend this patch set and add this feature to the next release version. > configure | 5 + > doc/APIchanges | 7 + > libavutil/Makefile | 3 + > libavutil/hwcontext.c | 4 + > libavutil/hwcontext.h | 1 + > libavutil/hwcontext_d3d12va.c | 695 +++++++++++++++++++++++++ > libavutil/hwcontext_d3d12va.h | 142 +++++ > libavutil/hwcontext_d3d12va_internal.h | 59 +++ > libavutil/hwcontext_internal.h | 1 + > libavutil/pixdesc.c | 4 + > libavutil/pixfmt.h | 7 + > libavutil/tests/hwdevice.c | 2 + > libavutil/version.h | 2 +- > 13 files changed, 931 insertions(+), 1 deletion(-) > create mode 100644 libavutil/hwcontext_d3d12va.c > create mode 100644 libavutil/hwcontext_d3d12va.h > create mode 100644 libavutil/hwcontext_d3d12va_internal.h > >diff --git a/configure b/configure >index 8ab658f730..69d7a48280 100755 >--- a/configure >+++ b/configure >@@ -334,6 +334,7 @@ External library support: > --disable-cuda-llvm disable CUDA compilation using clang [autodetect] > --disable-cuvid disable Nvidia CUVID support [autodetect] > --disable-d3d11va disable Microsoft Direct3D 11 video acceleration code >[autodetect] >+ --disable-d3d12va disable Microsoft Direct3D 12 video acceleration code >[autodetect] > --disable-dxva2 disable Microsoft DirectX 9 video acceleration code >[autodetect] > --disable-ffnvcodec disable dynamically linked Nvidia code [autodetect] > --enable-libdrm enable DRM code (Linux) [no] >@@ -1922,6 +1923,7 @@ HWACCEL_AUTODETECT_LIBRARY_LIST=" > cuda_llvm > cuvid > d3d11va >+ d3d12va > dxva2 > ffnvcodec > nvdec >@@ -3041,6 +3043,7 @@ crystalhd_deps="libcrystalhd_libcrystalhd_if_h" > cuda_deps="ffnvcodec" > cuvid_deps="ffnvcodec" > d3d11va_deps="dxva_h ID3D11VideoDecoder ID3D11VideoContext" >+d3d12va_deps="dxva_h ID3D12Device ID3D12VideoDecoder" > dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32 user32" > ffnvcodec_deps_any="libdl LoadLibrary" > mediacodec_deps="android" >@@ -6563,6 +6566,8 @@ check_type "windows.h dxgi1_2.h" "IDXGIOutput1" > check_type "windows.h dxgi1_5.h" "IDXGIOutput5" > check_type "windows.h d3d11.h" "ID3D11VideoDecoder" > check_type "windows.h d3d11.h" "ID3D11VideoContext" >+check_type "windows.h d3d12.h" "ID3D12Device" >+check_type "windows.h d3d12video.h" "ID3D12VideoDecoder" > check_type "windows.h" "DPI_AWARENESS_CONTEXT" - >D_WIN32_WINNT=0x0A00 > check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode - >D_WIN32_WINNT=0x0602 > check_func_headers mfapi.h MFCreateAlignedMemoryBuffer -lmfplat >diff --git a/doc/APIchanges b/doc/APIchanges >index d4511ce2dd..2e71943b34 100644 >--- a/doc/APIchanges >+++ b/doc/APIchanges >@@ -2,6 +2,13 @@ The last version increases of all libraries were on 2023-02- >09 > > API changes, most recent first: > >+2023-11-07 - xxxxxxxxxx - lavu 58.32.100 - pixfmt.h hwcontext.h >hwcontext_d3d12va.h >+ Add AV_HWDEVICE_TYPE_D3D12VA and AV_PIX_FMT_D3D12. >+ Add AVD3D12VADeviceContext, AVD3D12VASyncContext, AVD3D12VAFrame >and >+ AVD3D12VAFramesContext. >+ Add av_d3d12va_map_sw_to_hw_format, av_d3d12va_sync_context_alloc, >+ av_d3d12va_sync_context_free. >+ > 2023-10-31 - xxxxxxxxxx - lavu 58.31.100 - pixdesc.h > Add AV_PIX_FMT_FLAG_XYZ. > >diff --git a/libavutil/Makefile b/libavutil/Makefile >index 4711f8cde8..6a8566f1d9 100644 >--- a/libavutil/Makefile >+++ b/libavutil/Makefile >@@ -42,6 +42,7 @@ HEADERS = adler32.h \ > hwcontext.h \ > hwcontext_cuda.h \ > hwcontext_d3d11va.h \ >+ hwcontext_d3d12va.h \ > hwcontext_drm.h \ > hwcontext_dxva2.h \ > hwcontext_qsv.h \ >@@ -190,6 +191,7 @@ OBJS = adler32.o \ > > OBJS-$(CONFIG_CUDA) += hwcontext_cuda.o > OBJS-$(CONFIG_D3D11VA) += hwcontext_d3d11va.o >+OBJS-$(CONFIG_D3D12VA) += hwcontext_d3d12va.o > OBJS-$(CONFIG_DXVA2) += hwcontext_dxva2.o > OBJS-$(CONFIG_LIBDRM) += hwcontext_drm.o > OBJS-$(CONFIG_MACOS_KPERF) += macos_kperf.o >@@ -213,6 +215,7 @@ SKIPHEADERS-$(HAVE_CUDA_H) += >hwcontext_cuda.h > SKIPHEADERS-$(CONFIG_CUDA) += hwcontext_cuda_internal.h \ > cuda_check.h > SKIPHEADERS-$(CONFIG_D3D11VA) += hwcontext_d3d11va.h >+SKIPHEADERS-$(CONFIG_D3D12VA) += hwcontext_d3d12va.h > SKIPHEADERS-$(CONFIG_DXVA2) += hwcontext_dxva2.h > SKIPHEADERS-$(CONFIG_QSV) += hwcontext_qsv.h > SKIPHEADERS-$(CONFIG_OPENCL) += hwcontext_opencl.h >diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c >index 3650d4653a..e23bad230f 100644 >--- a/libavutil/hwcontext.c >+++ b/libavutil/hwcontext.c >@@ -36,6 +36,9 @@ static const HWContextType * const hw_table[] = { > #if CONFIG_D3D11VA > &ff_hwcontext_type_d3d11va, > #endif >+#if CONFIG_D3D12VA >+ &ff_hwcontext_type_d3d12va, >+#endif > #if CONFIG_LIBDRM > &ff_hwcontext_type_drm, > #endif >@@ -71,6 +74,7 @@ static const char *const hw_type_names[] = { > [AV_HWDEVICE_TYPE_DRM] = "drm", > [AV_HWDEVICE_TYPE_DXVA2] = "dxva2", > [AV_HWDEVICE_TYPE_D3D11VA] = "d3d11va", >+ [AV_HWDEVICE_TYPE_D3D12VA] = "d3d12va", > [AV_HWDEVICE_TYPE_OPENCL] = "opencl", > [AV_HWDEVICE_TYPE_QSV] = "qsv", > [AV_HWDEVICE_TYPE_VAAPI] = "vaapi", >diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h >index 7ff08c8608..2b33721a97 100644 >--- a/libavutil/hwcontext.h >+++ b/libavutil/hwcontext.h >@@ -37,6 +37,7 @@ enum AVHWDeviceType { > AV_HWDEVICE_TYPE_OPENCL, > AV_HWDEVICE_TYPE_MEDIACODEC, > AV_HWDEVICE_TYPE_VULKAN, >+ AV_HWDEVICE_TYPE_D3D12VA, > }; > > typedef struct AVHWDeviceInternal AVHWDeviceInternal; >diff --git a/libavutil/hwcontext_d3d12va.c b/libavutil/hwcontext_d3d12va.c >new file mode 100644 >index 0000000000..0f1eecfc0c >--- /dev/null >+++ b/libavutil/hwcontext_d3d12va.c >@@ -0,0 +1,695 @@ >+/* >+ * Direct3D 12 HW acceleration. >+ * >+ * copyright (c) 2022-2023 Wu Jianhua >+ * >+ * This file is part of FFmpeg. >+ * >+ * FFmpeg is free software; you can redistribute it and/or >+ * modify it under the terms of the GNU Lesser General Public >+ * License as published by the Free Software Foundation; either >+ * version 2.1 of the License, or (at your option) any later version. >+ * >+ * FFmpeg is distributed in the hope that it will be useful, >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ * Lesser General Public License for more details. >+ * >+ * You should have received a copy of the GNU Lesser General Public >+ * License along with FFmpeg; if not, write to the Free Software >+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA >+ */ >+ >+#include "config.h" >+#include "common.h" >+#include "hwcontext.h" >+#include "hwcontext_internal.h" >+#include "hwcontext_d3d12va_internal.h" >+#include "hwcontext_d3d12va.h" >+#include "imgutils.h" >+#include "pixdesc.h" >+#include "pixfmt.h" >+#include "thread.h" >+#include "compat/w32dlfcn.h" >+#include >+ >+typedef HRESULT(WINAPI *PFN_CREATE_DXGI_FACTORY2)(UINT Flags, REFIID >riid, void **ppFactory); >+ >+typedef struct D3D12VAFramesContext { >+ ID3D12Resource *staging_buffer; >+ ID3D12CommandQueue *command_queue; >+ ID3D12CommandAllocator *command_allocator; >+ ID3D12GraphicsCommandList *command_list; >+ AVD3D12VASyncContext *sync_ctx; >+ int nb_surfaces; >+ int nb_surfaces_used; >+ DXGI_FORMAT format; >+ UINT luma_component_size; >+} D3D12VAFramesContext; >+ >+typedef struct D3D12VADevicePriv { >+ HANDLE d3d12lib; >+ HANDLE dxgilib; >+ PFN_CREATE_DXGI_FACTORY2 create_dxgi_factory2; >+ PFN_D3D12_CREATE_DEVICE create_device; >+ PFN_D3D12_GET_DEBUG_INTERFACE get_debug_interface; >+} D3D12VADevicePriv; >+ >+static const struct { >+ DXGI_FORMAT d3d_format; >+ enum AVPixelFormat pix_fmt; >+} supported_formats[] = { >+ { DXGI_FORMAT_NV12, AV_PIX_FMT_NV12 }, >+ { DXGI_FORMAT_P010, AV_PIX_FMT_P010 }, >+}; >+ >+DXGI_FORMAT av_d3d12va_map_sw_to_hw_format(enum AVPixelFormat >pix_fmt) >+{ >+ switch (pix_fmt) { >+ case AV_PIX_FMT_NV12:return DXGI_FORMAT_NV12; >+ case AV_PIX_FMT_P010:return DXGI_FORMAT_P010; >+ default: return DXGI_FORMAT_UNKNOWN; >+ } >+} >+ >+static int d3d12va_fence_completion(AVD3D12VASyncContext *sync_ctx) >+{ >+ uint64_t completion = ID3D12Fence_GetCompletedValue(sync_ctx->fence); >+ if (completion < sync_ctx->fence_value) { >+ if (FAILED(ID3D12Fence_SetEventOnCompletion(sync_ctx->fence, >sync_ctx->fence_value, sync_ctx->event))) >+ return AVERROR(EINVAL); >+ >+ WaitForSingleObjectEx(sync_ctx->event, INFINITE, FALSE); >+ } >+ >+ return 0; >+} >+ >+static inline int d3d12va_wait_queue_idle(AVD3D12VASyncContext *sync_ctx, >ID3D12CommandQueue *command_queue) >+{ >+ DX_CHECK(ID3D12CommandQueue_Signal(command_queue, sync_ctx- >>fence, ++sync_ctx->fence_value)); >+ return d3d12va_fence_completion(sync_ctx); >+ >+fail: >+ return AVERROR(EINVAL); >+} >+ >+int av_d3d12va_sync_context_alloc(AVD3D12VADeviceContext *ctx, >AVD3D12VASyncContext **psync_ctx) >+{ >+ AVD3D12VASyncContext *sync_ctx; >+ >+ sync_ctx = av_mallocz(sizeof(AVD3D12VASyncContext)); >+ if (!sync_ctx) >+ return AVERROR(ENOMEM); >+ >+ DX_CHECK(ID3D12Device_CreateFence(ctx->device, sync_ctx->fence_value, >D3D12_FENCE_FLAG_NONE, >+ &IID_ID3D12Fence, (void **)&sync_ctx->fence)); >+ >+ sync_ctx->event = CreateEvent(NULL, FALSE, FALSE, NULL); >+ if (!sync_ctx->event) >+ goto fail; >+ >+ *psync_ctx = sync_ctx; >+ >+ return 0; >+ >+fail: >+ D3D12_OBJECT_RELEASE(sync_ctx->fence); >+ av_freep(&sync_ctx); >+ return AVERROR(EINVAL); >+} >+ >+void av_d3d12va_sync_context_free(AVD3D12VASyncContext **psync_ctx) >+{ >+ AVD3D12VASyncContext *sync_ctx; >+ >+ if (!psync_ctx || !*psync_ctx) >+ return; >+ >+ sync_ctx = *psync_ctx; >+ >+ d3d12va_fence_completion(sync_ctx); >+ >+ D3D12_OBJECT_RELEASE(sync_ctx->fence); >+ >+ if (sync_ctx->event) >+ CloseHandle(sync_ctx->event); >+ >+ av_freep(psync_ctx); >+} >+ >+static inline int create_resource(ID3D12Device *device, const >D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES states, >ID3D12Resource **ppResource, int is_read_back) >+{ >+ D3D12_HEAP_PROPERTIES props = { >+ .Type = is_read_back ? D3D12_HEAP_TYPE_READBACK : >D3D12_HEAP_TYPE_DEFAULT, >+ .CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN, >+ .MemoryPoolPreference = D3D12_MEMORY_POOL_UNKNOWN, >+ .CreationNodeMask = 0, >+ .VisibleNodeMask = 0, >+ }; >+ >+ if (FAILED(ID3D12Device_CreateCommittedResource(device, &props, >D3D12_HEAP_FLAG_NONE, desc, >+ states, NULL, &IID_ID3D12Resource, (void **)ppResource))) >+ return AVERROR(EINVAL); >+ >+ return 0; >+} >+ >+static int d3d12va_create_staging_buffer_resource(AVHWFramesContext *ctx) >+{ >+ AVD3D12VADeviceContext *device_hwctx = ctx->device_ctx->hwctx; >+ D3D12VAFramesContext *s = ctx->internal->priv; >+ >+ D3D12_RESOURCE_DESC desc = { >+ .Dimension = D3D12_RESOURCE_DIMENSION_BUFFER, >+ .Alignment = 0, >+ .Width = 0, >+ .Height = 1, >+ .DepthOrArraySize = 1, >+ .MipLevels = 1, >+ .Format = DXGI_FORMAT_UNKNOWN, >+ .SampleDesc = { .Count = 1, .Quality = 0 }, >+ .Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR, >+ .Flags = D3D12_RESOURCE_FLAG_NONE, >+ }; >+ >+ s->luma_component_size = FFALIGN(ctx->width * (s->format == >DXGI_FORMAT_P010 ? 2 : 1), D3D12_TEXTURE_DATA_PITCH_ALIGNMENT) * >ctx->height; >+ desc.Width = s->luma_component_size + (s->luma_component_size >> 1); >+ >+ return create_resource(device_hwctx->device, &desc, >D3D12_RESOURCE_STATE_COPY_DEST, &s->staging_buffer, 1); >+} >+ >+static int d3d12va_create_helper_objects(AVHWFramesContext *ctx) >+{ >+ AVD3D12VADeviceContext *device_hwctx = ctx->device_ctx->hwctx; >+ D3D12VAFramesContext *s = ctx->internal->priv; >+ >+ D3D12_COMMAND_QUEUE_DESC queue_desc = { >+ .Type = D3D12_COMMAND_LIST_TYPE_COPY, >+ .Priority = 0, >+ .NodeMask = 0, >+ }; >+ >+ int ret = d3d12va_create_staging_buffer_resource(ctx); >+ if (ret < 0) >+ return ret; >+ >+ ret = av_d3d12va_sync_context_alloc(device_hwctx, &s->sync_ctx); >+ if (ret < 0) >+ return ret; >+ >+ DX_CHECK(ID3D12Device_CreateCommandQueue(device_hwctx->device, >&queue_desc, >+ &IID_ID3D12CommandQueue, (void **)&s->command_queue)); >+ >+ DX_CHECK(ID3D12Device_CreateCommandAllocator(device_hwctx->device, >queue_desc.Type, >+ &IID_ID3D12CommandAllocator, (void **)&s->command_allocator)); >+ >+ DX_CHECK(ID3D12Device_CreateCommandList(device_hwctx->device, 0, >queue_desc.Type, >+ s->command_allocator, NULL, &IID_ID3D12GraphicsCommandList, >(void **)&s->command_list)); >+ >+ DX_CHECK(ID3D12GraphicsCommandList_Close(s->command_list)); >+ >+ ID3D12CommandQueue_ExecuteCommandLists(s->command_queue, 1, >(ID3D12CommandList **)&s->command_list); >+ >+ return d3d12va_wait_queue_idle(s->sync_ctx, s->command_queue); >+ >+fail: >+ return AVERROR(EINVAL); >+} >+ >+static void d3d12va_frames_uninit(AVHWFramesContext *ctx) >+{ >+ AVD3D12VAFramesContext *frames_hwctx = ctx->hwctx; >+ D3D12VAFramesContext *s = ctx->internal->priv; >+ >+ av_d3d12va_sync_context_free(&s->sync_ctx); >+ >+ D3D12_OBJECT_RELEASE(s->staging_buffer); >+ D3D12_OBJECT_RELEASE(s->command_allocator); >+ D3D12_OBJECT_RELEASE(s->command_list); >+ D3D12_OBJECT_RELEASE(s->command_queue); >+ >+ av_freep(&frames_hwctx->texture_infos); >+} >+ >+static int d3d12va_frames_get_constraints(AVHWDeviceContext *ctx, const >void *hwconfig, AVHWFramesConstraints *constraints) >+{ >+ HRESULT hr; >+ int nb_sw_formats = 0; >+ AVD3D12VADeviceContext *device_hwctx = ctx->hwctx; >+ >+ constraints->valid_sw_formats = >av_malloc_array(FF_ARRAY_ELEMS(supported_formats) + 1, >+ sizeof(*constraints->valid_sw_formats)); >+ if (!constraints->valid_sw_formats) >+ return AVERROR(ENOMEM); >+ >+ for (int i = 0; i < FF_ARRAY_ELEMS(supported_formats); i++) { >+ D3D12_FEATURE_DATA_FORMAT_SUPPORT format_support = >{ supported_formats[i].d3d_format }; >+ hr = ID3D12Device_CheckFeatureSupport(device_hwctx->device, >D3D12_FEATURE_FORMAT_SUPPORT, &format_support, >sizeof(format_support)); >+ if (SUCCEEDED(hr) && (format_support.Support1 & >D3D12_FORMAT_SUPPORT1_TEXTURE2D)) >+ constraints->valid_sw_formats[nb_sw_formats++] = >supported_formats[i].pix_fmt; >+ } >+ constraints->valid_sw_formats[nb_sw_formats] = AV_PIX_FMT_NONE; >+ >+ constraints->valid_hw_formats = av_malloc_array(2, sizeof(*constraints- >>valid_hw_formats)); >+ if (!constraints->valid_hw_formats) >+ return AVERROR(ENOMEM); >+ >+ constraints->valid_hw_formats[0] = AV_PIX_FMT_D3D12; >+ constraints->valid_hw_formats[1] = AV_PIX_FMT_NONE; >+ >+ return 0; >+} >+ >+static void free_texture(void *opaque, uint8_t *data) >+{ >+ AVD3D12VAFrame *frame = (AVD3D12VAFrame *)data; >+ >+ if (frame->sync_ctx) >+ av_d3d12va_sync_context_free(&frame->sync_ctx); >+ >+ D3D12_OBJECT_RELEASE(frame->texture); >+ av_freep(&data); >+} >+ >+static AVBufferRef *d3d12va_pool_alloc(void *opaque, size_t size) >+{ >+ AVHWFramesContext *ctx = (AVHWFramesContext *)opaque; >+ D3D12VAFramesContext *s = ctx->internal->priv; >+ AVD3D12VAFramesContext *hwctx = ctx->hwctx; >+ AVD3D12VADeviceContext *device_hwctx = ctx->device_ctx->hwctx; >+ >+ int ret; >+ AVBufferRef *buf; >+ AVD3D12VAFrame *frame; >+ >+ D3D12_RESOURCE_DESC desc = { >+ .Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D, >+ .Alignment = 0, >+ .Width = ctx->width, >+ .Height = ctx->height, >+ .DepthOrArraySize = 1, >+ .MipLevels = 1, >+ .Format = s->format, >+ .SampleDesc = {.Count = 1, .Quality = 0 }, >+ .Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN, >+ .Flags = D3D12_RESOURCE_FLAG_NONE, >+ }; >+ >+ if (s->nb_surfaces_used >= ctx->initial_pool_size) { >+ av_log(ctx, AV_LOG_ERROR, "Static surface pool size exceeded.\n"); >+ return NULL; >+ } >+ >+ frame = av_mallocz(sizeof(AVD3D12VAFrame)); >+ if (!frame) >+ return NULL; >+ >+ ret = create_resource(device_hwctx->device, &desc, >D3D12_RESOURCE_STATE_COMMON, &frame->texture, 0); >+ if (ret < 0) >+ goto fail; >+ >+ ret = av_d3d12va_sync_context_alloc(device_hwctx, &frame->sync_ctx); >+ if (ret < 0) >+ goto fail; >+ >+ frame->index = s->nb_surfaces_used; >+ hwctx->texture_infos[s->nb_surfaces_used].texture = frame->texture; >+ hwctx->texture_infos[s->nb_surfaces_used].index = frame->index; >+ hwctx->texture_infos[s->nb_surfaces_used].sync_ctx = frame->sync_ctx; >+ s->nb_surfaces_used++; >+ >+ buf = av_buffer_create((uint8_t *)frame, sizeof(frame), free_texture, NULL, >0); >+ if (!buf) >+ goto fail; >+ >+ return buf; >+ >+fail: >+ free_texture(NULL, (uint8_t *)frame); >+ return NULL; >+} >+ >+static int d3d12va_frames_init(AVHWFramesContext *ctx) >+{ >+ AVD3D12VAFramesContext *hwctx = ctx->hwctx; >+ AVD3D12VADeviceContext *device_hwctx = ctx->device_ctx->hwctx; >+ D3D12VAFramesContext *s = ctx->internal->priv; >+ >+ int i; >+ >+ for (i = 0; i < FF_ARRAY_ELEMS(supported_formats); i++) { >+ if (ctx->sw_format == supported_formats[i].pix_fmt) { >+ s->format = supported_formats[i].d3d_format; >+ break; >+ } >+ } >+ if (i == FF_ARRAY_ELEMS(supported_formats)) { >+ av_log(ctx, AV_LOG_ERROR, "Unsupported pixel format: %s\n", >+ av_get_pix_fmt_name(ctx->sw_format)); >+ return AVERROR(EINVAL); >+ } >+ >+ hwctx->texture_infos = av_realloc_f(NULL, ctx->initial_pool_size, >sizeof(*hwctx->texture_infos)); >+ if (!hwctx->texture_infos) >+ return AVERROR(ENOMEM); >+ >+ memset(hwctx->texture_infos, 0, ctx->initial_pool_size * sizeof(*hwctx- >>texture_infos)); >+ s->nb_surfaces = ctx->initial_pool_size; >+ >+ ctx->internal->pool_internal = >av_buffer_pool_init2(sizeof(AVD3D12VAFrame), >+ ctx, d3d12va_pool_alloc, NULL); >+ >+ if (!ctx->internal->pool_internal) >+ return AVERROR(ENOMEM); >+ >+ return 0; >+} >+ >+static int d3d12va_get_buffer(AVHWFramesContext *ctx, AVFrame *frame) >+{ >+ int ret; >+ >+ frame->buf[0] = av_buffer_pool_get(ctx->pool); >+ if (!frame->buf[0]) >+ return AVERROR(ENOMEM); >+ >+ ret = av_image_fill_arrays(frame->data, frame->linesize, NULL, >+ ctx->sw_format, ctx->width, ctx->height, >+ D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); >+ if (ret < 0) >+ return ret; >+ >+ frame->data[0] = frame->buf[0]->data; >+ frame->format = AV_PIX_FMT_D3D12; >+ frame->width = ctx->width; >+ frame->height = ctx->height; >+ >+ return 0; >+} >+ >+static int d3d12va_transfer_get_formats(AVHWFramesContext *ctx, >+ enum AVHWFrameTransferDirection dir, >+ enum AVPixelFormat **formats) >+{ >+ D3D12VAFramesContext *s = ctx->internal->priv; >+ enum AVPixelFormat *fmts; >+ >+ fmts = av_malloc_array(2, sizeof(*fmts)); >+ if (!fmts) >+ return AVERROR(ENOMEM); >+ >+ fmts[0] = ctx->sw_format; >+ fmts[1] = AV_PIX_FMT_NONE; >+ >+ *formats = fmts; >+ >+ return 0; >+} >+ >+static int d3d12va_transfer_data(AVHWFramesContext *ctx, AVFrame *dst, >+ const AVFrame *src) >+{ >+ AVD3D12VADeviceContext *hwctx = ctx->device_ctx->hwctx; >+ AVD3D12VAFramesContext *frames_hwctx = ctx->hwctx; >+ D3D12VAFramesContext *s = ctx->internal->priv; >+ >+ int ret; >+ int download = src->format == AV_PIX_FMT_D3D12; >+ const AVFrame *frame = download ? src : dst; >+ const AVFrame *other = download ? dst : src; >+ >+ AVD3D12VAFrame *f = (AVD3D12VAFrame *)frame->data[0]; >+ ID3D12Resource *texture = (ID3D12Resource *) f->texture; >+ int index = (intptr_t) f->index; >+ AVD3D12VASyncContext *sync_ctx = (AVD3D12VASyncContext *)f- >>sync_ctx; >+ >+ uint8_t *mapped_data; >+ uint8_t *data[4]; >+ int linesizes[4]; >+ >+ D3D12_TEXTURE_COPY_LOCATION staging_y_location; >+ D3D12_TEXTURE_COPY_LOCATION staging_uv_location; >+ >+ D3D12_TEXTURE_COPY_LOCATION texture_y_location = { >+ .pResource = texture, >+ .Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX, >+ .SubresourceIndex = 0, >+ }; >+ >+ D3D12_TEXTURE_COPY_LOCATION texture_uv_location = { >+ .pResource = texture, >+ .Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX, >+ .SubresourceIndex = 1, >+ }; >+ >+ D3D12_RESOURCE_BARRIER barrier = { >+ .Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION, >+ .Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE, >+ .Transition = { >+ .pResource = texture, >+ .StateBefore = D3D12_RESOURCE_STATE_COMMON, >+ .StateAfter = D3D12_RESOURCE_STATE_COPY_SOURCE, >+ .Subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES, >+ } >+ }; >+ >+ s->format = av_d3d12va_map_sw_to_hw_format(ctx->sw_format); >+ >+ if (frame->hw_frames_ctx->data != (uint8_t *)ctx || other->format != ctx- >>sw_format) >+ return AVERROR(EINVAL); >+ >+ if (!s->command_queue) { >+ ret = d3d12va_create_helper_objects(ctx); >+ if (ret < 0) >+ return ret; >+ } >+ >+ for (int i = 0; i < 4; i++) >+ linesizes[i] = FFALIGN(frame->width * (s->format == >DXGI_FORMAT_P010 ? 2 : 1), D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); >+ >+ staging_y_location = (D3D12_TEXTURE_COPY_LOCATION) { >+ .pResource = s->staging_buffer, >+ .Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT, >+ .PlacedFootprint = { >+ .Offset = 0, >+ .Footprint = { >+ .Format = s->format == DXGI_FORMAT_P010 ? >DXGI_FORMAT_R16_UNORM : DXGI_FORMAT_R8_UNORM, >+ .Width = ctx->width, >+ .Height = ctx->height, >+ .Depth = 1, >+ .RowPitch = linesizes[0], >+ }, >+ }, >+ }; >+ >+ staging_uv_location = (D3D12_TEXTURE_COPY_LOCATION) { >+ .pResource = s->staging_buffer, >+ .Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT, >+ .PlacedFootprint = { >+ .Offset = s->luma_component_size, >+ .Footprint = { >+ .Format = s->format == DXGI_FORMAT_P010 ? >DXGI_FORMAT_R16G16_UNORM : DXGI_FORMAT_R8G8_UNORM, >+ .Width = ctx->width >> 1, >+ .Height = ctx->height >> 1, >+ .Depth = 1, >+ .RowPitch = linesizes[0], >+ }, >+ }, >+ }; >+ >+ DX_CHECK(ID3D12CommandAllocator_Reset(s->command_allocator)); >+ >+ DX_CHECK(ID3D12GraphicsCommandList_Reset(s->command_list, s- >>command_allocator, NULL)); >+ >+ if (download) { >+ ID3D12GraphicsCommandList_ResourceBarrier(s->command_list, 1, >&barrier); >+ >+ ID3D12GraphicsCommandList_CopyTextureRegion(s->command_list, >+ &staging_y_location, 0, 0, 0, >+ &texture_y_location, NULL); >+ >+ ID3D12GraphicsCommandList_CopyTextureRegion(s->command_list, >+ &staging_uv_location, 0, 0, 0, >+ &texture_uv_location, NULL); >+ >+ barrier.Transition.StateBefore = barrier.Transition.StateAfter; >+ barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_COMMON; >+ ID3D12GraphicsCommandList_ResourceBarrier(s->command_list, 1, >&barrier); >+ >+ DX_CHECK(ID3D12GraphicsCommandList_Close(s->command_list)); >+ >+ DX_CHECK(ID3D12CommandQueue_Wait(s->command_queue, >sync_ctx->fence, sync_ctx->fence_value)); >+ >+ ID3D12CommandQueue_ExecuteCommandLists(s->command_queue, 1, >(ID3D12CommandList **)&s->command_list); >+ >+ ret = d3d12va_wait_queue_idle(s->sync_ctx, s->command_queue); >+ if (ret < 0) >+ return ret; >+ >+ DX_CHECK(ID3D12Resource_Map(s->staging_buffer, 0, NULL, (void >**)&mapped_data)); >+ av_image_fill_pointers(data, ctx->sw_format, ctx->height, mapped_data, >linesizes); >+ >+ av_image_copy(dst->data, dst->linesize, data, linesizes, >+ ctx->sw_format, ctx->width, ctx->height); >+ >+ ID3D12Resource_Unmap(s->staging_buffer, 0, NULL); >+ } else { >+ av_log(ctx, AV_LOG_ERROR, "Transfer data to AV_PIX_FMT_D3D12 is not >supported yet!\n"); >+ return AVERROR(EINVAL); >+ } >+ >+ return 0; >+ >+fail: >+ return AVERROR(EINVAL); >+} >+ >+static int d3d12va_load_functions(AVHWDeviceContext *hwdev) >+{ >+ D3D12VADevicePriv *priv = hwdev->internal->priv; >+ >+#if !HAVE_UWP >+ priv->d3d12lib = dlopen("d3d12.dll", 0); >+ priv->dxgilib = dlopen("dxgi.dll", 0); >+ >+ if (!priv->d3d12lib || !priv->dxgilib) >+ goto fail; >+ >+ priv->create_device = (PFN_D3D12_CREATE_DEVICE)GetProcAddress(priv- >>d3d12lib, "D3D12CreateDevice"); >+ if (!priv->create_device) >+ goto fail; >+ >+ priv->create_dxgi_factory2 = >(PFN_CREATE_DXGI_FACTORY2)GetProcAddress(priv->dxgilib, >"CreateDXGIFactory2"); >+ if (!priv->create_dxgi_factory2) >+ goto fail; >+ >+ priv->get_debug_interface = >(PFN_D3D12_GET_DEBUG_INTERFACE)GetProcAddress(priv->d3d12lib, >"D3D12GetDebugInterface"); >+#else >+ priv->create_device = (PFN_D3D12_CREATE_DEVICE) >D3D12CreateDevice; >+ priv->create_dxgi_factory2 = (PFN_CREATE_DXGI_FACTORY2) >CreateDXGIFactory2; >+ priv->get_debug_interface = (PFN_D3D12_GET_DEBUG_INTERFACE) >D3D12GetDebugInterface; >+#endif >+ return 0; >+ >+fail: >+ av_log(hwdev, AV_LOG_ERROR, "Failed to load D3D12 library or its >functions\n"); >+ return AVERROR_UNKNOWN; >+} >+ >+static void d3d12va_device_free(AVHWDeviceContext *hwdev) >+{ >+ AVD3D12VADeviceContext *ctx = hwdev->hwctx; >+ D3D12VADevicePriv *priv = hwdev->internal->priv; >+ >+ D3D12_OBJECT_RELEASE(ctx->device); >+ >+ if (priv->d3d12lib) >+ dlclose(priv->d3d12lib); >+ >+ if (priv->dxgilib) >+ dlclose(priv->dxgilib); >+} >+ >+static int d3d12va_device_init(AVHWDeviceContext *hwdev) >+{ >+ AVD3D12VADeviceContext *ctx = hwdev->hwctx; >+ >+ if (!ctx->video_device) >+ DX_CHECK(ID3D12Device_QueryInterface(ctx->device, >&IID_ID3D12VideoDevice, (void **)&ctx->video_device)); >+ >+ return 0; >+ >+fail: >+ return AVERROR(EINVAL); >+} >+ >+static void d3d12va_device_uninit(AVHWDeviceContext *hwdev) >+{ >+ AVD3D12VADeviceContext *device_hwctx = hwdev->hwctx; >+ >+ D3D12_OBJECT_RELEASE(device_hwctx->video_device); >+} >+ >+static int d3d12va_device_create(AVHWDeviceContext *hwdev, const char >*device, >+ AVDictionary *opts, int flags) >+{ >+ AVD3D12VADeviceContext *ctx = hwdev->hwctx; >+ D3D12VADevicePriv *priv = hwdev->internal->priv; >+ >+ HRESULT hr; >+ UINT create_flags = 0; >+ IDXGIAdapter *pAdapter = NULL; >+ >+ int ret; >+ int is_debug = !!av_dict_get(opts, "debug", NULL, 0); >+ >+ hwdev->free = d3d12va_device_free; >+ >+ ret = d3d12va_load_functions(hwdev); >+ if (ret < 0) >+ return ret; >+ >+ if (is_debug) { >+ ID3D12Debug *pDebug; >+ if (priv->get_debug_interface && SUCCEEDED(priv- >>get_debug_interface(&IID_ID3D12Debug, (void **)&pDebug))) { >+ create_flags |= DXGI_CREATE_FACTORY_DEBUG; >+ ID3D12Debug_EnableDebugLayer(pDebug); >+ D3D12_OBJECT_RELEASE(pDebug); >+ av_log(hwdev, AV_LOG_INFO, "D3D12 debug layer is enabled!\n"); >+ } >+ } >+ >+ if (!ctx->device) { >+ IDXGIFactory2 *pDXGIFactory = NULL; >+ >+ hr = priv->create_dxgi_factory2(create_flags, &IID_IDXGIFactory2, (void >**)&pDXGIFactory); >+ if (SUCCEEDED(hr)) { >+ int adapter = device ? atoi(device) : 0; >+ if (FAILED(IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter, >&pAdapter))) >+ pAdapter = NULL; >+ IDXGIFactory2_Release(pDXGIFactory); >+ } >+ >+ if (pAdapter) { >+ DXGI_ADAPTER_DESC desc; >+ hr = IDXGIAdapter2_GetDesc(pAdapter, &desc); >+ if (!FAILED(hr)) { >+ av_log(ctx, AV_LOG_INFO, "Using device %04x:%04x (%ls).\n", >+ desc.VendorId, desc.DeviceId, desc.Description); >+ } >+ } >+ >+ hr = priv->create_device((IUnknown *)pAdapter, >D3D_FEATURE_LEVEL_12_0, &IID_ID3D12Device, (void **)&ctx->device); >+ D3D12_OBJECT_RELEASE(pAdapter); >+ if (FAILED(hr)) { >+ av_log(ctx, AV_LOG_ERROR, "Failed to create Direct 3D 12 device >(%lx)\n", (long)hr); >+ return AVERROR_UNKNOWN; >+ } >+ } >+ >+ return 0; >+} >+ >+const HWContextType ff_hwcontext_type_d3d12va = { >+ .type = AV_HWDEVICE_TYPE_D3D12VA, >+ .name = "D3D12VA", >+ >+ .device_hwctx_size = sizeof(AVD3D12VADeviceContext), >+ .device_priv_size = sizeof(D3D12VADevicePriv), >+ .frames_hwctx_size = sizeof(AVD3D12VAFramesContext), >+ .frames_priv_size = sizeof(D3D12VAFramesContext), >+ >+ .device_create = d3d12va_device_create, >+ .device_init = d3d12va_device_init, >+ .device_uninit = d3d12va_device_uninit, >+ .frames_get_constraints = d3d12va_frames_get_constraints, >+ .frames_init = d3d12va_frames_init, >+ .frames_uninit = d3d12va_frames_uninit, >+ .frames_get_buffer = d3d12va_get_buffer, >+ .transfer_get_formats = d3d12va_transfer_get_formats, >+ .transfer_data_to = d3d12va_transfer_data, >+ .transfer_data_from = d3d12va_transfer_data, >+ >+ .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_D3D12, >AV_PIX_FMT_NONE }, >+}; >diff --git a/libavutil/hwcontext_d3d12va.h b/libavutil/hwcontext_d3d12va.h >new file mode 100644 >index 0000000000..7802981c99 >--- /dev/null >+++ b/libavutil/hwcontext_d3d12va.h >@@ -0,0 +1,142 @@ >+/* >+ * Direct3D 12 HW acceleration. >+ * >+ * copyright (c) 2022-2023 Wu Jianhua >+ * >+ * This file is part of FFmpeg. >+ * >+ * FFmpeg is free software; you can redistribute it and/or >+ * modify it under the terms of the GNU Lesser General Public >+ * License as published by the Free Software Foundation; either >+ * version 2.1 of the License, or (at your option) any later version. >+ * >+ * FFmpeg is distributed in the hope that it will be useful, >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ * Lesser General Public License for more details. >+ * >+ * You should have received a copy of the GNU Lesser General Public >+ * License along with FFmpeg; if not, write to the Free Software >+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA >+ */ >+ >+#ifndef AVUTIL_HWCONTEXT_D3D12VA_H >+#define AVUTIL_HWCONTEXT_D3D12VA_H >+ >+/** >+ * @file >+ * An API-specific header for AV_HWDEVICE_TYPE_D3D12VA. >+ * >+ * This API does not support dynamic frame pools. AVHWFramesContext.pool >must >+ * contain AVBufferRefs whose data pointer points to an >AVD3D12FrameDescriptor struct. >+ */ >+#include >+#include >+#include >+#include >+#include >+ >+/** >+ * @brief This struct is allocated as AVHWDeviceContext.hwctx >+ * >+ */ >+typedef struct AVD3D12VADeviceContext { >+ /** >+ * Device used for objects creation and access. This can also be >+ * used to set the libavcodec decoding device. >+ * >+ * Can be set by the user. This is the only mandatory field - the other >+ * device context fields are set from this and are available for convenience. >+ * >+ * Deallocating the AVHWDeviceContext will always release this interface, >+ * and it does not matter whether it was user-allocated. >+ */ >+ ID3D12Device *device; >+ >+ /** >+ * If unset, this will be set from the device field on init. >+ * >+ * Deallocating the AVHWDeviceContext will always release this interface, >+ * and it does not matter whether it was user-allocated. >+ */ >+ ID3D12VideoDevice *video_device; >+} AVD3D12VADeviceContext; >+ >+/** >+ * @brief This struct is used to sync d3d12 execution >+ * >+ */ >+typedef struct AVD3D12VASyncContext { >+ /** >+ * D3D12 fence object >+ */ >+ ID3D12Fence *fence; >+ >+ /** >+ * A handle to the event object >+ */ >+ HANDLE event; >+ >+ /** >+ * The fence value used for sync >+ */ >+ uint64_t fence_value; >+} AVD3D12VASyncContext; >+ >+/** >+ * @brief D3D12VA frame descriptor for pool allocation. >+ * >+ */ >+typedef struct AVD3D12VAFrame { >+ /** >+ * The texture in which the frame is located. The reference count is >+ * managed by the AVBufferRef, and destroying the reference will release >+ * the interface. >+ */ >+ ID3D12Resource *texture; >+ >+ /** >+ * The index into the array texture element representing the frame >+ */ >+ intptr_t index; >+ >+ /** >+ * The sync context for the texture >+ * >+ * Use av_d3d12va_wait_idle(sync_ctx) to ensure the decoding or encoding >have been finised >+ * @see: https://learn.microsoft.com/en- >us/windows/win32/medfound/direct3d-12-video-overview#directx-12-fences >+ */ >+ AVD3D12VASyncContext *sync_ctx; >+} AVD3D12VAFrame; >+ >+/** >+ * @brief This struct is allocated as AVHWFramesContext.hwctx >+ * >+ */ >+typedef struct AVD3D12VAFramesContext { >+ /** >+ * This field is not able to be user-allocated at the present. >+ */ >+ AVD3D12VAFrame *texture_infos; >+} AVD3D12VAFramesContext; >+ >+/** >+ * @brief Map sw pixel format to d3d12 format >+ * >+ * @return d3d12 specified format >+ */ >+DXGI_FORMAT av_d3d12va_map_sw_to_hw_format(enum AVPixelFormat >pix_fmt); >+ >+/** >+ * @brief Allocate an AVD3D12VASyncContext >+ * >+ * @return Error code (ret < 0 if failed) >+ */ >+int av_d3d12va_sync_context_alloc(AVD3D12VADeviceContext *ctx, >AVD3D12VASyncContext **sync_ctx); >+ >+/** >+ * @brief Free an AVD3D12VASyncContext >+ */ >+void av_d3d12va_sync_context_free(AVD3D12VASyncContext **sync_ctx); >+ >+#endif /* AVUTIL_HWCONTEXT_D3D12VA_H */ >diff --git a/libavutil/hwcontext_d3d12va_internal.h >b/libavutil/hwcontext_d3d12va_internal.h >new file mode 100644 >index 0000000000..bfd89b3545 >--- /dev/null >+++ b/libavutil/hwcontext_d3d12va_internal.h >@@ -0,0 +1,59 @@ >+/* >+ * Direct3D 12 HW acceleration. >+ * >+ * copyright (c) 2022-2023 Wu Jianhua >+ * >+ * This file is part of FFmpeg. >+ * >+ * FFmpeg is free software; you can redistribute it and/or >+ * modify it under the terms of the GNU Lesser General Public >+ * License as published by the Free Software Foundation; either >+ * version 2.1 of the License, or (at your option) any later version. >+ * >+ * FFmpeg is distributed in the hope that it will be useful, >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ * Lesser General Public License for more details. >+ * >+ * You should have received a copy of the GNU Lesser General Public >+ * License along with FFmpeg; if not, write to the Free Software >+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA >+ */ >+ >+#ifndef AVUTIL_HWCONTEXT_D3D12VA_INTERNAL_H >+#define AVUTIL_HWCONTEXT_D3D12VA_INTERNAL_H >+ >+/** >+ * @def COBJMACROS >+ * >+ * @brief Enable C style interface for D3D12 >+ */ >+#ifndef COBJMACROS >+#define COBJMACROS >+#endif >+ >+/** >+ * @def DX_CHECK >+ * >+ * @brief A check macro used by D3D12 functions highly frequently >+ */ >+#define DX_CHECK(hr) \ >+ do { \ >+ if (FAILED(hr)) \ >+ goto fail; \ >+ } while (0) >+ >+/** >+ * @def D3D12_OBJECT_RELEASE >+ * >+ * @brief A release macro used by D3D12 objects highly frequently >+ */ >+#define D3D12_OBJECT_RELEASE(pInterface) \ >+ do { \ >+ if (pInterface) { \ >+ IUnknown_Release((IUnknown *)pInterface); \ >+ pInterface = NULL; \ >+ } \ >+ } while (0) >+ >+#endif /* AVUTIL_HWCONTEXT_D3D12VA_INTERNAL_H */ >\ No newline at end of file >diff --git a/libavutil/hwcontext_internal.h b/libavutil/hwcontext_internal.h >index e6266494ac..4df516ee6a 100644 >--- a/libavutil/hwcontext_internal.h >+++ b/libavutil/hwcontext_internal.h >@@ -165,6 +165,7 @@ int ff_hwframe_map_replace(AVFrame *dst, const >AVFrame *src); > > extern const HWContextType ff_hwcontext_type_cuda; > extern const HWContextType ff_hwcontext_type_d3d11va; >+extern const HWContextType ff_hwcontext_type_d3d12va; > extern const HWContextType ff_hwcontext_type_drm; > extern const HWContextType ff_hwcontext_type_dxva2; > extern const HWContextType ff_hwcontext_type_opencl; >diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c >index 4e4a63e287..0db4167934 100644 >--- a/libavutil/pixdesc.c >+++ b/libavutil/pixdesc.c >@@ -2311,6 +2311,10 @@ static const AVPixFmtDescriptor >av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { > .name = "d3d11", > .flags = AV_PIX_FMT_FLAG_HWACCEL, > }, >+ [AV_PIX_FMT_D3D12] = { >+ .name = "d3d12", >+ .flags = AV_PIX_FMT_FLAG_HWACCEL, >+ }, > [AV_PIX_FMT_GBRPF32BE] = { > .name = "gbrpf32be", > .nb_components = 3, >diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h >index a26c72d56b..58f9ad28bd 100644 >--- a/libavutil/pixfmt.h >+++ b/libavutil/pixfmt.h >@@ -429,6 +429,13 @@ enum AVPixelFormat { > AV_PIX_FMT_GBRAP14BE, ///< planar GBR 4:4:4:4 56bpp, big-endian > AV_PIX_FMT_GBRAP14LE, ///< planar GBR 4:4:4:4 56bpp, little-endian > >+ /** >+ * Hardware surfaces for Direct3D 12. >+ * >+ * data[0] points to an AVD3D12VAFrame >+ */ >+ AV_PIX_FMT_D3D12, >+ > AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you >want to link with shared libav* because the number of formats might differ >between versions > }; > >diff --git a/libavutil/tests/hwdevice.c b/libavutil/tests/hwdevice.c >index c57586613a..9d7964f9ee 100644 >--- a/libavutil/tests/hwdevice.c >+++ b/libavutil/tests/hwdevice.c >@@ -137,6 +137,8 @@ static const struct { > { "0", "1", "2" } }, > { AV_HWDEVICE_TYPE_D3D11VA, > { "0", "1", "2" } }, >+ { AV_HWDEVICE_TYPE_D3D12VA, >+ { "0", "1", "2" } }, > { AV_HWDEVICE_TYPE_OPENCL, > { "0.0", "0.1", "1.0", "1.1" } }, > { AV_HWDEVICE_TYPE_VAAPI, >diff --git a/libavutil/version.h b/libavutil/version.h >index 589a42b0fa..c5fa7c3692 100644 >--- a/libavutil/version.h >+++ b/libavutil/version.h >@@ -79,7 +79,7 @@ > */ > > #define LIBAVUTIL_VERSION_MAJOR 58 >-#define LIBAVUTIL_VERSION_MINOR 31 >+#define LIBAVUTIL_VERSION_MINOR 32 > #define LIBAVUTIL_VERSION_MICRO 100 > > #define LIBAVUTIL_VERSION_INT >AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ >-- >2.41.0.windows.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".