From patchwork Mon Feb 12 00:03:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46212 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp403012pzc; Sun, 11 Feb 2024 16:04:38 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUvg8dLL+0SHznZJEdeyCaTimDW+GTLbxx/ef1WDdkBqZCjDXzwoiV7/vu+iUYRT/CO8O1F3/4GSLyXFudVwDL19tlqBVA4FN5ofA== X-Google-Smtp-Source: AGHT+IHviZ3Huh14z2BevNFOhZiKRRWxRUHC648e0DWCejT7vU65/TaTX+h8K4w7C+1DcxrdCzFo X-Received: by 2002:a05:6512:ba2:b0:511:7aa7:197b with SMTP id b34-20020a0565120ba200b005117aa7197bmr4393083lfv.60.1707696277761; Sun, 11 Feb 2024 16:04:37 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWU1AadiHTgEdImYDym1qE/N4QFCmlpCsl7uXdY6viBspaoQ1T/d+tr2fckKgqOF6nQrAz8Vxhjyf0PVjQsxv4vwu9y5mvWNMxcKf/DjPz3mDDHA3HtkMcjBtjbADdzu0IbfNTW2sgLYGllaykjX9l3uLwrTgRPjTSihpsxzDcaj7aXcNTFF+r39jQ5XVXhHizPCp8YFxwb2DpOKsxeV8u///kLEW+IJiGHkYDe4wD0nRuaZJevDlETLR7y3jCtnSOJmmps4eBDqz1LieiBZnkpaCHRNJuSVl5HIp3IalLcqdvPS1bOVIGoZzTrxzjycDNXi89I1yLWX9U6ycr8vOFI2u1AP5cbail5JRl6Yznn9ZppGUlxdY6CiuqNRh9ON6zzlRQ3bX1xuvI54/zonmvtvMGa/pDSBDBdY8GzrR4K6XOXOcBOKWTqQL/VISwfXLlkFzpjZt1mf4Rknv6m7Z38vXRD06b4ggDit4RPnob0EhYr8iwbL4AGKkHJhl90UEBKm/+NsuBlDNmIYUHsPtsVjKuDEJX6mdW6UqyQqD2FXqXIMkN+yy3T8179KxmOUrfmx3VCOpG0rpx7ltSgec1USU20ku+//Nw5REkhHy5N7whY6WxKF2YOpyyRkRETu/JzPS7KcVYN8ZHOJXAsS1ZR6+Xt30bfKUSMbu0pdJIW6ZiL83p3kcZirn9xLunRec/YMNXwDrFwa81hQdxk7uADmBxMFrBiTfKS3rdTmKQ/7ceNvrErppAkeZ3/FGZQV2kMeQi8TBlShH11Zs6URq9GKDCab7cTqE4NCSC9tA/Eq8CyYSrkxqhbIpoWhiAN+/b+yM5crCaEdxXD1IC3dzXZsyGJ7XQWymLDa54088AeRbWY2i3eUTIgrHqiDyiCYc4vc34yiLERYi+RioCDOYdPQyzYWBwDz08mnEjJDayRjpujwA7TqTE6bUItK9HADR4vDX ke8Ef8l8LX0vc01mjRBhd44NJmD0VVeEMLN4bFMv9JRw2LkqQWtSqvyyMHRLjo6SQnvMVUdF173bJGS/JMIlBCcibREbKoXyAjLQeCmaYszXo/A3oRHcoZYkvWVwDM97Q71b3viyOd25qBlYDip2ZvezLQNsoHdfNzNLJ2vne0rHYWp38VJhTAbqXLZ2E2Gw2ugKAGcU8lsP7zWyK7sjpW8NQPQboNh8ePwl2xeiOCO1Wd4J+ECoUdUi1dGpRjp07GAv2logi5EPhpQNL2kiTXyiWnkLBxfDtrkZhK+De6E4nCyPyPFh/MCdINyAzrDUY6X+Kxm/qtxC/8ZaloG+CsgYswg0u+l3FaQryZp9TsnrYvbrdaCm3sfZV/wn0Xa77MrZoCyf0qw6Sopq/nehaKv4tYdVDIEZK25NFMaT0VvJQD8togUlGNnszltwvCSaLaqSJne4arG36P1ZRY8BU+M7HNcLYfgTMv8V1O0P3h5msW5c2cLPKPzsmvN53NVkjM9fNZrwbDnrtpe817DXbc3uM1iIA2r7SkbsFApPgMWluCp0+qblu0FIg5PbOXpaINSC1TKec/m1+fdkplurdE2FlcsgN5LDZ0ObFa2HrF/ykDXAEpeu08PmZRWwWihnVs Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id uz28-20020a170907119c00b00a384f559179si3314481ejb.399.2024.02.11.16.04.37; Sun, 11 Feb 2024 16:04:37 -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=qEJLHiNp; 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 45DDB68D139; Mon, 12 Feb 2024 02:03:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn2106.outbound.protection.outlook.com [40.92.48.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A008768D1ED for ; Mon, 12 Feb 2024 02:03:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e3vXmm0Tu/lnLFYXOmN5AlDgWhLx+WDwo/fYwoU3T/SBASRuKgo2ONdhH3HlkfAKNCm1xuDTMoHT7Pokf/ZGntIOZyUVHbkEFw+0DxJyTv801WoJ6cAgQmnBEq+MF6qmL8F65z8F4SfbQESWogICthbol8kvUNCS6HBJgbxgTB8uWHn8aH7MuxvxKIyQcZ87hn9PqQPN85rAJGyJIerM9xk64bKn4Pc9cn6kKQ0a8akaPmE2+bQznp24lulO0s/4Bovy8tWBx+oH7IT/Fr5oUCrpq3+B7iBJ21r8/TuidwX9tCQP18ss8VkWUDN2iiydWRSEfiL2fti1C4OAuo6dnA== 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=ed8YwzMHW2mwaG1sEMFkIH5xCOrurDXPDmoUO15mHcI=; b=ia+b5felHPv4kfRaoXlq7Sw6qRofHyJzdkJA5YKkc3QnWdVmdN0JRIsRpSowRimEzVxZti7bZtdbi8uSCVlsWePPWTtiXtkJr9Gu9HQ3vJ2uQ237e4t6zyJAN7CVtCP955rA/6LAxSFXs9+dMXyiSJQiBmc9YmuMiJuBsQ15+lK41fn+xlGZTzgJxZkODD/xDONwqAp1C+fEF8yYBVoBvZZKlmbUeAjDATyfDP6W/J+elWFIivBVzFUcvddUuXuUZZkOQ4YnQVBt6uq6YZeED1MqZqn1QsTeoVMa8NZibxgbOHEIs46fCf+9IelK7IUfATmU3znrpiF5DNf95eZ6bA== 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=ed8YwzMHW2mwaG1sEMFkIH5xCOrurDXPDmoUO15mHcI=; b=qEJLHiNplBymZWNa0lHN7r0thCdN8nSEOZ/5AprHXTe1kJ2DQOpxbgDipcxWvXDwdGYQcLrWGlWKqgeoGWRcBYWB9TFHuszqI/7ts2fsenUkIRa9UjBbQzvgX9OpJecY/FeZdb3H/IHnvw/YypAl5qmkymvYaPCoLAG1spSeW2AqUAPZKeG08GBJU0lXHevyqiLDFtUp19ZhihiRAysUtZRL2+RY7jKodTkFmTBVHK9WN6bSDkXb+KmhFGYJ7xJnIFNGViEbFfW/dh7H4SKXfoXwOBU3CA/PRuPY/oh9nTg5QqtsxEv6Nw/6ubt4oAhc0yVkZtRjqtRuGcjCIeUPlg== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by AS8P250MB0072.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:374::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.33; Mon, 12 Feb 2024 00:03:06 +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:03:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 01:03:33 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [1WfbckYZNiL2xrI2kmQtkz00f+oUhkSW] 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-20-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|AS8P250MB0072:EE_ X-MS-Office365-Filtering-Correlation-Id: e7c30343-d061-4103-c664-08dc2b5dfd49 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqwZHg0HfSFdl5Zlrnc8YAZ/hXIzXv47qP7/JaOlNiD3qEwQaUzyLAkaAIUaJsMqfm8yBcqROnorWF6YfXQwwRlXqWU7ESqZlqzUGOrQqgmJTEwPw721HlEJstv9XdXTKmpLREDlkivdZ2dZZbxxyLVoZ8zPXSzFR9bz6XtBOjLaoBIdmjVJH+FHXTua0HI5/HphvewDA0aSB3nphRjyIUxglWFrOKzi/Uc9N79i4PMILip6sIR1tF5t+HPoklrDtwAQdpAHrgdlCvZCbjpswIhtPbQ0VTgX82uACwjlRmhfjXyJk53UxjSkXR6WgbhdZ2miIonI2DAquSUW3pcpcqcb7cNthPhEsfGgotoY3nus4VYPJZ4STSSQoiJRE+MXUvF7r6/i5hCx63WpNiFEup+pBb2hUT5eFE4b3T21ziegZyWehnfyTEdxemoIRCVexyPWrlJWYkr/Uy/PWOQfgAQSnIRjQYXcTW1Re7Jb5u4e9tPO65zXbWWQ2dxZXPrcgeztIzwtGcUxzUH4/02B9j4UMz6w0zUt7s7mbqVuAhhWAhExbaH2xsbJtDKOLosawPEIJHczPaCpTDAeT7fyowwO7lHvBmsv/m7j4S2StaYBolGjjrN9S2ejbCKubVTNmYsdrOJeWSeOYNXJV1rbQRluuq/U5nWa/rEvvTNyCDDp2H0PxX6DpK6qHvm4X3hZlK48NGI9ysHiyMtKbPX86Sp+mYf47fBSB9FYUlhIAe9MZFoDx0zr/Hokqb/o7uw7kk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RBIASC/vyn+QE37Nb3OPBdWZFxQdMaHT5Wl7/92+CVK3TcegF/d3VjTnl7C8VvoVGRKafUaRygMmbTROF7/VifwXt9b97krIQefTdtBcfGIaumnlHEd2irRvrPO2FWLSvQLqIY/XZEfNMoP4gOUTEpb2UNAHyULyiJi6gz7PeeKxJ8lxlS9/VOQiMYn5Pc6OuVffz6FS5TroI0N7nMVuHqw18OMzNCC72ix+k2Ma/ImtuopPwuo0pje65pk4IdL2pEYzaLtvtq7qmBZIP72cWopwthFjedkh0LgK3XlzLGW1NRG7lsDu/JHqvGBV4aFbsrYGlCsb8bHfuf1sfhNhnhNm36lKQtwUqmzrQ4FxbOxItCmhBnGCMlLW3o6PRmRATdOxGKDcvr7WhrL2Mtz4ew/u7w2bLcVSyx1++N9zYyzv1/1+qBaSYyqLXffXhR/7cj1/ol12Q5Bn5CmXHkdykHNE7t8aCGVvCyGff4SU9olWvRBjsXqBErwdcPnQcWiFRLDXRHlaDyohZP8RqOmcO4BlxrqQbDbta/LZzFWwwtIdXJqjeRHO/AYzsO2jcls5OUuHFTSND2JgoJr+ySojf67gX1dvTfM2oAmI1oEzRUZvlmjS1MBqu4WPmqLjqkR3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ut2bcL/+fNu+5q2ffLm9IaGUNZPOryJhH9Kxssl6VnfJSN7CN6MVSBdPqhoKMjk9uYiTHQnu8VVqLGnHu85z/hAvTQQBaBEoDu/oMjtuX/MUag7ML0lpD5q60ti0r/7ouzKC27+Q56ZUu83AKDwTUnDo3jgax6Ct0swNs7Axs7kDR6ac3Da3coYT2jKVa/Ya/5831di18bxCbYIrcqnJOfMn8LZeS9VABIscZlI1m5Nh1vkFHGpiiCe+BIosefWp4ZCy2JYd5nKyfz1SSOS8TS4AuAoYAgClSmPmCEEXcSGOy8cnMmKdnzKtnaPx4BVRekiYQPSKA5XvrYm2xs87GXGTVgVGGVDXBJ+e1QF3YTWsXZ5YLnxqzCxTdST2hm7b+37fQ6vhqSjQqYVDnBcZCFgHqKpzqKk+Z3vsbZsEZW6LuUS7QZSNp+Z/wFmw8PhbIdgJGB7zcvlPMICQ/U8jZMF0i9L0deVmhdDhVA69KC8kSWqq1jjj5igsGG5zpBUy15MmS6/otLUpJOOKIoyfHc+vUIxkIEtEch/TWsIzovnGMi8WWjT3i8ScanKGSC5vjxNFfKrYlrj0CHN9dolww+EuCom7KSa1kmlHcQz3RROgELCMCJ2rLvAmRHqGVmyxVxMgkteVYVcmrsXjwIaQTUwOJFAfcwujUsCesexIE1oOmIhwGtPfl9TvpdNtmFys3LgwWMnnxlzULNv30dhrRPTGCF0waCYlXaGQAa88K2xwrX8YHTCvUulHp70qu0bKXYxbcAIkYsqSRVunB4zBUW2jsQ4i1f5Lh73IV6odXYmDIX/t1yqfRX4Jrq1MLt71mOfvxhWXY7qCH14SeGDyfZL13thdXQyG0uKrNDZws1yUtjamzwEbE1VbEa4RruoTec0DUnrUlvy4TPR1MUlFj4+Iod0SFUE2oP+yEXlvrolyntHF3sts4pbiZec2ieMdPelI/WklVGN8DE9MwEjd0w0DoEDat1hDW4TJHm36WiXDC7MZ2nDUxpDwOigHAk+vVYMlGSBoxvxHfqdJxIYFd08wfiG9N6rUZiHlee2HEx85YOb1YvsgtTTDg0FzTPY8UCBBGcQs+n6/1AOrzMJkXPPCe5yfxWgyK/8HRVHmMkrPAofdSoabKqJe+kN6hhSdB4ceVU38j4FFCIFGjSTnw1yDqCuOoD7MLFnfQRUoeCZIX2h1T/YUTl9o5RInVt8fAJr5rX22ToqTgIEBmwpXpuZHEATYc1WbV3p3ZDoyBpFgFpAUtTBiDe4QLmNM6qprZdTHVGF6o76Ev1uUqh/C1Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7c30343-d061-4103-c664-08dc2b5dfd49 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:03:06.2835 (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: AS8P250MB0072 Subject: [FFmpeg-devel] [PATCH 21/23] avutil/hwcontext_cuda: Don't use AVHWFramesInternal.priv 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: OiYAD81Zdcm3 Use AVHWFramesContext.hwctx instead. This simplifies accesses to VDPAUFramesContext as one no longer has to go through AVHWFramesInternal. Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext_cuda.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c index 0312d3b9d7..1c61b36d69 100644 --- a/libavutil/hwcontext_cuda.c +++ b/libavutil/hwcontext_cuda.c @@ -130,7 +130,7 @@ static int cuda_frames_init(AVHWFramesContext *ctx) { AVHWDeviceContext *device_ctx = ctx->device_ctx; AVCUDADeviceContext *hwctx = device_ctx->hwctx; - CUDAFramesContext *priv = ctx->internal->priv; + CUDAFramesContext *priv = ctx->hwctx; CudaFunctions *cu = hwctx->internal->cuda_dl; int err, i; @@ -175,7 +175,7 @@ static int cuda_frames_init(AVHWFramesContext *ctx) static int cuda_get_buffer(AVHWFramesContext *ctx, AVFrame *frame) { - CUDAFramesContext *priv = ctx->internal->priv; + CUDAFramesContext *priv = ctx->hwctx; int res; frame->buf[0] = av_buffer_pool_get(ctx->pool); @@ -223,7 +223,7 @@ static int cuda_transfer_get_formats(AVHWFramesContext *ctx, static int cuda_transfer_data(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame *src) { - CUDAFramesContext *priv = ctx->internal->priv; + CUDAFramesContext *priv = ctx->hwctx; AVHWDeviceContext *device_ctx = ctx->device_ctx; AVCUDADeviceContext *hwctx = device_ctx->hwctx; CudaFunctions *cu = hwctx->internal->cuda_dl; @@ -563,7 +563,7 @@ const HWContextType ff_hwcontext_type_cuda = { .name = "CUDA", .device_hwctx_size = sizeof(AVCUDADeviceContext), - .frames_priv_size = sizeof(CUDAFramesContext), + .frames_hwctx_size = sizeof(CUDAFramesContext), .device_create = cuda_device_create, .device_derive = cuda_device_derive,