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 BB469475E5 for ; Mon, 12 Feb 2024 00:04:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D02068D1E0; Mon, 12 Feb 2024 02:03:00 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2089.outbound.protection.outlook.com [40.92.73.89]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 36B7E68D1DD for ; Mon, 12 Feb 2024 02:02:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K3vgGyGTsT2JTgN3e8hZ0B57XRRcP2bRPvo7GAXs36cf7C/VWUmncWjtCzEtCiUOrXeQKRgnd6209Pfm4i6U9n9Ujc9fj56/aPFHtzAdQQTTmUMQkl7ML8z4RekdvhMo2ji4NiCR/gmd64CRYsGiRq3zmDrH/Ei0TXJEzVJj07Ju8L8nskS4XTMTjO6ir1QUaYFC53s7n6tqyRNdNEkxq/vrG1JP5caVY8veLnoIav9BL6WCa+t5KrC3kaskqa3vlLcK/URo7LNPgJ95auteLGJr5dfxMl0zHI3X+aj35QAW7PAA2/lrE2/56aoJW/HB5aAWzeUdJRPyvhzeOr35jg== 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=4ns/3etvEEZ3rHV/wxt5SZyAgaySK5CqC8kpKid8iT8=; b=F0/DcLgc9Q2F25/gmwfB7lBuUTVoic8uT4d3BBq54TxZV9xWlB4ZU2muEz7kSgd37lqHH2hyKHTbchOYB/33qKkl86w9OcLWsErqcFpYqfXK1zCJN/98KGi2I0HimfNfKRuEK3Q0dARyOx+EcUucM7BtxHHrW938xxUAFHEpoxefX54aW58f6hgN7kQuHkUjdzcnYpD53udEbgMhWIEDH6s8V4Mw2nT8G/E1EMmXgaTkiPmQKLTtEnOGXbksR33svR47UWNPqms2iAUC//dtQEG7HtmvSrRkPjqwt5aBYOhffX9iEdHUb2XKzQT2QcPDxrVtdV9YxCzUoHzE8tdodA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4ns/3etvEEZ3rHV/wxt5SZyAgaySK5CqC8kpKid8iT8=; b=WTVXU652gPntfYYSsidr3u0h/FHbc0Kar2Xy8B108kQolNcYTKqNaLNsnVERo1z3JX7u8YV7zfHrzPoRT8bhwbHD63Cg97Ks+cJyYpDiIQD4bYElfHr6q0wbMlkY56rPVI0K9ayIapgm1/F3lmfbnxmyMF/kAfQ88D0/D7dnW1KLz84H7YrVYdIgCsrWy88aGyp85RWUlUM5RYJSYBBYzi/qwR7au6MYayBDjBaEBBUQk/M/fTpN/yM4yYybVlGzr+gsIsNdyNwtafzJXYPaRXFWRHcRcq8D5zIF7uqopfZYMfxJ48uFIBDhU+x5zniZeo+Hk94Zoyhup93iF2mHUQ== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PR3P250MB0257.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.35; Mon, 12 Feb 2024 00:02:56 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc%3]) with mapi id 15.20.7270.036; Mon, 12 Feb 2024 00:02:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 01:03:30 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [w4OHW85xVrqerOa1oQ93qRi9kOSVIzKT] X-ClientProxiedBy: FR3P281CA0146.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:95::18) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240212000335.27984-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PR3P250MB0257:EE_ X-MS-Office365-Filtering-Correlation-Id: 8588da8e-5bde-4799-8695-08dc2b5df718 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqwZHg0HfSFdl5Zlrnc8YAZMqDtUbVXlqZQMKXE9EdXxA/Ldx6rDNllWhkGd+xat97ga4OkgBfsk7DvOhoQEGQnTYbZ+0GMmdsEFnZsvt2zO3RumQuOmQ2VlyiUv1T5PXu8b/BV5nWxZRJI8XYzf3TEp9oBVJRQqf5F+VzxpQW7/6psZfTPDVgJn2vs0C5qvO2aScHvCYhujgPJHH4eeiWcNs4kX4E8F6povk9DOC1sTgSjGpap7TUArVSoOIHJZe7TvT4rOzUZ99RFCz6/vOxXAJ+n2Iu/2UA4HViaCDBdgC6jm0Q3NH0hMO9SHCWOQzWUCpgB3Sj4KVmNvbGqHoNxdJIvnNvQUpIzPNE7wCHxfuvZbtuIt2TVX2PnttiZOTxWajicqg04Th8Eft5FKMnPMDboQYAmjv6WVeeqesYUC6L4NduIkQTrH0n19fl6wMoJs/m67+zXUEB8QpEgxfsPNW/5dZAAfz3/qu6UMFR+4jn07v/T1Nr51PEHLSUgiqb22HajWtx1X3CXWH9CBvjkcLVDNmGQcE6j2pu9Wux36J8czkAp/vbzF9FA0RGt43AohxFAAJXOlvHMsqZJ+NnaCB5QM/jbBxjsBx3JDE7PtID/UoVkY7CQbl/lecg7OzynGt5g3ElHqwWBK55CNmcXp3mosAnh9lsaFpeCFPpUrVw2F20OIL5Hq/Z2Mf7ovB4A+4AJahUKvLKrjaxyNoVawz7Fl1viHcuVjcFsRJO1u3gIoLL5k1HIFUVjYcmZbaY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yUPak6LxxzJueFJDRPXbBodMuxBFBXzfczIoCycFHDHXUTP9TcL7zsAsgkXV+kiS58RwFGwiillt3W3ONV1CPhDbuCpnIroOjhDf+bs1mbUYLDKBC/y7j6qAmdG8aVeZRVgTv7PztcS/xWw/q9OOabbihf4oa8jvPKXwsscgJ5Y69nPPP3H9vzwk0b0r57YBGWdY2Scyan0BLIXHviP0FYFlpXdtGrjC41wQ3+ZfpsXBo9rPwUoq0JPSbYf6VXW7q5iiq0C2UuPFQQqiOA9tE+KZoasBNsBMDF5xDvlBy1qqfWUVz+Q9EzEUEVQq2QTRXw4RGkGPVIUleyTFGRrYximD7nLItFYL3QSSO13ncBw1mmSSIYYFno2szhi5+uSvllSjsuQieICO/0BcKsTIAMcmhiig0i6Wcu5yWe/DCOnCAAnbEdXv4tNR6cOG3+8wBnS0TRqG8FNTwNzBwm63XJYcIPYyqn/fYrKJMeuaRGTYOUIbWWfEkQTVhHBeivixk5pCdrcjVPLQkK/EhIs/1Bj4KBT60L9FVUUtvUxrg7DpfXOH75DWsoc1K/BIa5X90fTnmKgB5WkaYfXj7hvCdZJjlBTHKfkhVem7y1ESl03n75xw2xlFGbsmrhXCaNj9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0eC6YaKI86pO8Pfeof2qh72nobOWH1Ks8TR0ZvuA5UKmadnQzYjnFAYeJf7k?= =?us-ascii?Q?pUtnoECuPUTM653jey25LJPev1aUqAbpbg+1yPAbtlhunvRyMu4ZAWCsWewN?= =?us-ascii?Q?tYHKCdp8RfsIBwhoaAOicuqv7DT3GTiMFzQR1R5q0kRrpKN6zP3fK3sgqnam?= =?us-ascii?Q?UrkimOr3/NZmfv0zxF/PWxHHY7d2s0okDvqa2lKK8gYaLM4crtN41mRuzwLg?= =?us-ascii?Q?DxqT0wddLbF/AeLAv/bAFOwR8GIfrTtujUhKN4yUezDsIP3wGJYuNhgLafhn?= =?us-ascii?Q?rz5QQp6JzLXcku/wgq+wLuPOJ4duBuv7yW7NmQB+Dz/XW+OtrtTkf0opV7R1?= =?us-ascii?Q?rbI3ZarqnaJYVLQJ/67t7vt1eH2D9NbOsFqnuCIKxQ+52x1tkejHnF7OKeEK?= =?us-ascii?Q?SEBJ0HBOatUbgUlyoqUu9ldMvd7YBnJrWt9vSvVCzrJ4lzd28HCLcbkz0SDc?= =?us-ascii?Q?atBLPZumn4W0cikQudWca5/OXrxwKtdaVl3nglFSA1HMR8A4NQ7f9qdlkEU2?= =?us-ascii?Q?sP7f5kc7KKONQQ19Mxc9Ydd7IQFiH/gEYw8deiKc0rWz9hT0of9pdNnfeIBO?= =?us-ascii?Q?keravHBd+paFa64vtMneHzBm1MafR1CVjoTU2xfKyI3z1Hwg7Yji5G8T9ogv?= =?us-ascii?Q?XGAdE/ifiYNoMVWHIclMEb5WfmiZ2GVgQzTa6vmT31df49ORtaSH3dF3rvvb?= =?us-ascii?Q?yAbxkhEgxINfFnxm42YWSlrNH3VhkR4AThWipEatZa+XaYieFL2W2UpGlYgt?= =?us-ascii?Q?jAhJFW3rvAY5eAwbTToXyHNeCsd5jEGxOrE5kLzKmwJR2xkmmwYqvS3MFSwG?= =?us-ascii?Q?jy1Bi+khmcBx1qoRpNSY93n4zoBwVGqUTHxONeHVkWIqvSWeIm3hsa7DuwU/?= =?us-ascii?Q?aEiMmd2gyG9uO95V3ppC/Hb/BvEEvt8NlBwN6zT70Md/gKGMOpKKu9qIe31z?= =?us-ascii?Q?H/vmknD38A8R9v1u6d8nfbioNsnhF+XCkK572fB3d77/izkngtGZsABF90jl?= =?us-ascii?Q?VequbRxDM94eVerokmvYLrrX2F4YnsLxYj0sMYN7pGqSr4fHGzzhcfGj0Z2M?= =?us-ascii?Q?3qrJcSnOb9/i7VYKc8ahm6HfHzbTqlq/1g+lM2wdNkfr7+1OaPF1Kvz5j0/m?= =?us-ascii?Q?RLRVTu2P1hPcrWHaRw26uKJVWjDk4RkyHJjglyt64LG33zjmGI8qx9a/XJds?= =?us-ascii?Q?tX5GonEjKsq/poZmLLiskiwxs1rU96Svui8aS0bYD580MOT7rlW35ochPtId?= =?us-ascii?Q?Sp2PF0Y6VHTwWnY2tFa/2lbxIbg8nlB5Kw5VJsl0sw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8588da8e-5bde-4799-8695-08dc2b5df718 X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2024 00:02:55.9096 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0257 Subject: [FFmpeg-devel] [PATCH 18/23] avutil/hwcontext_d3d12va: Allocate pub and priv frames hwctx together 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: Andreas Rheinhardt 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: This is possible because the lifetime of both coincide. Besides reducing the number of allocations this also simplifies access to D3D12VAFramesContext as one no longer has to go through AVHWFramesInternal. Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext_d3d12va.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/libavutil/hwcontext_d3d12va.c b/libavutil/hwcontext_d3d12va.c index 6b4cd22899..16c07868f3 100644 --- a/libavutil/hwcontext_d3d12va.c +++ b/libavutil/hwcontext_d3d12va.c @@ -36,6 +36,11 @@ typedef HRESULT(WINAPI *PFN_CREATE_DXGI_FACTORY2)(UINT Flags, REFIID riid, void **ppFactory); typedef struct D3D12VAFramesContext { + /** + * The public AVD3D12VAFramesContext. See hwcontext_d3d12va.h for it. + */ + AVD3D12VAFramesContext p; + ID3D12Resource *staging_download_buffer; ID3D12Resource *staging_upload_buffer; ID3D12CommandQueue *command_queue; @@ -101,7 +106,7 @@ static int d3d12va_create_staging_buffer_resource(AVHWFramesContext *ctx, D3D12_ ID3D12Resource **ppResource, int download) { AVD3D12VADeviceContext *device_hwctx = ctx->device_ctx->hwctx; - D3D12VAFramesContext *s = ctx->internal->priv; + D3D12VAFramesContext *s = ctx->hwctx; D3D12_HEAP_PROPERTIES props = { .Type = download ? D3D12_HEAP_TYPE_READBACK : D3D12_HEAP_TYPE_UPLOAD }; D3D12_RESOURCE_DESC desc = { .Dimension = D3D12_RESOURCE_DIMENSION_BUFFER, @@ -128,8 +133,8 @@ static int d3d12va_create_staging_buffer_resource(AVHWFramesContext *ctx, D3D12_ static int d3d12va_create_helper_objects(AVHWFramesContext *ctx) { AVD3D12VADeviceContext *device_hwctx = ctx->device_ctx->hwctx; - AVD3D12VAFramesContext *frames_hwctx = ctx->hwctx; - D3D12VAFramesContext *s = ctx->internal->priv; + D3D12VAFramesContext *s = ctx->hwctx; + AVD3D12VAFramesContext *frames_hwctx = &s->p; D3D12_COMMAND_QUEUE_DESC queue_desc = { .Type = D3D12_COMMAND_LIST_TYPE_COPY, @@ -168,7 +173,7 @@ fail: static void d3d12va_frames_uninit(AVHWFramesContext *ctx) { - D3D12VAFramesContext *s = ctx->internal->priv; + D3D12VAFramesContext *s = ctx->hwctx; D3D12_OBJECT_RELEASE(s->sync_ctx.fence); if (s->sync_ctx.event) @@ -345,8 +350,8 @@ 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; + D3D12VAFramesContext *s = ctx->hwctx; + AVD3D12VAFramesContext *frames_hwctx = &s->p; int ret; int download = src->format == AV_PIX_FMT_D3D12; @@ -675,8 +680,7 @@ const HWContextType ff_hwcontext_type_d3d12va = { .name = "D3D12VA", .device_hwctx_size = sizeof(D3D12VADevicePriv), - .frames_hwctx_size = sizeof(AVD3D12VAFramesContext), - .frames_priv_size = sizeof(D3D12VAFramesContext), + .frames_hwctx_size = sizeof(D3D12VAFramesContext), .device_create = d3d12va_device_create, .device_init = d3d12va_device_init, -- 2.34.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".