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 A518D494C5 for ; Mon, 12 Feb 2024 00:02:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8512868D155; Mon, 12 Feb 2024 02:02:34 +0200 (EET) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2092.outbound.protection.outlook.com [40.92.59.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CA7A68D13D for ; Mon, 12 Feb 2024 02:02:33 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eECAC4yc+t/ucx+zhgsojP3/Lq3A6yJBvggjrNM22sSC4yw3VehZB6Q+PU1qoiY3PHyqGXJmyTvUpGwjG1OzePlKjxvzNHBXKaBlTxAu/C3F+fBTYfQXPDQl3sT1nMwv5Zdb3Bsl+T5XlXPCF56wYZuLJmLjOhT/hzWVBbyRMyzuC9iPtz7MZpS3RdncJmtsrN2gLN8Nm4Xcsi8t566J7WmOQLTybGT52ObPjsQze8fEYyUNHxyk9cWfHwVAY9UxX73WuZqCU/ggHKEQBGbklF6puHin2LsADzkHat1JLklT8RHH2BEuPKHe7YqBD/CE3O0oktuaoLx4ux0ahfv1YA== 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=rWYZ6cV5weuUbPBPL6687ZziGTwZr64AK9ee3wMvIEo=; b=jM7oFi0hYjI4UVudE39elqXBe2Xz5HOFeUjKyVRtwOSYo8RrECXMpTfGtkqFFZfv+cg7RVhqxhVUPwIiKBdZwQI7938Z3/bQtWx3RBTWLCnCQJ/W0R5DyH0BnAQFrOUFBbCl0m3/uyPtPRUjyRjn0S0U67kQKfhx1sXLFu/OK1NeYQ81TTrqTLaQxX2v7ksn46VB1jRJcuKQ3QZeU4CqnC6IbAtSYmj8Uif3TGExGBaW4q63aWgH5RmYdAJ0Tv7gx/GUtfTdqvjSSmK2TU0MMHdHjuDyi48m3fGARn9UrZ/bj0n7WykLiJ8pf4N5TxIs8OqxTj7aCaxzTfpQ5LWRqQ== 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=rWYZ6cV5weuUbPBPL6687ZziGTwZr64AK9ee3wMvIEo=; b=N8UzTJd3sYSPmicDHnVSZWuIXGErAyhlgAV0VuVe1VhiVf/2ZiKvT7hllPDpH54kUbzFszw9M94A62MrNdH9nlnXEksD95j9yAxilUBItBuadKBaMoFIaiHj4L1EPNC6hyc5Vq1x7u+rq5KDLo6EgpC0bSQ5C5oLiPWNFQxge+oIG1m+qo/da0bVQCG5GrQgzvahAYzXK8161qJyxxB/Z8OjQEzkDljrCytbQLjLyRsAZaTnDxiloEYNaELmBWI7qUrScu22mFCyspjdmoyVlBzpfxo90H/LhM0+piy94AfV80tdd16nWgkqq02Q0RtZZt+hLKB86OnlbzLrmjD9Yw== 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:32 +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:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 01:03:20 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [nS8KUbw0HBuxw+mgSJsokBQCa760bF4lJKfR7CGLxY8=] 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-7-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: ce7b5e45-9f5a-46db-cfa2-08dc2b5de8d2 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqwZHg0HfSFdl5Zlrnc8YAZlvR3ePBoigAG+XoNuI0ci5vYIv49PceBDxymoSFoVCFouZweS88s7sFZzrrqd4/9NSE+/ZtHcKFGwkz1WCFTQXFUZ1g6hVjTuXVH36yjBbdctMUuqReN2GoXvAu8krQGb+xE0og1RBSA5G9L9cfgZQt1EZj/qiM/0VxktuzvxtXpULuFacb6KFOYgck4+Bdctzd4agBd3uIJz+NWQN2rH6nJju5RITvY0UJkt7tXcTmJpV84mzfR2Mxz1+q8f2xe52GZYItGVS0AFGpf/3mCLf55PyAX8v7v6tdtLSBYqeukjPpcutb8cS9gZzLQDo/wJI9JZd2ZtmHQ2rXJfAgPPSjFACmi83JZZFK/nVsDJVpYmvZIfL9CmPnVzh7f/u6yA5Ot9PpDzRlMlIO7JG3tFJqB4SoMQ+IOqwjWzZYOvEU9PCMGRIjP8Se1uyngyjKca2zqL+Uf1KYH5IzigPfG/8u6O7QqZeg8rnygMbu3W3nh6beUDWifo8XzQGQRqBe3aor2Ry7Sm+mC+8iPSN+btKjw6N25zineUSIoISkmqNXQ98QHFztMFsAF2PONfO5Myp9MjMiaTAOdkDfAnl4Qcc8ab/gSZD7xmJNItTyTeOKlvl9ntdsDhZK1zVCiDEp2zUfTuIdu8oR62GVPePlj/RUVs6JfuY8G0fn5oeFRKq4tMkYswDJd8dVDH2d+UdCSkIFLkC2tTK9qndQcvc4Zwat5gffGe7yEweovdur6Jl8= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qox8R16YukoUphPB/QKJ6Vly72y2O+49Qjp3/ZzPW2whyhD667QVMh8g4S5EqTbAvJhJNXnBKJPvQjAQhz7TL4SRL7xFDOcSM6bQf+aQUzlze4bJLUu6vS1kYd9iJNv202tixDXlfuJS26/ient9SpCbO5yiJlk5B7UMJWsSxTMbb9L1rnoEfommL/mx+k4cBnwB7CO0ygEtMSQ972GseAy6BUoKQNHSVUKCoQME7c+sthibIIWyVuMxK67/MJA5r9ifxckAA2SGHktOJ1+c6h7Gz4x+5R4lhksH1VN5uYe+P4BrWsprjSji1xJNQCAdwwEQbkgGhbLWw7MHFIo464o9gi1KXxUnTjBNLpZQmmJ8Vh6gAltjSszFpXTf9QM5+NXbHAsS8K6dVlejf+kxz0Wt3sJ83Rud10vywhKX4sVxnptkZ5IFNoe1Xw49qRPjlRFMPRXqwohtbNhIBr0n5nehGHB8+yk9XGoC4dBvEK3criu+LV9gbMwk9YbR10ZXsbhMkdNTh+XD8p1fu5dftHhV0dp0TWAgmW2MI+pUB9RqHj0XWuKY9U7txXFrr/1h4S46H1S+HSe3APZuXRsR/dL63I+73adh2+08MrBq/fmYdgX0SKCJUCD3pCA7p81I X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nCmktXImZxskUFA9fv77rs77by6eAU7mywDoT43mQ6KmchK1SQE21H7H2Y07?= =?us-ascii?Q?CMdmcwG1XUS4pX7vj8Zbd/WbFx9eMsXeYXnsfwmSlj4VxZIV+vrIV5l9PQCq?= =?us-ascii?Q?jxjX93L2TOveYpLGtY3Subn62XfTlzBLuaZAgo+u5I8enuw7Ewws0IgFArvp?= =?us-ascii?Q?mvWfpV+UR9e6ZI9XJfMktJ/L/dU4OHVr4Iv7nzdSKgAyfP6cbODyUxuLHq3C?= =?us-ascii?Q?Zlc9WGdRIIXpbq9QXMJ+7V5gKpB3ntpGxIwbWmobyFRw8vLO+LUgrMkA+INp?= =?us-ascii?Q?EmjJQciM+m2izInjz6iE6bkPsxfAx/2/rXMffGUsrK8fVnLUik8KSRmn7xkp?= =?us-ascii?Q?mPozNcMcufbV4hIGtBJAZGtQqQBZOsFfcX45BFZ8qNp0tXJZ9ZetJK+CbUb/?= =?us-ascii?Q?X/PVwC7E9y+DSUeJuFV/1LWRtrkrRkwpjKZaAFqLJAXR4O1uK6z+x8d+hmp1?= =?us-ascii?Q?jGl1zOwKWORzv4eFrv1TfOVLgdC6XbKH/r/UYcE1Bc6nTQfvUOkvJLYPAqwP?= =?us-ascii?Q?9sl1M/0vkRClBCvSMmf346SHn1U4kavjfB7xlOvoU6JX2BnoaCAsl7/rdfCN?= =?us-ascii?Q?Ast50yoRhHlLfZHKoqYbm1ZnuUxZIruv4U59YuUEInwXqX+kPRUqWVmKmSPM?= =?us-ascii?Q?PdPhbw2sf0QP+qq9fqHdqq7N5Ky+qGXUvo+I20BEExrpkBR4rgNoK4FOkDmQ?= =?us-ascii?Q?gWyLdFpLKdigiCBA4MowZvpk92EsbQfXPYcp3FssnZQddpAcSynEbr+ixpqz?= =?us-ascii?Q?k6upEnz/rsSegbMRCXtYoy/iW5rQJ1cw6nuPw4Yi85DqzljBAeaye/Bvyuga?= =?us-ascii?Q?O4Q+SBcpbZuoknV2MQMA0Qa0cITA9b98QzUihIHnrXUtAPzon+6xen2XGsgq?= =?us-ascii?Q?gTsTqohlm3UunABuXvL9aWdKsE8+KG5wrj3pFoL9qJr/geDYKrl8EIjQrVLk?= =?us-ascii?Q?raP39gwtcy/rBsEkjS1l/oszNwCB26pIGcIs+3WwZlWfVDLSTi4P9xa3CDZ+?= =?us-ascii?Q?7a30abxWQFAWVUMhQmGC4nyAVM/DsSqriDOyf5pxTa0R5Nq7k6W1ta3LHOZx?= =?us-ascii?Q?uYTUqRB2Ll51BTVN5Zi/VkPHP89Ti/g3/lfSqQjRhkRtHsnBEn+V903fFInn?= =?us-ascii?Q?uSYgQTM6WxXT2zdN5d+GFEEaUoBTXMW9tacoMQwz2U6ky3nUSAr6v5PHiCeX?= =?us-ascii?Q?QSjlu3QOxhZCOp37RRWDh0ZK4US+tv7Idq+rBBwrjT+BAq9hts9BCSV38dUV?= =?us-ascii?Q?ybeLwyOUFGKVo0kdhctPVYigGva2SsUeqWAsxcqFTQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce7b5e45-9f5a-46db-cfa2-08dc2b5de8d2 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:31.9710 (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 08/23] avutil/hwcontext_d3d12va: Allocate pub and priv device 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 D3D12VADevicePriv as one no longer has to go through AVHWDeviceInternal. Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext_d3d12va.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libavutil/hwcontext_d3d12va.c b/libavutil/hwcontext_d3d12va.c index 3acd5ac43a..6b4cd22899 100644 --- a/libavutil/hwcontext_d3d12va.c +++ b/libavutil/hwcontext_d3d12va.c @@ -46,6 +46,10 @@ typedef struct D3D12VAFramesContext { } D3D12VAFramesContext; typedef struct D3D12VADevicePriv { + /** + * The public AVD3D12VADeviceContext. See hwcontext_d3d12va.h for it. + */ + AVD3D12VADeviceContext p; HANDLE d3d12lib; HANDLE dxgilib; PFN_CREATE_DXGI_FACTORY2 create_dxgi_factory2; @@ -526,7 +530,7 @@ fail: static int d3d12va_load_functions(AVHWDeviceContext *hwdev) { - D3D12VADevicePriv *priv = hwdev->internal->priv; + D3D12VADevicePriv *priv = hwdev->hwctx; #if !HAVE_UWP priv->d3d12lib = dlopen("d3d12.dll", 0); @@ -558,8 +562,8 @@ fail: static void d3d12va_device_free(AVHWDeviceContext *hwdev) { - AVD3D12VADeviceContext *ctx = hwdev->hwctx; - D3D12VADevicePriv *priv = hwdev->internal->priv; + D3D12VADevicePriv *priv = hwdev->hwctx; + AVD3D12VADeviceContext *ctx = &priv->p; D3D12_OBJECT_RELEASE(ctx->device); @@ -609,8 +613,8 @@ static void d3d12va_device_uninit(AVHWDeviceContext *hwdev) static int d3d12va_device_create(AVHWDeviceContext *hwdev, const char *device, AVDictionary *opts, int flags) { - AVD3D12VADeviceContext *ctx = hwdev->hwctx; - D3D12VADevicePriv *priv = hwdev->internal->priv; + D3D12VADevicePriv *priv = hwdev->hwctx; + AVD3D12VADeviceContext *ctx = &priv->p; HRESULT hr; UINT create_flags = 0; @@ -670,8 +674,7 @@ const HWContextType ff_hwcontext_type_d3d12va = { .type = AV_HWDEVICE_TYPE_D3D12VA, .name = "D3D12VA", - .device_hwctx_size = sizeof(AVD3D12VADeviceContext), - .device_priv_size = sizeof(D3D12VADevicePriv), + .device_hwctx_size = sizeof(D3D12VADevicePriv), .frames_hwctx_size = sizeof(AVD3D12VAFramesContext), .frames_priv_size = sizeof(D3D12VAFramesContext), -- 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".