From patchwork Mon Feb 12 00:03:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46211 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp402940pzc; Sun, 11 Feb 2024 16:04:28 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXDHWTknnk/fSQi+MqCHlWyOfPYL2yt3Rh4U5EZYbc7O9GJfcKDW2VTG6XPnLVUeyd+7mZRbcFoLWwGXOgQEKsP7bRT1Xlz2DRPlQ== X-Google-Smtp-Source: AGHT+IHBerpcB9QCsPKnzlEZa42UgNSSPkAEGb1wQ3qBVGx88nojq/u7yyxNyDeLz+ElJnSYMQic X-Received: by 2002:a05:6402:28c9:b0:560:5c7b:ba5 with SMTP id ef9-20020a05640228c900b005605c7b0ba5mr7170404edb.19.1707696268712; Sun, 11 Feb 2024 16:04:28 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX5S3oycq4JGcF1QVAoBmeNcaa6AG5FTXliJ3aGFGggkw6BAj+OolMp5GLR/ppr4ScbXDPPbWwMV25tAlgpnsr77pPCGX1WLOpqSgePqosTjmwq8si41s24WZ+34JIUzU/UenT4DD1GEfOrvmAMmLTrXyUyG7NEEKFA574GXPZupGUg1rkpm6g9dWCxtYkquoCTUp7c4ldGY2zGLHdcXEtds5DhXyhgoqVpMPvY9kfOTYwGW2e2wtw3kjCkMF28ZXBEOv9vcGi7KJZBChYfE3iV8MkNcF+PHfKOlhmXPW9WejOq7oTxySZi3ONEC7zB+NRQNEwfbiO1hupYNHtjaiPnuWiPZvrjRjCb4VBqkF3kb4gXqOwuF+wwDMokxscHGEaG9uBID7N4irqxBkqewe1ljsNtsKh38NsrDP+WsDQJh0tEU+z3HUHGPOG86VhkAdVzBHCLbg8GWVA5Jv+Bp/h9cJJXh/KkM0wmrF2PHq9txSFE/R6u5rsqJDXcPXKILuqtcY/xfcq475rpBo36OYwx9k1VrGKCw6kmNeadYKQBN4b895ARxfz9bHIfgW0SqDHccTHzZZ9zN6dvZgG3nFrRPM8FSwsl9fetqCHVKkfkS+O8PVtrjpOF4NwWtysLXKlieORkN0HpCxkYvHbKC1X8JoIyr4uqMWlJ57VFn/dloWaXuFuTFS/0a4QiYjdjknOo7MBuhj9C59Tp59V7n1itcIqknEuhy3Ypsr7gWNqKOe9p2tckqtJlJo9k5qgXuoxKGniyAS+VGntaSTbheuRmXq5miD5R90hGG8rWlEvLNm+4AE/5mvR0YpoI02kfilQgUFXWWQ6UBnpbpMTpoIKmf/XIRKq/ZkdpCZfVBVJwdlqG0e4OGJlklz2Adu7JLlSdp/pfYzvq9MS5BhSnTmITKmupJoTUMQa6fdUbcA9cmoJP+HfxJFT8hM2Qh6GUWN93Mm 61Z4o5xzBWqgppSneZMbsDsBSURkwXurZZXQDbepQYReNFqNxz7ZtTSqIzj8kIwYae7l7HPsQaJgMIF8ifO88Vu8cZYl+7HhBlW7I7gKBmBRc45UwmN9k52RRSzOzcBLN4ourw1ueywFnO51/X49+31qIYOtQ+Xzh4mKZlLov4rLyJQONFzgKM5bcS4PNmNw/jOUc3t1XxmvvHjgvMmT0anMfUOs9ddyDJb9OqQyhfZgKnW+PDD0SpH94iEvXWLlenNkdA0iA2nfQnhcnShWJDUM6HVbIkkrR28B6YWORMa71JY0gENi6xU8a4TeAWhWj0yb2x5g6o3Ra/mANI1qU/tFZHW7sZOy/ARf0LLVA/2VTJ/8rSsNtFlmRvo5vmOYYhliP91G1JUk3tpoKnf5uQzf2A1KJ38QnI9cCOuhIUswWrXb91JbzwuKnTamIdGfRzm5owniT/0mBgAySRjH29wWSDQH06FkofDJXwKh63j2lcYA9jX89VX392U+Rwuoxm7ThdGWV3er1QCiroHlSZVU2XziWnekhph5meYxIvGCUWY/q+xocdD2FwdmYvROnIU70iZK32RBu/te8PRmu8WrdNWvyfAAzYpHHhrBvRqAK4a1FpS7ZPZasmpyNlRW7y Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l6-20020aa7c3c6000000b00560a6810a7csi2283238edr.274.2024.02.11.16.04.28; Sun, 11 Feb 2024 16:04:28 -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=S4vitqDs; 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 34A5F68D1F0; Mon, 12 Feb 2024 02:03:07 +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-vi1eur02olkn2041.outbound.protection.outlook.com [40.92.48.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FFED68D1E6 for ; Mon, 12 Feb 2024 02:03:05 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KDlrS+fW0asZ7grvLDJD4fpTXatGRwDu+ot8kznc9y1YyztXxzUpxKKan8Jt3H5DaimD3sDWw4uxLP9kOYFIthXMhY8ZQLsXrH9y9QIPEuyLJmGubG0r9JuvPX4c/Awp7w6hoWukpwRfCste1NxfqQlfoah71jposfz8R9i5XBgx/0uA2c4fl6bAQ2CzfIM3gHR9h6etSgoIUe0/KTJzkjtMl6+ra3Mf51ez8+jjrXjTsGsFfIxm8yPY6KyYc4rna+HKhlF4GcbjbQDKhvPrk82jC/rxavcn/myMPUHf2OqLk3W6x6IRnmR4zLL8cYYqlW/uz2rNuAVa/zw4MEoI2w== 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=rSDbADQ+x4Ua6AjR1K6U5XS8wt1fzbsEsysjxs06Fzs=; b=NgoVy7QGzI5rZg5lWGMCeud4Kp1xEQ9GHVux8CUofHudug4GY0PN7SCOAfKUTjLvZMLWmgjRhXh8bTWhBrodaFcB/FtRfc+nJDgNG6jK89akOkrIpjiVS+mzBHfRtUK9acr0+6d+ZUy2lPwVprlQP9uK7dN5vwMGAruWnVN7cJQNv7HYAhJWRNQE2Ejr5DxiESFilZSHlIxygF1qFZeuQgh61/dJUbiqNfhgF4h4JX0nSsaqzQBCpV4qkk12h+lTjy9hO+eBGyw1GsjAIUfwyeA1B7dm1eCeWksBdr8aUl8yR50c59ktsyonxb+PuvMJyeYe3nZxUJfpRSG4gGNlXw== 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=rSDbADQ+x4Ua6AjR1K6U5XS8wt1fzbsEsysjxs06Fzs=; b=S4vitqDsTf+h82lBQFQ8HzmCdwPHu+SowQoPs8HSqvUXjPiSRbPVGRm4skfNDc6Ax8/WP6zJ6CYvoeHdz2I3T1syQiCsB8dPoCo2E+SzeiUMNjWrjFg1JP147hqHhodAXKLpzgv1adeAuUio0QtdF6wmg8INKC20XwOskiUa+CQo3peYVQds0PuDeu6aCgLCUISHzCw8ODCgvBY/Sk8s0KE0d0M2sAtL7xVE3q5UObbnzFQl1O2i6tX9nb9YsOA5UgpgcEFB//DqpkRFbU3/Yn2NKxUtsKpTgj5T7qFmh54u4apkcEoR6n5ex4F/VCAPT1eGq0vdQCBJbGkOzP6bxw== 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:04 +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:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 01:03:32 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ShE8ZOlJfG53klv7Qf9vR6jOa8BdDtWY] 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-19-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: 2632451d-460d-45c9-cd6f-08dc2b5dfc07 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqwZHg0HfSFdl5Zlrnc8YAZ/hXIzXv47qP7/JaOlNiD3qEwQaUzyLAkaAIUaJsMqfm8yBcqROnorWF6YfXQwwRlXqWU7ESqZlrvUQ83qNj5hrqGw7W/CTCAplTbGHz5h1wl6oH5Ciq1vFUhlvs2vy2k19aVT5MmLj6RCmE0gcc+xAi+iYAEi3t+C/8EBY2PmRZD4EYBmkGAaKdfo4jPy1DGAu+DyY8uL+LG84nvk8IJimzZTXRzAU8wvtoSPRHfA2zzzriFxRGMICqyFRXHrRsYSqolbWKXlTMfnQRHiR3IoZkfVDjZNLg19wOojSr7x3hgwgGPnGwSNgXwkeNgscwNtqQhaszT2iKiJbM4FQcGGvAhuem+Dl+k0NW3Jah8pEmsYygd/UQ+66J8UFx7jUgwl9P9mnZpzAyk35WN4csgULhXoNfWmaRsJ0KJ3bd4Qf7v43c6rkTfnHDlf1JRU8js92dBPrvtGP2iiF+4fww44Uk36/sIH2X3c0Jk6K2RPNZRLJJtZGvN7v/tbwCtlVs2kFbvBOQ4+KwA4MqErz3cydseimJ1lFnJrl7i6yOXXCHrtU52jRdAL90la2dzv4AQ2dt4+Cw+SQSUEwhvq3rRNET0DtxPdmT5Fj/N6acGnDV1UUlnbBX8chaBGgn9hYvmD5Nyk6baUKLEvgkpIIDFzxAjtaR3yow+YsXgxVA/5nWykFq6yIVNSx1g07lcRJfaShOnmeqm5p1X5zU8qpQw05QKJSfOf/FKaIbIHcSP6I0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tc05R9bKjZwAOWsLJyv1ffsCIiD1SvjJG2uz1+9eD53vI4OtE8d6zTVjzleD/EE9PtDGv+Anxx4ogKrTRcyQpk2WStWKYYeEnSrqE3xqevNqOxAccpp6tm0+6n/wD5b95LCCV1p6QOkrkhyDBKnW241yMf7QJHGwgQysKbS3bARH0QjmmzF5lhbWn/7FzwoaCXUV4rhlsKMvPfKHBLV9x2t0n15/MDA19GJV9qENzwkYrEI9gfdpObqY0E6e9yZ4tzzNyOIkzGSE7sbbzJhgP+G86vSshHGcCiCtTpyMipGs0Anv8IQOG81pnXEvsm+IXk1sI92ScAcajc2ao1/exqDmpKfgp92KJwlU6szhvL1KYt5KWrpVuiV/mhHDpSfAo26ZTK4hEt3ezOi5dNpIse5UdNuQVkZe8zxK0MZcxtCTSRRZD0xGET58xPBCVo+Ev+B/3x3JPCHFTKiYB5XC39C+uSEMbvLxMxD/kLDxXOCgQJVM+NIiBy4vB7oOTqtmTfV5d6xsIWBrKqz/fcwypq4d3dYQx+b2Hmt/XLSME0p4gjZTmKBa/0H8BKlr6f3vbrjt6RXkEjZm5bGwVynwL6rDou1s3IUMRr1Ui286+51Ye2aS4OWZ/KPv1eW9BNzn X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5PRwwFtgru2Nqdg99y2/MpiltIyiqHokVykUCBDfwY9PSPblXr+u5a67wwiesm18b8HeVY6EYx8+xiUXhO9+hlr3Yn7xCSxUvRPgKtdIs6mJVb1S8S7UUsp/g6/I8n0iUnh3XISAO6XtjapIT40BQbXEeY9qch3Q0Ttzkg0RS9bg7kcqBMBP8zGYY9ub3flTlpp8HJ/9mN/rKr/wIV7HgyWDniI3pS86Ot0bthyCwYQbaWDIVnjDMn6En5DvVN9ELedcPo9JoRh+7+eZwNgRaQnI4BuORyuf9U/aQ1MbWTBTSrerJt94HT5IXVntUeht/CCp/5PHv+DVqnDYB2xHIhQh3IBo8hKu2pHtSl1xsZH8uKXKdyiM6g2vdUCXBnO8issnoqh4GR5Wmb76Bq7A5NBx0096SQ9n0+88p/cpu6j0zBjNOMQPBAOmD7XVF6oksUffKf7lVTLIco5QZqzczaUpc8nZBy3wFFIKm0lebntD9jedUEJmhy1q7LDyvGBcUDezlFjblXj3W7oEAQrqA3S0oxlYtS1BRrtFt1+im/HGsd14xJv5aShXfMOUa0cLkut5sOs60ImzX53pJhOSMSMd5A2IzNTy4Dgn4N62642BLrVqCm1az6XFbu5sIxJqetkSSD/2uwA83WMkcQSD6JDrwAtCJXmHG9w+aI2OGR5YJzfjeoGhhhiW2wCGA0SThAJfqK69vWhfx34ybtq7KRnfP6BmmsLDT6wEEGr3g+gRulrkMi6zvQmSoS1aS5BKADG7gKBoi1jaMcqu3MnKxkwtj7td/ditiXkcOyc4Gwc1MfRVWBiYlvkaiLbziNGFKQqu16VedvJeTiwKAzNaRa0P7jH9Ku0IgbmN8L2jRATGROF8HDaAij/tW6yYF2vIDBZUv+NPhNCwGtJHCtNHPGJFeg7ONkg0dFS5wsWRWOa2k8RSH3JKrmixmAydZkDnO33Z31INXjpqOpOUyN8bLAYJeONZdqaVCHoiQqkND2sjQA69QVxFfbWObuGsQw6jHFoveWmYp7NnTc3BRmHqz5cw11Ep5z9Q875SERz+4ti851qIke2EBbLTo7KmXMzJp2veCt8c222aZSTm9DOpkuGfy5CHjwYEgMzNXe+ea3Y1wec7T+QeoZkgRGkaFtxzD0sa+eAVW7KZtMzHbkA2DEQXgbLr/32VqqX/jTZo3F9MKmxQfddnWoMNsXW/cr2ZlgTfyLWPn3NZBe4rCC/MNRfkTrmM05dFvtzr3m7hTK9xyaSXHQQyO0bNjFcZqBjrJhp7pX7gBKSIcpCQob6sFg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2632451d-460d-45c9-cd6f-08dc2b5dfc07 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:04.1896 (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 20/23] avutil/hwcontext_vdpau: 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: R7DUdoIqnG31 Use AVHWFramesContext.hwctx instead. This simplifies access to VDPAUFramesContext as one no longer has to go through AVHWFramesInternal. Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext_vdpau.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavutil/hwcontext_vdpau.c b/libavutil/hwcontext_vdpau.c index 016300db1e..0a1a33f8b1 100644 --- a/libavutil/hwcontext_vdpau.c +++ b/libavutil/hwcontext_vdpau.c @@ -233,7 +233,7 @@ static void vdpau_buffer_free(void *opaque, uint8_t *data) static AVBufferRef *vdpau_pool_alloc(void *opaque, size_t size) { AVHWFramesContext *ctx = opaque; - VDPAUFramesContext *priv = ctx->internal->priv; + VDPAUFramesContext *priv = ctx->hwctx; VDPAUDeviceContext *device_priv = ctx->device_ctx->hwctx; AVVDPAUDeviceContext *device_hwctx = &device_priv->p; @@ -261,7 +261,7 @@ static AVBufferRef *vdpau_pool_alloc(void *opaque, size_t size) static int vdpau_frames_init(AVHWFramesContext *ctx) { VDPAUDeviceContext *device_priv = ctx->device_ctx->hwctx; - VDPAUFramesContext *priv = ctx->internal->priv; + VDPAUFramesContext *priv = ctx->hwctx; int i; @@ -311,7 +311,7 @@ static int vdpau_transfer_get_formats(AVHWFramesContext *ctx, enum AVHWFrameTransferDirection dir, enum AVPixelFormat **formats) { - VDPAUFramesContext *priv = ctx->internal->priv; + VDPAUFramesContext *priv = ctx->hwctx; enum AVPixelFormat *fmts; @@ -334,7 +334,7 @@ static int vdpau_transfer_get_formats(AVHWFramesContext *ctx, static int vdpau_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame *src) { - VDPAUFramesContext *priv = ctx->internal->priv; + VDPAUFramesContext *priv = ctx->hwctx; VdpVideoSurface surf = (VdpVideoSurface)(uintptr_t)src->data[3]; void *data[3]; @@ -392,7 +392,7 @@ static int vdpau_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, static int vdpau_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame *src) { - VDPAUFramesContext *priv = ctx->internal->priv; + VDPAUFramesContext *priv = ctx->hwctx; VdpVideoSurface surf = (VdpVideoSurface)(uintptr_t)dst->data[3]; const void *data[3]; @@ -514,7 +514,7 @@ const HWContextType ff_hwcontext_type_vdpau = { .name = "VDPAU", .device_hwctx_size = sizeof(VDPAUDeviceContext), - .frames_priv_size = sizeof(VDPAUFramesContext), + .frames_hwctx_size = sizeof(VDPAUFramesContext), #if HAVE_VDPAU_X11 .device_create = vdpau_device_create,