From patchwork Mon Feb 12 00:03:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46198 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp402040pzc; Sun, 11 Feb 2024 16:02:27 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU7aNLbJuNBrk46z//oMSqClU1M2salV3oVzbfDFb0RAlF8YT3MALM/9JTxkLtcuNJpwOoVZjmxVAqdNTbfFXCD2iduGB98HG8BBg== X-Google-Smtp-Source: AGHT+IH/fLzmQRc+aVgUmweVkQzSqbh17b/ov1hNhMnig5jsMW1Kr5G4+n1dY3OK6YRuJDq8Yiu8 X-Received: by 2002:a2e:a0cc:0:b0:2d0:ce72:570b with SMTP id f12-20020a2ea0cc000000b002d0ce72570bmr2944480ljm.48.1707696147640; Sun, 11 Feb 2024 16:02:27 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX8FvRbmYx6TZW+4bsl0tV/H4EhUQZ/mcevqvvtx5argWQILjjY9FmqN+lOD5fU4GPjInUbVII3PUU5M+DhVbV8oJLiFj3ug/p87i6v3oS9ggeTend7by5OKjDWAziAxLW31oL1xmeKNl/Iu50gkiNEUzzkAaEfFzSKyE5E2maicHpR+3PRRPJ/qxsTM9/oASaqoTH7e9P7QWIbjTfpya44sVZa+Zvu7pWluQxV/b7WBZnhVfS604P94xKCAhH/sqC/Ljqu1KF2Untlhny9+leVTRiylggjiiHK9r6gnjZ+f3rMM5NxR0t2YbXamC/+Arsz4J0OHn20p9To06COLDleDX61s3Jx0PTyGOdF9IPARUOVNEqWjurNbTHxml0bJZAWbDEdzqeZFR8iICWa7pYmAddTk4wy5qvi59tGHwcvGzDE64x9C++yFAzPo+HdD3Av5IRQFaLDDtVAgp4soHmd+R1JcAl1YwpW8JZQUVKKKpsD3yTEE2I1kwSe7w4ulZbnfX6u5JBAL5upyUr1TaLP1HuP6kFTOoQ4GV2i4jTn1nV+9qIbp2jw5ZHQAsY1fQWxEyESFI9iqDLyD6KDaCPb8WTBRJZuz+uNPSOzEpp+z+69jLvBVrvHwLrFv3vTO5G8j/0imlS5avz/dCABlPCoFCDiE0BvxazDaaUUzB0t0eRuMxUQCVExD8QlZ52etcZUJC88t2F4aA+kRAMN9LzbcXvcUsYo8X3WQ3frgrL1ioYsa3aY8pVW5JVmtAe2EmKhoXbX9MVml4eM563NVhWHycutBtkAPXVyWAJxgkEHI3od320JduJUZM2GzAWUFaWKp8ZPYbgzT8m/FyUfdITwFfegJC4oND/qLyLBsjp60gNK6mgSongI4NU4IiKuEljIOC9XAD8SjE1aDIlEOpp4RFQ4RThwdIaXOFebKzWcalu4/vlqyksrak1b5aH9FHTYV1 +PByRC7+H+zU4yeJ0F4510P4fUZFp6LMM0sbu3ILSf297UQsvzdXHkrXZ0LIisI4zUh8UBvJyfDaNRg8XryDJvCKfV5XiVl3KaOXIW9fk0VfH++fni21W1dsilesIONKqkleDUDtuXCSimQ728qGONL8Xa0jYhVHy4k4RdPpXt6MScgsucEJYireUBL0D4vjqWc+yibwIeposcg3TEZMSAxc+xmMENe+F7/0nbmO/eZeKOT8cNYvHTnfkDJz6NrnUWshglXCD23wGoUi1ro5S6syLTLcUGD4jIdulWY+2dXmiVKcMUuoR6EadOrkmZnGqbcE30JcSLfVzs/j5SEVQXJv5s+wzcrRB6f1nJHhI2+HYsfJcoGfVVzKH2uL/RM6pn5kZItAEtb1kFQk/mzudc1nKDRfiNEQGLQ9e1BXtNXoYDLr08ePM9z/7Ur3o4xGKHsKSexQ9TnCa+oF2hJHzp68zYOznHIoDYhpcLA5FtUdkPusy8lFW/cG+rNfMNBANHKMFiOn4xy3KIVya3oGh4XIub/cJ8QuJ4kCanPercqDSrB+nYWEHbhY0NBPyQGXotezPcGtDfC2jISZyGeZcyCKYPA1DSifFNxFe8VCwtsJbcKmpFJNQArArYGtE= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x22-20020aa7dad6000000b0056120916a5csi2249287eds.459.2024.02.11.16.02.27; Sun, 11 Feb 2024 16:02:27 -0800 (PST) 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=@outlook.com header.s=selector1 header.b=Ma7vxWuY; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C883968D139; Mon, 12 Feb 2024 02:02:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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: UR8OxQBVN6Q1xE3WSvCi+6RYTNn4QQ9wUFfgR9owZeIoYguqpSBk++J8UiYI+bUpdzMXQbfA7dp5gtOQnqrTKwrYluhwdh29qYGfoL3zHzMxUEELUg+vMz3giUbIfaM0PtV3Ee6IHGOTGWhOK1sX4AGZ++XX70rA/w6QFoc980mVX/dQTsvJAUntk4i5yVrvcJGvI3KLMqXvKMegZXaD42DritCouWyoEpodjjeoXHwyM2t7d9k1A885EDVpMlnXBsPJhqyWvyEdwO04De5407w85yBBqnrK8H1YCjrDXzDR4YfB1fGiKqFmWCr7TmHqzlW5nWtYH+WbccRYI0izXb7rOzgABfJ3YsZ0N20gVVC48Vs++DdSXjRzZGo9Btsqwt+uQn0V5D4VrOZ7mYRcc4VI2r0n+q2MmhAPLKgMnUVADK6Acf3sY2XaNZA+p1o0xLYoXo1Pias0Y9R09jITjKlcn+jJQ8Aa3Rz7jgf+Tffev8QwcMijqfjW63uFSBxrw0met1A2QDGqLMayCS0iPzPrbZRkPTFs8UKsTmHJk0taOmUiWPBQemyP7XPYqN/F59xVnpGCxSmM8A/0n47NkrBJ97QTQvGpMfDauqWM/jkoOYATsl9L3ZRy9ttk2ERcw1bv/3MtsZIY5q4CvjVHQBupC8n1szXeIA7Y8/TPzcYuY+5Q+eCqj9BwQ5TPTzqukHXbzOowY9WuEQD8ffGtaajmkfrbrvu6sOwbu8U4gqO5p30+3hGAlb8GdGvFVDAdnDwPbG6jXZHzpVhlNPFA3hskGZd2EcIaS16bD86xSHa1gwTN7o1ECTEo4VrHU0bjlzKNrlDXYSCVcRRSLWCF4BdEGn340zXflddMBWW/hAaFuTSAjNPLuPatBu6l6WYr1DFWbuBIh6DThwrO2MjZNpi+VsIQKwJi1UV+6kGY3yn/vi0ND5vNcefMQZD4w59ufo1RlZz3aymnIFhFO0JO5cso8a+OeJQpddepE+erCr4JBXiQXBj16lZJuDBJtDwOgs2fm45/nUSKtjhUOboVmBFE2E0mqzOsSJK70/JeIeaHVP+biwGLMkujfdn1eUHcSS0/WkO1PcxJjcIhqxzvy7U9YzKg05KOhyVRlSABact/xfQWvrZH+YkjAzYs0aRle6gsboOBXD9oqPlWmbWaoLvn6j0bsMPjG2x3G4txVUbO3Eyo0wfYYkY+WANcYzMf1OJv2mPXLTmcn2GE/NArh3QEYAN81EtrErhDX9UiCYh20mlB8/LpMExxNc8BlyvX9CWPdwxmHiu/K5zGxGKv+w== 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TA/twl1I4ZjD 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),