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 1AC97475F5 for ; Mon, 12 Feb 2024 00:03:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E6C068D16D; Mon, 12 Feb 2024 02:02:44 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2079.outbound.protection.outlook.com [40.92.73.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B86D068D14C for ; Mon, 12 Feb 2024 02:02:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CuLyUqCpICTECinY0lQZlbooDkVMhZAE5Mid5R0/B5ppWYZoOuSHTN6qjBviyk8qWWPPlLNd7uXAS1mZLni6jeSq5BiKBZKze6xQ9TeG25btzaoaxq2O459qVMu8dL+OVLA7qHV6XCdAec8v0Wj002IPilWVSGlsGjatKjiw8IucbyaKrZnqZ0/LPVHDBEWfCpzx/7V73ax9vpZJ9LzqpdCWM8kYGyHmswuVfI69evCdAvFm2ZncNLlMTSrX2+/qC0hY26k3BlKD65gglWdOJjt5eLWCr1ZZP1oaPUOMHzicdCHNxBHnaMieMW/lyJIKgomx6vd2SHBLjdjiw9zCzw== 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=WFmOBj9L8JNSAiZAoUDL5QmE0y1Yrh+f6iuaDZbVTVQ=; b=BS0dVZ/2tw/ofI2BBm+9HmDTpFuWrl0HH+pLtz2z2Z6HgQgixw8s3x2YPIkgfKhW90wtklIDam9iMhfUzI3ke8Zv+08Z+XK/dt0OC4pJGZWoya2y12jAuk1LxK7WzmmPhuq15DlASaUDzeSRdmMdIcOI85YTEr0O+nDYcUCn1ukdFj9+jYrRRvp6/h3XlP/2aYTxQkcUaFcJDXQhxE/iETiJZj2Cd917K7a3zIv5wQCh0rVRsOOhWgQ+yXTmXnkiiclqAhZWOs6ULXsYuYgOkbPSzpzgk4qzOv6u+xmjPV5hEjmyQfBAGBUYI4yLQh8UG0TFjRgjmQuZ8LdlWRcVag== 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=WFmOBj9L8JNSAiZAoUDL5QmE0y1Yrh+f6iuaDZbVTVQ=; b=Jo2YARB0z1A4A9ofg1lsdA+kuct+TNThU6KrtpD5La9AvrFzMV9HD1bWkxhLHLBhI5qFhxeTlaml7+EHWx1IGvbxZyq1+59ZZ6bjIHZFs59Hqf49vXUCrgZlLUV7D/vgOH5ZM8VUfw3U9FwPy/0P6mZJgGsQXLlGEgAlWsz6hAeM+Ff5YkSGjwaEpYHoULmTMaWY0TvqguH0EYU08l9Smhmd6xJCOB1OpVWRhYfwwUh0d+EROhJ6SpQCC9RrWqj2wj6nAj9/t46iV5/hUWpg9Y3MvtkZD+aTeaX/pdIg8ALNFf9fR7z3ZI5IdsmFTEtSlqK/5mse2uxTKK3NvbAQ+w== 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:41 +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:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 01:03:23 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [sRFveUtDJ0Uvp5c7rZHX7+PLv+1pK0Gr0yk5JchdQ/k=] 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-10-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: db03d81e-6d7a-446e-14db-08dc2b5dee1e X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqwZHg0HfSFdl5Zlrnc8YAZMqDtUbVXlqasn6cfMx/BBt5oep8ZNiPVMHpY1yNbAfkVH9PMLikUi2QoeRpSSJKcuWRm8eJ+YL/5oPNY5ZmlLkU4xurM7MjhzMUhv5BGLaNjT47BPZqTtJYlwTxBG6bC/K0pV7OXw1cBv62+NE+M51ae5czZ6lhF+fNT7unQdqiH3eTW4mxUrRNFYue9+t8OI/82oVxShaQJ/33GyYcJSR6stMmIglH7I8fw1Wcs+xR38t18Pw2/4tq+SAH1kPhqJHeM6QoK6e9c0NA1dHf7x5eGbuwtGxd1N/BcAmMuaTGQ6sf/zAhsf0D14oz/Q0EGYtVfdtzHC206Qq9VeuPMt1L2gB+A4In+Y5bpSVJV02rzbpxGj9oXv47x2RwcUwzGNGX+w7foZvcM+2A9iREoei7JToBdO69tf+sQ/W/i+kOreqadpVE7ZG/3v/X6lMuSgAf8SH4Aghd5MWYNvO5v1Bk8TfMm62yS9zpfvNXxUyBTYlh+T0u0f++cTfqeOqvuAeqsauLCS4IPQgjMWZkVCbSEbCDInTgwsa+KJ0bthP/N2aH3ycQkxhuLXbpBZNPSodsysNPQy+RSv7+yD7owvpKpDMvQvOJnYDEFun10NtI7BFQMmpfJV8RQoCMvw7ZFqu8VzFxlYAXikAPAjMxRzM3RMnZeqGQTNQmnFGNQ8Vyx4ueTW5K5TtQe6ww4uiKSzwcLW4NfqkUXcBjFinfsyLWP1Y2w/bgEWVqiEX1YWBg= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Iv2463+3RGOZ1CiT8kHxE9xAwgQ0G8ccrXuaBfScPn5p4xM9G1tRLigZkYgUjHQjk2Ar2sKxlDy6wGmAsenzV6+eTvRYHS/hJdDI8gVhadnvcC75K6IFqUbo8zxW3bHy4jcM5V8Cz42L0NSqxgyAFEiTqNqIPrVVA80qRRA8k6R+efZLC4gUqIaf6DpTisIAXTMscpfvY8RgimXsivLsQ9LmU3uPZrYOosbne3c2T0hL7CRW93O46nLr6SBgo2eJncCvgkX0n/18nNdRsLK3cdhSnAp3TAjDAbhJS8JlmKYNUu238RI0vidsGPWU1RlwWPiJRY5A6160NYU6Ha1mgzVXsVI0MPHTaUzJlTzmjxZmcQuFmMR09d2XCeXcTs/lMPndDGS3T6++ue1Zua8hdkkLFgc7439rAJfUfrwizz4bhbHvedz4nQiP2CpTXrlooarx+JDKcQ35t8bNuZNN/DxBEnDGXd4zX5LaU6sF7zpzPIbiczzYQ2L6NAA7dVRRsqx5q6up1OJrwA7KyVxZUpQDgjlIP1SXJmKOrlfib8PcfJ7iG2UlWlgaDw6Y36czotLLUQljQ0dyrmIDOHvjDhbpx4h2V3PfTFD5ni7TG5OycSbcyoavHMtNRzVYsgzO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?K7Oi0WzP2UHNFkI5xxSTFu6R1sHldSQwzLeBZIxX2Jg3+BeqmpqIledJ7R60?= =?us-ascii?Q?CihKitXUfodo1e+x5C2Dqr9E0G1I0TPBjDfZttZunRoxW6pGQc+han37GyYA?= =?us-ascii?Q?kFjB45Rd+RODVRtaT1GjpKPWAF8l/O8tXiN1xPuBYYwtbAX8IWCb3Lim4Ktx?= =?us-ascii?Q?0SVWGEJuFrP+Vcwz34asiD8d1/Ues0ZJGGMHemnJuzQwxy8HrH4lFtWDX/1v?= =?us-ascii?Q?VQtXmEDtYijTH3e/tX5+YsEsIf35bQbo/7gLwJtnQoOhpVBnRmSzpKJLdB03?= =?us-ascii?Q?nIKd8GiHZizg89YJ3xZ0Gp+aZ0LEcpxWBxCKy75aEgPLEasVXqc1q3x7bnQ7?= =?us-ascii?Q?nwbf6zL+UrO7JdR88V5VMppviw/VxOXoL2FV92J8q3bdpARrZ9V8KasUofjX?= =?us-ascii?Q?rQ2kgX8YVESHwHBa5m4QOzv0Fl7MeDNkWik4f+yZyy/JvNkC0sFeZ8LA2Fr5?= =?us-ascii?Q?CxmH+wwYx3q9Rv+S02hoU+UWJqEe+GcUlhPtZQvT1yG+qbUy7UbMN9VQC6E1?= =?us-ascii?Q?AB0zDzAqP/XiCznkwKYJ/XTMsmXV/6dJfCyirN85UpBVozgk2s1dZn9cvz4y?= =?us-ascii?Q?6TRA35/8rSCq/f2/9LxqSlvJ+mOun7clWDUXjBXOeGNV9U3VdnU1HnmCWMqe?= =?us-ascii?Q?QaE0Ky96zOAQ4FhcaaJ4Udyx+8XMiwjHgH9hvqUjYdh7nmaXPh5ls0x0WVFp?= =?us-ascii?Q?zfIWIjmyWvRUknGTlyBq6hQIiuYe2u0/ZuAPEIyFhTt3aiTl0M9CKo+e5ard?= =?us-ascii?Q?pExEMTx+YVjh1SJXI0GpJtmL8gkc0WMEYOfYgmGKhENmg5o8ALEzJAOKdgXI?= =?us-ascii?Q?3KDf3uL4uet8K1Z1dIS21UPhbpCGMSsWNT5jQjHhzoV1iYE808nOnqvfPP/+?= =?us-ascii?Q?K63QI9ODeVDWPqXTsr/lj6d+C7Gd0SvjiuyeWd9AYkHsRFJpC0QzdyKJ7uhe?= =?us-ascii?Q?wYiqBdAsEwjOjrmsz/ENQz4tdn6nd9VtDs41QZ3fbjq3gEPNNPL12qgxBR6e?= =?us-ascii?Q?irhfpaylxFzqvAF9G4+iVezudDK+ipAEFcrse/Pmwsk8G7qrv+myqpZ8B9Ww?= =?us-ascii?Q?/CvoVmYVaN5fd+E+eTPRtn4rlGB7l+8PbF8faJ1GzJcidmD1MTp6DvC4piU0?= =?us-ascii?Q?8i1J93o5FD9Jug5SdrItYctPkuYAjZEXsKDf7NCzZqmtk0ncMddIQ7cnxTpB?= =?us-ascii?Q?o0p84o0HozCwVwVQWyuETNTzVifny2nVCZIGhnfgGRqdFgXj+aJI+OHzr7Qh?= =?us-ascii?Q?BbFgcizBPXYjbfiDXLkur9vmzaxWYzU1xzdXXo/I9w=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: db03d81e-6d7a-446e-14db-08dc2b5dee1e 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:40.8342 (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 11/23] avutil/hwcontext_vaapi: 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 VAAPIFramesContext as one no longer has to go through AVHWFramesInternal. Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext_vaapi.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 7019769f24..2c75f5f5b1 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -86,6 +86,11 @@ typedef struct VAAPIDeviceContext { } VAAPIDeviceContext; typedef struct VAAPIFramesContext { + /** + * The public AVVAAPIFramesContext. See hwcontext_vaapi.h for it. + */ + AVVAAPIFramesContext p; + // Surface attributes set at create time. VASurfaceAttrib *attributes; int nb_attributes; @@ -503,9 +508,9 @@ static void vaapi_buffer_free(void *opaque, uint8_t *data) static AVBufferRef *vaapi_pool_alloc(void *opaque, size_t size) { AVHWFramesContext *hwfc = opaque; - VAAPIFramesContext *ctx = hwfc->internal->priv; + VAAPIFramesContext *ctx = hwfc->hwctx; + AVVAAPIFramesContext *avfc = &ctx->p; AVVAAPIDeviceContext *hwctx = hwfc->device_ctx->hwctx; - AVVAAPIFramesContext *avfc = hwfc->hwctx; VASurfaceID surface_id; VAStatus vas; AVBufferRef *ref; @@ -546,8 +551,8 @@ static AVBufferRef *vaapi_pool_alloc(void *opaque, size_t size) static int vaapi_frames_init(AVHWFramesContext *hwfc) { - AVVAAPIFramesContext *avfc = hwfc->hwctx; - VAAPIFramesContext *ctx = hwfc->internal->priv; + VAAPIFramesContext *ctx = hwfc->hwctx; + AVVAAPIFramesContext *avfc = &ctx->p; AVVAAPIDeviceContext *hwctx = hwfc->device_ctx->hwctx; const VAAPIFormatDescriptor *desc; VAImageFormat *expected_format; @@ -698,8 +703,8 @@ fail: static void vaapi_frames_uninit(AVHWFramesContext *hwfc) { - AVVAAPIFramesContext *avfc = hwfc->hwctx; - VAAPIFramesContext *ctx = hwfc->internal->priv; + VAAPIFramesContext *ctx = hwfc->hwctx; + AVVAAPIFramesContext *avfc = &ctx->p; av_freep(&avfc->surface_ids); av_freep(&ctx->attributes); @@ -796,7 +801,7 @@ static int vaapi_map_frame(AVHWFramesContext *hwfc, AVFrame *dst, const AVFrame *src, int flags) { AVVAAPIDeviceContext *hwctx = hwfc->device_ctx->hwctx; - VAAPIFramesContext *ctx = hwfc->internal->priv; + VAAPIFramesContext *ctx = hwfc->hwctx; VASurfaceID surface_id; const VAAPIFormatDescriptor *desc; VAImageFormat *image_format; @@ -1075,7 +1080,7 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst, const AVFrame *src, int flags) { #if VA_CHECK_VERSION(1, 1, 0) - VAAPIFramesContext *src_vafc = src_fc->internal->priv; + VAAPIFramesContext *src_vafc = src_fc->hwctx; int use_prime2; #else int k; @@ -2014,8 +2019,7 @@ const HWContextType ff_hwcontext_type_vaapi = { .device_hwctx_size = sizeof(VAAPIDeviceContext), .device_hwconfig_size = sizeof(AVVAAPIHWConfig), - .frames_hwctx_size = sizeof(AVVAAPIFramesContext), - .frames_priv_size = sizeof(VAAPIFramesContext), + .frames_hwctx_size = sizeof(VAAPIFramesContext), .device_create = &vaapi_device_create, .device_derive = &vaapi_device_derive, -- 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".