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 9B2A4475E5 for ; Mon, 12 Feb 2024 00:02:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 82E0568D135; Mon, 12 Feb 2024 02:02:24 +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 2AE6768BF73 for ; Mon, 12 Feb 2024 02:02:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VqBSASjDH6k2TGxwafmn7f3VoLyIOLK8Mt7thJGaNJuqcyIGLHjjT/RdtE+8qJil1qX+d/p8NBoKds5TfIzc2Lw4+zmwT6TbRRY/bJbhU6RX3yBRlgFw0Hc4aOwU3IaW4WkaQW7SdjkqfnVzg7VBFZ+XPA6V85kCLAE5qikAP22ptlh9xk8W13ODIJADvfDLHFCp8bPkfk3dprOdLdNqrZ7DyKYsYQi4P226Ea92XgChM9m2JhyrveR5+DPjEquqlUjNdZ96IlO49la2bhltmcJ3iYCV2wtZLfq2dS0vzg+tl88jOIGHuI85lj5Ot4dERruy6DFRAaNeStXvOTr6Xg== 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=LbvtNyEkCsCwkmk9lGiV3yj4TZm1rwcFjMNH2LggpsM=; b=TVGIPDxXcAGLxJXpWP9aU1+Hcvn5IWNdsZtyAYJm7c4LXhBYSflYHXXS9ASqKz6nl+B/GjBAacpc1GZv+uTUEVsU60bN/fXPJJDpm7VVaY+0y992oviXQ/jnmVSDcGRgAx/oBi/LK4RGpXqLlbg1pwwS9P53bVIqvXxWIa/1Zxes0GgK3+TAcL2AaVR0/rLVqLNgWkY0LC/P668dTnJdkPqeN6tZDORbGD1+/5FwL23sGaoJEPNL/2E+0eXHT6XfNvMyCsrrtlcKPYhT+CFi0gVldAPOnxQlV29ip5Tuzy2nV6JCBHdMTCv897gtqAdH2PLsP79pUdNgLm/jCx4QwA== 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=LbvtNyEkCsCwkmk9lGiV3yj4TZm1rwcFjMNH2LggpsM=; b=Ma7vxWuYnSSEbP+9YTGc4XFltKUpHn0c4SlB/Ah5DXS56sjuLyVrGMYiSb9il33uhLyfZx2PesG0G3xiC2jbVHSBzsqS/9myX++2G41UCS+vZgYI2cdMXlQWpF5u09WGHQvIpuujmfLalyJ4+ZiM+9zw0nnDx8U8ynpwbGDM9JVVNISfxGZboCtomTzupsJ96jQYoMk2+SnsoVhWGLscCta6lndOFYBLlFneNJ8dKK8TTLgZ12yx9478gRVcGJ8JyTPFZramGD6SPT3dqW/DjDS2rxXjrTgeBpA4s79cN8IMaNlPsuf/KGKBK6yyjgD0YIOus5VJFEs6rjJ+PU7Lsg== 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:21 +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:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 01:03:17 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [uyQcfDNf8cHNlquus6zO5C2uwbtigGEgFrmYLY9YROA=] 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-4-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: 17a98321-b8a3-4bef-33e9-08dc2b5de279 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqwZHg0HfSFdl5Zlrnc8YAZlvR3ePBoigAG+XoNuI0ci4HHsMPlqiFRwd5KRwH0OxolusGYLSO1cs54VzZnUAUwBhDZYTK9Z3z3G26G3qCPWE7L2bkU5MWGDr/HOuzDVHITFy8SwdhWEw5hKQNYxRmu3ChGgG8f6nbTXxFJHN6yWxZ8/suv9HR17fWofK6wLGynTlggM1ub0W40UqRFeBavzECu2MZ8GobIH1tNO/3m8R7yUxXs6iQ1yunT7TSXgJOBMEuLhCvHkK4GMopdmgfUhfdUz9EPI+sTzxps2IsLqt5apAc07mh6g7XwA1zEiBkov00BOxArRqS5XRKREUF6IjuXfMcU3KNbnzyPM/iqD4M0RPgBNzbno19m00F31nOsb87QqRixxsDU+NjZLQ386NlgP/ToCGj+WtW+K4Xm3TY2eK8sUkjG14PUlVB1BJA6MKbFu+z6QwdMRK2X3eze1BQYj2MCE1E3Oh4plKN4VWbFGj+j/x92XtXBFy4GZ/Qj8ZWSM5BL0vrkUtvh70xzm0fm6Lf6BS15YU22NHC47AUVfr6Q9Dt2XUx//893eSCOefAXk+ZfK2yXpQYjcZC4Gn6q5EiIvTHSyEd58JWbKidaI4b6EltOLPoqPvaTyellQfipOZVwoRe4jB3HC2y9hUnE29eAT7nf130gbZfzesOZnVKyrF9uuCqtl3gcuFM8D9RpfgqW7JNZKRZCRJHaEAdbhIejknGqd4ZVfx///RJK/OXxxMeXMUdkkgXtEBc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YJnx2x4QBhrBdfFpkWLHL67+m84T7DBe34iKWMlVK5VHb+K8Xk1K7G/Y6p9cbcwxPTjSzYOAa+ZlNhDhaKJ7RR0WhFIuykgo6Vob9/UtGEldk0KTmkOZvPlADAPAV4DZLXfVFVPiBEJiFXzjizMefPseUUFc3KAbsNg+9L47mivTl4GI/9oqKUzdTuL0AATk2JLQg3I/OTodArJggYLoQJ+XCXt2pZopJO8q2Ke22PmArDC1OuS/su3zmHr0/r/N/aG22gQU4Whc9o9/rVyD8nEF6VM6vU03HZSEfMIl5ZPPhNCTZGq2h8w+Rtvay2TWxLryMe0kX4aMw7QKD/+oR5gJloO9vHe2JPeDZSHB0RaEUTV8hOj0sHN5wnIECwahKa/TA4vTuXUds5KRoGU+x9k+KQky85Xq3iEbHoViDDqXE8zuO6u3NB7IvHggmYmi7pZ3S4s+UCF40QEAQpDZbfB95WWSm0ZsUNNyO4mQ1OZCTKzfUrtr9CRnynVxRNkeHYOfqgHtBGvo+A8oMYVUfVHtAD8uplWI/tMWJ4NKx2814tlj/tNZgc3TJyNdBCCvHpJhCVNUBHKi/1RpujVE3Q71NvkJeShXx6ccJSKLHzMyxtK3WstNVU1Dkgpta6xF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UR8OxQBVN6Q1xE3WSvCi+6RYTNn4QQ9wUFfgR9owZeIoYguqpSBk++J8UiYI?= =?us-ascii?Q?+bUpdzMXQbfA7dp5gtOQnqrTKwrYluhwdh29qYGfoL3zHzMxUEELUg+vMz3g?= =?us-ascii?Q?iUbIfaM0PtV3Ee6IHGOTGWhOK1sX4AGZ++XX70rA/w6QFoc980mVX/dQTsvJ?= =?us-ascii?Q?AUntk4i5yVrvcJGvI3KLMqXvKMegZXaD42DritCouWyoEpodjjeoXHwyM2t7?= =?us-ascii?Q?d9k1A885EDVpMlnXBsPJhqyWvyEdwO04De5407w85yBBqnrK8H1YCjrDXzDR?= =?us-ascii?Q?4YfB1fGiKqFmWCr7TmHqzlW5nWtYH+WbccRYI0izXb7rOzgABfJ3YsZ0N20g?= =?us-ascii?Q?VVC48Vs++DdSXjRzZGo9Btsqwt+uQn0V5D4VrOZ7mYRcc4VI2r0n+q2MmhAP?= =?us-ascii?Q?LKgMnUVADK6Acf3sY2XaNZA+p1o0xLYoXo1Pias0Y9R09jITjKlcn+jJQ8Aa?= =?us-ascii?Q?3Rz7jgf+Tffev8QwcMijqfjW63uFSBxrw0met1A2QDGqLMayCS0iPzPrbZRk?= =?us-ascii?Q?PTFs8UKsTmHJk0taOmUiWPBQemyP7XPYqN/F59xVnpGCxSmM8A/0n47NkrBJ?= =?us-ascii?Q?97QTQvGpMfDauqWM/jkoOYATsl9L3ZRy9ttk2ERcw1bv/3MtsZIY5q4CvjVH?= =?us-ascii?Q?QBupC8n1szXeIA7Y8/TPzcYuY+5Q+eCqj9BwQ5TPTzqukHXbzOowY9WuEQD8?= =?us-ascii?Q?ffGtaajmkfrbrvu6sOwbu8U4gqO5p30+3hGAlb8GdGvFVDAdnDwPbG6jXZHz?= =?us-ascii?Q?pVhlNPFA3hskGZd2EcIaS16bD86xSHa1gwTN7o1ECTEo4VrHU0bjlzKNrlDX?= =?us-ascii?Q?YSCVcRRSLWCF4BdEGn340zXflddMBWW/hAaFuTSAjNPLuPatBu6l6WYr1DFW?= =?us-ascii?Q?buBIh6DThwrO2MjZNpi+VsIQKwJi1UV+6kGY3yn/vi0ND5vNcefMQZD4w59u?= =?us-ascii?Q?fo1RlZz3aymnIFhFO0JO5cso8a+OeJQpddepE+erCr4JBXiQXBj16lZJuDBJ?= =?us-ascii?Q?tDwOgs2fm45/nUSKtjhUOboVmBFE2E0mqzOsSJK70/JeIeaHVP+biwGLMkuj?= =?us-ascii?Q?fdn1eUHcSS0/WkO1PcxJjcIhqxzvy7U9YzKg05KOhyVRlSABact/xfQWvrZH?= =?us-ascii?Q?+YkjAzYs0aRle6gsboOBXD9oqPlWmbWaoLvn6j0bsMPjG2x3G4txVUbO3Eyo?= =?us-ascii?Q?0wfYYkY+WANcYzMf1OJv2mPXLTmcn2GE/NArh3QEYAN81EtrErhDX9UiCYh2?= =?us-ascii?Q?0mlB8/LpMExxNc8BlyvX9CWPdwxmHiu/K5zGxGKv+w=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17a98321-b8a3-4bef-33e9-08dc2b5de279 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:21.3528 (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 05/23] avutil/hwcontext_qsv: Allocate public 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 QSVDeviceContext as one no longer has to go through AVHWDeviceInternal. Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext_qsv.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index a67552b5ac..99d974f25f 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -70,6 +70,11 @@ typedef struct QSVDevicePriv { } QSVDevicePriv; typedef struct QSVDeviceContext { + /** + * The public AVQSVDeviceContext. See hwcontext_qsv.h for it. + */ + AVQSVDeviceContext p; + mfxHDL handle; mfxHandleType handle_type; mfxVersion ver; @@ -268,8 +273,8 @@ static int qsv_fill_border(AVFrame *dst, const AVFrame *src) static int qsv_device_init(AVHWDeviceContext *ctx) { - AVQSVDeviceContext *hwctx = ctx->hwctx; - QSVDeviceContext *s = ctx->internal->priv; + QSVDeviceContext *s = ctx->hwctx; + AVQSVDeviceContext *hwctx = &s->p; int hw_handle_supported = 0; mfxHandleType handle_type; enum AVHWDeviceType device_type; @@ -378,7 +383,7 @@ static int qsv_init_child_ctx(AVHWFramesContext *ctx) { AVQSVFramesContext *hwctx = ctx->hwctx; QSVFramesContext *s = ctx->internal->priv; - QSVDeviceContext *device_priv = ctx->device_ctx->internal->priv; + QSVDeviceContext *device_priv = ctx->device_ctx->hwctx; AVBufferRef *child_device_ref = NULL; AVBufferRef *child_frames_ref = NULL; @@ -1108,7 +1113,8 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx, mfxSession *session, int upload) { AVQSVFramesContext *frames_hwctx = ctx->hwctx; - QSVDeviceContext *device_priv = ctx->device_ctx->internal->priv; + QSVDeviceContext *device_priv = ctx->device_ctx->hwctx; + AVQSVDeviceContext *hwctx = &device_priv->p; int opaque = 0; mfxFrameAllocator frame_allocator = { @@ -1123,7 +1129,6 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx, mfxVideoParam par; mfxStatus err; int ret = AVERROR_UNKNOWN; - AVQSVDeviceContext *hwctx = ctx->device_ctx->hwctx; /* hwctx->loader is non-NULL for oneVPL user and NULL for non-oneVPL user */ void **loader = &hwctx->loader; @@ -2246,8 +2251,7 @@ const HWContextType ff_hwcontext_type_qsv = { .type = AV_HWDEVICE_TYPE_QSV, .name = "QSV", - .device_hwctx_size = sizeof(AVQSVDeviceContext), - .device_priv_size = sizeof(QSVDeviceContext), + .device_hwctx_size = sizeof(QSVDeviceContext), .frames_hwctx_size = sizeof(AVQSVFramesContext), .frames_priv_size = sizeof(QSVFramesContext), -- 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".