From patchwork Mon Feb 12 00:03:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46204 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp402454pzc; Sun, 11 Feb 2024 16:03:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IHyGi3YTtdmGSwZthJj9j9njCljlzhFL0x7WTyAoj6tC2UObcr8Ujslsy3iezd+/jlTHKWc X-Received: by 2002:aa7:db54:0:b0:560:4ee6:cf78 with SMTP id n20-20020aa7db54000000b005604ee6cf78mr4675318edt.31.1707696202234; Sun, 11 Feb 2024 16:03:22 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV9FCd+pkuHpyt7tZvxmjLlOl5gT9upipi5PBWzh+I9oLW0YcUnISHVhhbrXkCaZFmQjAuZqs+n/WjRigjQ6cWeO4MJDoHTz5R64YFCBoixrPrhTs68kGNOfnvSuOK9PH1KNWWpEk9IvOwLJ8Gpdf+qKSkM5M7Bu1yawrT1q6pFr20AhNajZjIzYhG0LApxf+F6iaJcZMyFX4NWb2LtR5+uMBEIiqtEMT2yZkbSPbvBCQAegHwHrn1dL+cRUUGqfjxkO7U2UpU8TZJ5wi1NgAfsNd4wE8pAilABWUL7G4Uib6VGhl8dZmaozeZ85EmkN02JQYmzrAr7J+2OeqxoGQnN3Z7ayL1I79EzuHJDGvqW/w/DrXvbJo53tKklOp7T0fUKSu5YcCX0ms82iNZvtGIfvzwEggkSfiVRAKjsQ/hKC9v2g4DRod5Reo0q+qUEgifQFtdR861L84vrN4NhgT5Ht3lwJ6EOoa8oXbBXe/Vs5rn3wi9PZgq9qHuGShpUZCSA2Q+F536f8ACBxNCWmWkt+FRVtua80cBEffxsykNaWs7WK8mhYg1BhXCyiRx+PsSIKjOGQ4alPUZ6jtVqljzBcKzDxQQm0JO+5CLczdGbZmi/OibyqAKp7sWIMjuKbnLrgS7tkNCIzP009Hpoo7GPjO31oQP7UTEXKXj2Uf0dDKBvjsKeAcShjzJGaXi/g9Op6RV0kDromg41Baz4+KVTSJPet5TczFj6XC7lj8axM7laXA7afYzpeWw+Q45JjldGKKFpFRGfI/q7hqhEYvLTpQraYMVPOqN7cHZs7Vg5c9RSDWuF99fliy1iEIucelpuTR5Mzv9SI7AleAnxVhFl4dwmCTAbyPF3GFhH9t7/YIxJziHVEtnVvtSb67nzhsgFOGLPiSIS5WycHKE1RLPwmBjyXkNXzv5z/uGMxeWMY9GNcooEngPR7FYe9tEu6ait5h /5qVVhxXthhQysrGVYal/+FKl1+mA99AsBcT78yE7mRV3YpLV91ffqgqUWc4J/4hvc8A42uHxUSVPiwH4FNgmuKkpAfbOwczFn9nk2qVDop0HNtths3VQd5IRNWbslTeD467h/E0IZCUJJ0dwu3Rr7lYWFVVraqNDQLpPvlWYNWKx09Q9dgjgjhrsy9sWArvjByQfYQMmniE6cJxnMp8NG+oc4USaOqT/xMvSALR8N9v3eFeB4EWCjyr+ukBkzOMTLmvS2TKf4ZSlvJpvIZBt0aKuG4XQisDYzwbYejBKbeIwiqrS5gfUhJOn3yVd/IpkWNMycwsAo90+O014arZh3tHJ5yIKqOgwsKVyIVnJQ4vG/ArcpUN6tItn+20vqbpoZlkKVu6o+QcdvY1uFGJd+5pBCMaNh6dden3YuyAZuqjJzf2boLdTB6i2d7HgtAOBavmRN9QPv3DnwvbVXKIR+o76qWvsOzCI43ExtBnpwES/3kASVMZTbKz4/PXOhCaWTw9jyjx7nKw0dVhnK+VSy6FL2qGF7a72IBusGpWBBNfME5OQFVjRKYDnLLQAb1YqsLHrf6xgONmnpxa/LNIRZb0rT5S4qmm7ukfy1cyvnAXU0O0a8jh+UN63Oo8A= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v25-20020aa7d9d9000000b005611242acf3si2232629eds.531.2024.02.11.16.03.21; Sun, 11 Feb 2024 16:03:22 -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=bXTA3uIB; 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 A539668D17F; Mon, 12 Feb 2024 02:02:46 +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-he1eur04olkn2093.outbound.protection.outlook.com [40.92.73.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F0A268D171 for ; Mon, 12 Feb 2024 02:02:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UTZGpgmNOTKKOq6eZAnVJiMEOf+9cUx7wAlzZtV4/tnLp0qx1UUNhEWeht/8eV0WhVsmzxs0oBjMPNUq82gCtBSI3dk/CEHZlQvK4S3RCGCS+XfI9HlydwHB1n7ecLe04N8q5+n/hugf+wnhjHBmA2EAUCmhY3Lj/KSpfg8GJi8DwfIyKLdoezMr98hAC+xTDWY4P/FTOp9DBkdsDBlkVRmsH2q6STH7OyMVlbMw/DTTuPbH+Xzt/Jee3RtS32pioT7FS1+xv1kjIYInK+9bsiGmAGt6TId/v1s6mS3WUtf82IbSfzhwfLTNO9Scyew1aqw1EkaXL0YaS2DC6ZdrZw== 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=2yuqbF6n9S7RHYz/ta1io3H7qOsActEJ6XjkkNZvWWA=; b=EDyK9cZ2aO/w1hoBvc7fOrJTjYHHOcz4SoiY4AeKvH+mFWEQsGe5+48m9EyJCeokRMBnnYgrHcguvLQh1VWdBQ87J0Uj5mSwZTECfRHUz4sBAGLwEFteqBtnCXkqkow9+g0QGy/hiPuhOIkcz3NVNCsNYFhgqO5tfyRMni0gBrPAVIaJQaKDhBA4fx/5a3U7/ay1gXSJiE5Y+vlbOOtnq30m1vFW1xPlk6gI3unenXjs1+zB/Lb3blH0cq2jtle12em9oTw19H19UWSaj+RfWcMXRjdceDr0ktFqMxMvh/DrBqeRxbCOzqk/0HQ5XUMGuE4OKV4H65ivZM9qiUN87g== 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=2yuqbF6n9S7RHYz/ta1io3H7qOsActEJ6XjkkNZvWWA=; b=bXTA3uIBoQidliSQHd5AkDQNNfbCCtoGR7tuimzi5nSJwHT78TyFaXr6j84207F64TbYF6S5qZyiwTzJ7KIptOtr0cnEid77sdiIs8tGB2YxBIiLLpKENwIOCmvzvi5FQVTaaZQbAMTG+qgY+mi8O9TrkuzIkA8KkcYGcKIuYwX42593XAB6bq0cKt02x1z1gWMBh+45zJM1RCi0MbKESdF/owOh3+d+tqsvbzBOybmE4H6xS0UV1Le91vRFX2uvEJhc5QPLy6z4OeDaMtw4V5wArtH73NScl1Fmpeb3ajFAWRmnaeiHBjkdv2xcQduOQqx7Of47fXUXynoMt8K9Og== 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:42 +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:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 01:03:24 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [JnTi0UoRm59RPGO5mcfTcBcxbkN6f7vPSwYno+Ax8xo=] 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-11-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: 8eafd965-63cb-49fc-1bfe-08dc2b5def09 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqwZHg0HfSFdl5Zlrnc8YAZMqDtUbVXlqasn6cfMx/BBt5oep8ZNiPVMHpY1yNbAfkVH9PMLikUi2QoeRpSSJKcuWRm8eJ+YL+Q8H0Y1c4DBKyC+xL7YUGZZ4UFOJyf2uSTpQSQPE8Gd5fVQRm08Yny9s20301AMEt81DVRYqK8VKW5cRjR+SCMbuhjl+kC90lsXHHcS+cebsQzSU0GvadGCfHjrokBwmLqNLXQZmbllysDbzOvIdT21QII8iGQpNphH4FtsAynVR7yTrf8+2R49zB/8KH12PRRPsufJmywydWL6yy4qZBXt2y357BYD5Dq66lcqcP+7YbbMNcrLScd+vgsAtcuQA/87Qvz433gO31XstAlEm44FxH4epA5ocGxDdyYe9dDBV8eEcdQ0U2hKhi0pG/eXcFJ0II3sqOr2NpKsq+h+kEx4D12iSEgeLyCbkzEDMmG+uuNQvSZeJzxWos3D3AOl7zDaiyNvPs6xUyH7LYQG/QBweUUTzXDlNNuPdZN0ivu46f/N3RPjZVhwNdaID7d6i02H2YmZvlGn8GMHYSImYVA45n/3mNrPHqjw+F5jJYEIotT+vgt08P/+No5zOf4+5afNquzJe0rPxIyOndAeorchIAueP6CFnTQalhIEWNIAlpp7V19iy5HluKhE/vJnDq4tY7QhswiV17zRI2x4OLDz5ZzGKzlBczpoe8JDuFpXXOe9VUP7HmXKrHxQULYDBIgOozsC73mXWESC4/yifdiKpgqmW9Qy1g= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jqWAxwAtymgslB02RqW6mwaCvmwaD0Zp8vMS7qvMLPYi4mj3peN76pWgMBaockq41AnH478a9KYNj/+ZVdGpzYtBBZzyL0x05NGB4ONUEvzkjokWL78WaeEgGdRtFhzCf6mq2KqxaKr3sABgSJ8mgORMdfkhr6AWvdbTTB0aEua9XQwrCtNSWfalIL7a5ThPHCGh++3/L5zmLTx8FQueN2MC1a4i/rrlew9U9n34ss5v+dC8YI8T2d48XXCKXfpt3jztPtSRL4DusNJyu3lM02qXXxauJ31bsQrOpTxm6Ji1TEGHejFBWd8aVJwvgSL8YFduLgBRw++d7KKVGaDqZRMcetaEfk3/1DNussWmgrOe8k7aSoUPyIeP0F+bDiHIuYJ7imbLiKpQ5N6MrIgNjYmZ2w6P2PBN8gk3BHAzw2XJha+Xnwp+qZnENTwOvpwPbufMLqxQpEjwq29VRfEhhXJzucvL+/ISPf8zo5IzHwByBzzWftmPYOTxxy2ParmhpTSOoU8E9r8j84VdTT/oxAEto4R59WF6NpPs/wLaWxXOZ/8i4qjKwIFHnsTTAVR4irgh37fhzUGnTTET1iO6kPB87gx0dnRp2sxABAlxgfP2nxyqjROPt7QSueqLPHXd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RtpQAGMgGbme3f+0w8YGtEU3TiQvtH7nJspWjLtyyJ0w0TVOLgNa9OKdjQxsiYNQL+ilSH7XNk/ej8RUUZ6xD7HspW3LcUUfWHW/zDUig5Qjp8/VLek6Dtjfeol3DZzY6IKPIOIZM1yw7vtxHK3tgpXJQsmOk4Y1zlmxpyTf2DZgE+EPTsej0Uth1PbCY7rwQOeimzVdMORBhyIm1xQv3ISTZkWc7dRB5DMohwZBLGh3xcB9J2rdbosnI3hTccrVs0eOajb7d/I3kdin4GKTMmIwA6XPWJUp3e8ZEardGJQd3kSuVFXfP8l5Oxd+Z7rAyrASOFW0Nomd+ljGKSHyOPvtoqNHp6zkDKj20bOHiFOiRim8/LNXLJFL8uPp06UjP6qJwqpRAIwpaDrXvZa9DZ5DYAgIbQrrFpRLGTsei2bW4BeEIzdHKtD+aBmipW4XNRTwVBJqmEru/YvUxPFnk3ayvozni0GpdHKps0ayPCrUswI5/sOO6+qBMUV/KcEOnUKAl5juh3kbR6OUqxX7YoidkjMG3dmem+oGsQFOkqufck3XSENrqIQQbqSpsKA49a+vGTI74Bir521h4g9MnyDpIVpQgULuNDJASWQLCeEvfysiAyLazjY1KIhDOStkk9lLx9b0kdEmS80nYUt4MR8vh1zHbiknS33FZtikk2GMquomTCtGdTn8/OGI4porskrpqPidaYpCQXqZTHy+N5x3v5HVREPh/AZjDRIi7mVP26GcjcZ243Kw/3dD2OX62vjOLdGh9WZimA5oZpfe4Ur0+DIMWEDsFxeTKEDUrZw/K8RN7QCpvTYV0gvv2F27jUwmVkyg74jNz1f8oJ1htFnT6AYds6/ChdNq0B8nQwwCgnb0vJEfvwJspzGhLmjURNg3uWwPqWTEL0t6AOH+XVOxrRosgSle6eBaGwCKF1eu3KFrdtwL6xCdNofbjT0YPb1aw0zPk3RxwN0K70A/Tzd25r2rrAy4FoHyg19jSBNe8HvuTNJai1l7xck5gfVJtN79lBxj9s5uEB1avsP9y6oZRDV2NLmoTP1o/PzvvgGDy65y9LjZGCzVzbOfUmj1TnmV9tKBhPE3ketrYw1Np+Ll7dLRT1GBHzO9y+sLa5lcnM3cYJ8+p4HSQ6nR2d0oxbt9PUfPyyVLa+fMNCAXQf7OlOdh7teft4kkpYh3r2O6cx1PpHIt72rUmOku4cyjYvIcHXmAhoxAc8SW3FPedH+YBQtFnLzaMmq66Pu/nEOh4c8Xjx2sWBny48Vt9fzfDjE+fyp7R5vzkGPwpX+urw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8eafd965-63cb-49fc-1bfe-08dc2b5def09 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:42.3725 (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 12/23] avutil/hwcontext_vulkan: 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OBYAM+ZZd3VP This is possible because the lifetime of both coincide. Besides reducing the number of allocations this also simplifies access to VulkanFramesPriv as one no longer has to go through AVHWFramesInternal. Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext_vulkan.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 3d591dedf9..449a6a2fef 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -129,6 +129,11 @@ typedef struct VulkanDevicePriv { } VulkanDevicePriv; typedef struct VulkanFramesPriv { + /** + * The public AVVulkanFramesContext. See hwcontext_vulkan.h for it. + */ + AVVulkanFramesContext p; + /* Image conversions */ FFVkExecPool compute_exec; @@ -2191,9 +2196,9 @@ static AVBufferRef *vulkan_pool_alloc(void *opaque, size_t size) AVVkFrame *f; AVBufferRef *avbuf = NULL; AVHWFramesContext *hwfc = opaque; - AVVulkanFramesContext *hwctx = hwfc->hwctx; VulkanDevicePriv *p = hwfc->device_ctx->hwctx; - VulkanFramesPriv *fp = hwfc->internal->priv; + VulkanFramesPriv *fp = hwfc->hwctx; + AVVulkanFramesContext *hwctx = &fp->p; VkExternalMemoryHandleTypeFlags e = 0x0; VkExportMemoryAllocateInfo eminfo[AV_NUM_DATA_POINTERS]; @@ -2264,7 +2269,7 @@ static void unlock_frame(AVHWFramesContext *fc, AVVkFrame *vkf) static void vulkan_frames_uninit(AVHWFramesContext *hwfc) { VulkanDevicePriv *p = hwfc->device_ctx->hwctx; - VulkanFramesPriv *fp = hwfc->internal->priv; + VulkanFramesPriv *fp = hwfc->hwctx; if (fp->modifier_info) { if (fp->modifier_info->pDrmFormatModifiers) @@ -2281,8 +2286,8 @@ static int vulkan_frames_init(AVHWFramesContext *hwfc) { int err; AVVkFrame *f; - AVVulkanFramesContext *hwctx = hwfc->hwctx; - VulkanFramesPriv *fp = hwfc->internal->priv; + VulkanFramesPriv *fp = hwfc->hwctx; + AVVulkanFramesContext *hwctx = &fp->p; VulkanDevicePriv *p = hwfc->device_ctx->hwctx; VkImageUsageFlagBits supported_usage; const struct FFVkFormatEntry *fmt; @@ -2493,7 +2498,7 @@ static int vulkan_map_from_drm_frame_desc(AVHWFramesContext *hwfc, AVVkFrame **f VulkanDevicePriv *p = ctx->hwctx; AVVulkanDeviceContext *hwctx = &p->p; FFVulkanFunctions *vk = &p->vkctx.vkfn; - VulkanFramesPriv *fp = hwfc->internal->priv; + VulkanFramesPriv *fp = hwfc->hwctx; const AVDRMFrameDescriptor *desc = (AVDRMFrameDescriptor *)src->data[0]; VkBindImageMemoryInfo bind_info[AV_DRM_MAX_PLANES]; VkBindImagePlaneMemoryInfo plane_info[AV_DRM_MAX_PLANES]; @@ -3004,7 +3009,7 @@ static int vulkan_transfer_data_from_cuda(AVHWFramesContext *hwfc, CUcontext dummy; AVVkFrame *dst_f; AVVkFrameInternal *dst_int; - VulkanFramesPriv *fp = hwfc->internal->priv; + VulkanFramesPriv *fp = hwfc->hwctx; const int planes = av_pix_fmt_count_planes(hwfc->sw_format); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(hwfc->sw_format); @@ -3146,8 +3151,8 @@ static int vulkan_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst, VulkanDevicePriv *p = hwfc->device_ctx->hwctx; AVVulkanDeviceContext *hwctx = &p->p; FFVulkanFunctions *vk = &p->vkctx.vkfn; - VulkanFramesPriv *fp = hwfc->internal->priv; - AVVulkanFramesContext *hwfctx = hwfc->hwctx; + VulkanFramesPriv *fp = hwfc->hwctx; + AVVulkanFramesContext *hwfctx = &fp->p; const int planes = av_pix_fmt_count_planes(hwfc->sw_format); VkImageDrmFormatModifierPropertiesEXT drm_mod = { .sType = VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT, @@ -3317,7 +3322,7 @@ static int transfer_image_buf(AVHWFramesContext *hwfc, AVFrame *f, { int err; AVVkFrame *frame = (AVVkFrame *)f->data[0]; - VulkanFramesPriv *fp = hwfc->internal->priv; + VulkanFramesPriv *fp = hwfc->hwctx; VulkanDevicePriv *p = hwfc->device_ctx->hwctx; FFVulkanFunctions *vk = &p->vkctx.vkfn; VkImageMemoryBarrier2 img_bar[AV_NUM_DATA_POINTERS]; @@ -3580,7 +3585,7 @@ static int vulkan_transfer_data_to_cuda(AVHWFramesContext *hwfc, AVFrame *dst, CUcontext dummy; AVVkFrame *dst_f; AVVkFrameInternal *dst_int; - VulkanFramesPriv *fp = hwfc->internal->priv; + VulkanFramesPriv *fp = hwfc->hwctx; const int planes = av_pix_fmt_count_planes(hwfc->sw_format); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(hwfc->sw_format); @@ -3723,8 +3728,7 @@ const HWContextType ff_hwcontext_type_vulkan = { .name = "Vulkan", .device_hwctx_size = sizeof(VulkanDevicePriv), - .frames_hwctx_size = sizeof(AVVulkanFramesContext), - .frames_priv_size = sizeof(VulkanFramesPriv), + .frames_hwctx_size = sizeof(VulkanFramesPriv), .device_init = &vulkan_device_init, .device_uninit = &vulkan_device_uninit,