From patchwork Tue May 28 15:48:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49325 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp54786vqu; Tue, 28 May 2024 08:51:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJ3ORj1SYTk0BzNzaToUkLs0aEqQ65DT0QCIwnFK+pGiAGl5p1bIKNOzuwMp6VPu5SLUpV2jCibP3SCKI2jrJLgkFxZlgN277LZA== X-Google-Smtp-Source: AGHT+IHpxzdq42T2hSmf6Mzg07W1IGv2tfA9jfN3Kw46zfzpqQ0dFj5fB4040H582B9K7Bved4/r X-Received: by 2002:a17:907:9722:b0:a62:88ec:cdc6 with SMTP id a640c23a62f3a-a6288eccf02mr834370066b.0.1716911513998; Tue, 28 May 2024 08:51:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716911513; cv=none; d=google.com; s=arc-20160816; b=Ek3hGMij5mWEsFrsij93hX1tgLf5fXUfFyLXzu+QXuhxEUxVfqXi1iwc5P+LbltSSr 1NXgQvElfrN/5xSr/GyTIMDeKNBsOvisIdIayVwgpW/7xwQ/lbjXizUYG+d0EvShPDhA zDrb/gtFBEdz47MOAaOG2TH2s+oTqTDqftfrjbd9JNc/fKa7ENvKzaIx9ArykyCZeAyq rbiWlbW9nofqPeK3RnLSbN+Yp+p+aX9VX4hW0PDc9+VHj/EDvfNpZxvUxhgpgzI3iehv 3MvEDCWlXlJV+x/qAjZXVZQteCYb3XwGwNU5/vmrXnngoRkG74pMPu272n2lIiv+S0aq Gnlg== 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=R82OPVOvwmC0RLPCiGe5hVOuUzPzax30VgcZL38xIkVXCkSoETnHSRMOYmsiV+ddkO UgVzlDt5E8H9wx7pVIG68N5XG8ntkZf+4nTdM8UAOAjUEZhuT+IG0dkcpMxAsailuWm3 FJN/rY82LWYjzqzn4xA4wbAhR9FOc791RD7stoAb62CuJFw8DK83Doj3FoHEdGWpvXgO dQgVxPOoco+8XzZJEmteZj9L00R58iUzF9J4sxKkZDA9P1kFSsAuUthhnCrzeTIrk0JB Nsq/SaKjoCYNZv/kBv7oeSMis3+QEnZBK3FhejcBgRQqVf7veMrv1xnRmcyce0fuGdQN rFWQ==; 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=GZtSiHQo; 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-a626cd947easi526445766b.884.2024.05.28.08.51.52; Tue, 28 May 2024 08:51:53 -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=GZtSiHQo; 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 C3F6068D2FE; Tue, 28 May 2024 18:50:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5AD6868D55F for ; Tue, 28 May 2024 18:50:06 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716911406; x=1748447406; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/EfJmpzjk0nTwd+bXyfZL9e+n94CesWqjyNA7586GMY=; b=GZtSiHQo6DbbUzk7xmghdZDDfMjj0bQTav2QI20mtrDZazftDonXIhrX kU1GxIZI7e2+/uZjyQeJ21bX3sByRbeTvb8FB0+vqcBjMl6gGWFg7hpZs 8d61K74cuGef4fMIjX+o5IDLLVvrNDCVidmUS6dkk1+PzTJOeFibNOeYP vJ2O3U3qul3wfg5ohx9kNANwgy2Lmfu9sRHFqRYBKx8wA9zf1H3Rctybi iNIHqsbuzpMtmoYfOKo0F6zf6mA/kavoMUwJJ7fUb4cXBIgi7WDP4QdVf UVuPk8MyHGc/2ZJA2espqUi87ZXI9QC1wLgvPTK6nOP2CD3QQjnoViE1y Q==; X-CSE-ConnectionGUID: l55tCi70RLO57V6Drzx0pw== X-CSE-MsgGUID: YFjngtSnRQOa1h2BoW6ROQ== X-IronPort-AV: E=McAfee;i="6600,9927,11085"; a="23821929" X-IronPort-AV: E=Sophos;i="6.08,195,1712646000"; d="scan'208";a="23821929" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2024 08:50:01 -0700 X-CSE-ConnectionGUID: PMrxeec5T+inGC+hQBaRGg== X-CSE-MsgGUID: pkH2p8yjSEG5ijbAtLMdsQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,195,1712646000"; d="scan'208";a="35731143" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by orviesa007.jf.intel.com with ESMTP; 28 May 2024 08:50:01 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 May 2024 23:48:03 +0800 Message-ID: <20240528154807.1151-12-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240528154807.1151-1-tong1.wu@intel.com> References: <20240528154807.1151-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 12/15] 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: EUTvQ9u20Piz 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, \