From patchwork Sat May 25 10:30:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49244 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2239786vqf; Sat, 25 May 2024 03:33:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXzh+O0lqY02Z6I4uKN6x+673uAr+WqD3dtYs1ZF+i8WvVrZpUKqemddKX4+0cHAh8Ku7qtqEIXQHZYTD2uuIjWoxXb1DMmz1yp4Q== X-Google-Smtp-Source: AGHT+IHlyV5uei0OrdZufyavmVINs61wjZuX9mVVcS8Ke9rv3QD7kFWS7jYaDXMd5WD6ydmZqQO5 X-Received: by 2002:a17:906:1857:b0:a59:f3f9:d24c with SMTP id a640c23a62f3a-a6265134253mr302995466b.76.1716633219203; Sat, 25 May 2024 03:33:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716633219; cv=none; d=google.com; s=arc-20160816; b=it19q2ayU7TuxN7uxSTlzPBPtyDjBRlbeHD9BrAuQUE4QDyT8SvBOO5etvjQs5x14j JkhC63rhBlAXgwwCL9PQfG1VUcnj0S5oB4gFkJgWbdt8Ti2fUNLxbWyv/WNTbqnEKGNi d8DsfoAFGI6hNHTiApQitlCoNLrb5aoVksCcofRsr7IsJjJO5ZL1Fl4UIFIjqjl2zABL tr/m9KpJXDSH2KSRZcmUGq4n+vnkk6T1V//qYdDFBr1XsZw1KuTCW7cSn4W/IcfLVOM2 OJ4T59iikV/Z1SX2NtVrgkYjFm2BXTmgX05NUy10jDJXrpN/tTTOiL+khOKkdi1U2xjU bYNA== 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=fIbJOg6Ks0BhsVbA1qkmQrTHs7xdiTzQM+di10El4pw=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=Ce6A0ZJJ6boOjXaTPSjbvTyll2vJCmt3LcLEAV0i4428h9KFouQh2QHAVGY0HgYc+1 cG9nRVOtczdPzvEB+EP3xhHkImbJNPGpMc+UtZF2FbF5h1haEtO3qirFL5WxrYQuFlYG sdxk3EYcmt/SEL9uGczRxJDpDfxlg3CYFj8lVp1t/bzVMwgPDrPKyaxcJeHKAw8a+aVZ 2y1AKabXD5t5fzqm7IzwIGmcvAHidDWiWvfagmtsEl2+IV4tXQ+DJY/5kNmMduL6oW4h 6at+Iaolhh/P+Tq83zzditmazpbXxKOcsiDaGThRWa5edsOv2mpzsH9jQETWOEA8q3Cm TCgg==; 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=PlRofkLY; 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 a640c23a62f3a-a626c800758si166597666b.146.2024.05.25.03.33.38; Sat, 25 May 2024 03:33:39 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=PlRofkLY; 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 8965568D5E0; Sat, 25 May 2024 13:32:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BF3568D5B2 for ; Sat, 25 May 2024 13:32:17 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716633138; x=1748169138; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/EfJmpzjk0nTwd+bXyfZL9e+n94CesWqjyNA7586GMY=; b=PlRofkLYfS2pQ/FESZlmEHu2xn+BEg9Bp39GQZcje7M+i7oMx6l6f13G 37GCCNJflfCFbe7BJz7yM+s+ob1V4gOGVSMLPMkjJvEjidYN3D8TDX795 fRSx3ioFSvelT6ggnYTb0rOrNofqonPV918SDHNIZ/XyAxiLYfB9MY27R I4iBdw2Ds2bgJ25DmCU8N8FUb7+mZC0DU3K6n+hvVq3YsqdAfXfi2159x 8mk9tBO6wmN3foWCPaCgVH8jOGGiO9gbXLNRze3HxHV/9/6iqfyRp1h3n xfV+AZluUO3qd/NMAlsWfk1ChJwV2Tx1vkRQjE1R8kQIZGdKSglzeajK6 w==; X-CSE-ConnectionGUID: yFDwwEwARSmv6jIbMYRTTw== X-CSE-MsgGUID: KpYvmysMTCa17XH1YNtb6Q== X-IronPort-AV: E=McAfee;i="6600,9927,11082"; a="38391108" X-IronPort-AV: E=Sophos;i="6.08,188,1712646000"; d="scan'208";a="38391108" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2024 03:32:10 -0700 X-CSE-ConnectionGUID: NCifAvyITlWYn24U7uZMuw== X-CSE-MsgGUID: TYV6jpypRhq3k0VFM/hA5w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,188,1712646000"; d="scan'208";a="39252430" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by orviesa004.jf.intel.com with ESMTP; 25 May 2024 03:32:10 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 18:30:19 +0800 Message-ID: <20240525103022.1390-12-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240525103022.1390-1-tong1.wu@intel.com> References: <20240525103022.1390-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v11 12/14] 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: zP0JVYKK63yk 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 60f056b863..0c3d0221e8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2024-01-xx - xxxxxxxxxx - lavu 59.21.100 - hwcontext_d3d12va.h + Add AVD3D12VAFramesContext.flags + 2024-05-23 - xxxxxxxxxx - lavu 59.20.100 - channel_layout.h Add av_channel_layout_ambisonic_order(). diff --git a/libavutil/hwcontext_d3d12va.c b/libavutil/hwcontext_d3d12va.c index cfc016315d..6507cf69c1 100644 --- a/libavutil/hwcontext_d3d12va.c +++ b/libavutil/hwcontext_d3d12va.c @@ -247,7 +247,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..212a6a6146 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; + + /** + * 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 9c7146c228..9d08d56884 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 59 -#define LIBAVUTIL_VERSION_MINOR 20 +#define LIBAVUTIL_VERSION_MINOR 21 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \