From patchwork Mon Feb 12 00:03:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46201 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp402274pzc; Sun, 11 Feb 2024 16:02:55 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV7OTskxm+znzvODslnw+sEnIAb8X8B2eiBw0+C86UaGDqXHPqDjEqU9neqUTteAkXJGozNT7zjrCg2N0xzf2X5mkXJbaQ8AjIUZQ== X-Google-Smtp-Source: AGHT+IGLF2CNvjkBkOE5RXvN38m39HGr9ZJaYeJNVEZSfJEE/ad8B/lNu4JGX1zUj0uewBU0KRdu X-Received: by 2002:a05:6402:28c9:b0:560:5c7b:ba5 with SMTP id ef9-20020a05640228c900b005605c7b0ba5mr7168030edb.19.1707696175095; Sun, 11 Feb 2024 16:02:55 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVFfg1NlHuKfp2Af0esu7JbMHP1fafhfGcTQEwf3ivm1hLdfnnQpaa5oQ9swOm3rluDd+g4ZA2Vwr2SOaUMHRldYzRoh2BLoQ55o3NpzIvnMV+SNm6IllHLAu2tB2bxfk6MuXDlZh8JM34f3egPh4kfewGI9xDwE78ZMM5HQex1adbcc6iGJSOvcRGRqZEvVRUutyKQ5otKn6Cew3SSgNz+0dOhXZOhAdJaB54HXJ1j+oY9laukwyllYmsnnEAFDqRW/cIYvF6gbBGeoOgOC/Iy0Xt38DoEgHOi/SyKdFU2NouhlgyprszRaHEvrfRxjFYUHtWBnrbXYtwykC8O+WyRWKC4SxVWrpZ6mu+k5v7A/N3Fs5jkA9fN+5MkOnkfod/DyIk7Zie0xx6urpJjwaIKYojZ3qbmCX+5+spy4LYRXJUfirc4fbvqkiMqT+c1nQ0Y1q5oZ/GGTPVb/CI9Zu1Nv2KRMBQ1N7Q5U5cpFABRo5izI/gQmQ7rvjT76PZ33W6nywsh8QWme2td/R96g3EISzO4gRF4fCuT29Ym2F/CvpTPN0ro8Edj/oV3eWf/LLhg8fnd58l5H3ZDRVAX7wmcPiJjiC3oM6nVkb8FXu0YsjRmqgFOnu8lAGO+TuocxicBZ1N+8o8biW5qBoJt9gO1zHKuJuA8Tclrvinm8r2sLZJ0YfYNtC6G8t1Irqcj5+Z4ZRyccBkm/w+2ymOG+IFmvd1ddd6e8qO1t60ceNRzbq+qzIGgKzGMj1A00eJcKUNgfkJFSWRmJvXHtKyDl6vnwnXpIXZ6Jd+QULmE98sUCl4eQbtOiLdbq5xoIowBSuxoG5EJyVkndaeGutbqxZNlmEnZJ0cKj6SYaPiAwPkv0FaxZ0xyjbi6Jz8kE3IfVnoWWzc8UuO6SY5yZCrWtvsVaRJTbcgncQnEiTVwLtbySBrhXZiKMkwF/PLhVr375GfcF+ WFP8Rvb2So+OiXOlPl0q7Zo+zDgvr4QMlCyD48eyUXdHSCZ8iugg5pg0ICFqjEXV8/bwUaTB55/r3oy5d/UG+VztdFB2vKovCw3biDAeXxEm2xUP2fQafgm/ojKst0Cy0fNOobaPkVYGoim/GiE5dSRD9Y0HJ2AXSqYD9Ff3fou78if7FezuT/vO8eagLibDTsvlqJ01a+RqaccpeE02vwY1gi4sj5TSTLCf7tVBgRFdTuH6YYSy3z7VI/I3/exVAcUurUDa7ohC+NgdE/7jRIJIFq8OXrUku20m0Vc6lbpPr7+m70/75c8ITU6Wi7hMCcWNnwoHM8v94lqWtZKtMvotlbi1yunoprVCdxKkXP2bhKOEz1ikVD4f+r1pDYm15OrgqqilRjMDQO8MDRAYllQyWFO7KwbJ/klgwoEvDNCjjnneDGhKMlx7v6XMmxJq/oSqdO7LG4UQJCTujQP1CDV9jMokh97i+xlXAysXs3F0O2/2arWOROkNhnqh/OXOS8RE/iZmLlsLKj212DV3HbMsV2Q2my2doXgalxR3Ueolqa0hEd8Qgb9kjXVjAZKMwf/3xBfGsR5NRWMbFKZ7EbnN2Xnjiup/6TP5xTVlHBA1uOejDSVLW932hqm15PZ4O4 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b8-20020aa7c908000000b00561280dbb8asi2155536edt.289.2024.02.11.16.02.54; Sun, 11 Feb 2024 16:02:55 -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=ZGlPQ5Xh; 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 C0F5168D169; Mon, 12 Feb 2024 02:02:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2059.outbound.protection.outlook.com [40.92.59.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D19B368D130 for ; Mon, 12 Feb 2024 02:02:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=coHBpeRKJmbezeort152ICcxHYrBgFuH2iVaDCS0nbbXwtk3PesXZgAe7QH3QLAOo7803OWcVm6ulk+QgVE3aaaNYIw0QNyr8FWIS29VBaI/t/u6WG66QCM+d00/tHJegSXxn/vwOIQeLebqxoKpVb6qBQEgGHjO2CEaW818tv33JZOAVyhaprVgRLNK7vXIM2Sg0rky5LIo5wZZ9pF3EsQ3di6wCuRWwiRhX9RraSDygHM0UyLH1FvOC+emSTuFKiO13uO/nDcM8eOHeRBLWVmKBXR5Xbz1Hhl6xP5F2MukMOB2KCGXC5GNMjzdvsaClAC6+9Zt/jOjaijDQI+XmQ== 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=Jh7+2wd8ZDs5dZx3wUe7LS2S0jvsjAvorhgJUZ2ANac=; b=jQ3/7YmZEa5SOTssriFjpW+Pznq8g0NpwSqcgigGS+X83bYR5wSKt7L660NP9XhPjMIHO+egutdj8x/Ka+tvm7yCZ0FgXbS/p+b1Z6GSOso2Huu/aveWwI1j7r0ifk3a1u2Dx3xCZuwUkTF8YOmMTkMazcqle6vOfnMb9moLOZGb98yEfrXIr+c4Uf3I6nJZiJzMFJdqM48ANLJbdns32Dre5HOsIzJEWhOcSOLZynVXoUvnz5GKCZfegb4wu2pT4JsvgMM4qzN6XATjWEXyj9WMb0/gcD9KUO5t8Hrj7wnk7eM1cFub0z5iXtWsyUrJzIoTZc9oAlLGnyh04PpSsw== 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=Jh7+2wd8ZDs5dZx3wUe7LS2S0jvsjAvorhgJUZ2ANac=; b=ZGlPQ5XhLXVvESrbUxDoTGBPlcUkACURLLebM5irrbIClFxzZF/PGS9h/BePjRY2k1+JdLIEFc3oPQjLnsp1PmK7bapkMPTMpgeMCzn46KJjeylggEuLQVgVx5lwieuFNm0x/wOL0aMLeRIaBdrBYFAGfybD1QZqeWqo1L4udB7ozjWs2dfSmVHkOHMQ4GQ3AETsDKwpaQJu9mSL/yNM3B1dh6AxTVa4h0naQAmYOgjobVlHAgOZU6lYePTKdmo/rjc9sVlOPIeq2U63bMBkWe0n4zova/JPKzkq6/+P6Y0unH82Zj6uEwlTewyJN00AGHA73EFy4d+iyDXfnbXCxg== 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:34 +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:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 01:03:21 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [JXEIiIZl51WRbK1fZoj2YPfzODBBX/muG9e3dpx5+9s=] 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-8-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: 2a615317-684d-4461-ac27-08dc2b5dea5c X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqwZHg0HfSFdl5Zlrnc8YAZkxqMYEXwih1EpybtniBlX4mT9oezuAz3boa/4plBQXmmZyqnxLHzpvt88hSfVFd1ojmqelRJBlUdauiGmbHrzBksqITm3OBlHg0EmlMY/Glh72p4GqtxUyQOunWxcWyq/mzCHtcRgiwEjTkITErxvot6CsAhrNfKkCRPO6gTTKUgHEV7OTfqxqb+W2yhv4ld/GGBBR3Yzhp7R9jLniegOaN8ekVvuvjSFUsKUQPdupJS0540tdCWFMetJNjz90O6Szzf6nWMVQxE5yZmBOlOInOf58//ektwiJaWEmcjIGW11WcJ+l0rbYViM5Dlxswaid2EMbwL7R6L33/g+cY3O1IBnZfRq1JJ9QYuh3B3Mc8e6vyMrYnVA7aZIUhDa6UdOJhSDMryLPos3WxsDd/8jjlNeF2Ig6XaK3GODlItYXumRRVr87nFvueUJqaWMj8E6Zk2x0582q8B3OK0ctjnQs1hVjDA//wNIVKt6mHr9lnJgClK94Mippjbq7N+FWmNU6f3dRk8VIAgExmte8RYOEIoK5+Gu4mNSIDETAMv3J4MWP1VHWZqCLQ3wEVUFIyXklOc1bSik/qtz2PNMEjHLBfpBAG3G5HYFElGQplHv4ZEg1qI4WQhH5edydT+jn4O2nym6n/Yp5VF01l7jHS+Z1Hc+CKA6N60W5yN3u7vLlDou+m/0mGt+UXMT8D30ucX114oYt6wmw1R6TM1lUYyhMEjC/BcoXjTK0Jrtz2N4p8= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZE17XCbrKkBBv9lpnKJL+izi2aV866HvXNC6qvQNKZr8Z7lwwYrSj39JEP9dZ3KniLlmzvai2IHShnKyXyao4LfJ6LqCkLEL3C5rF5dV05Sx7DinC2ulBzqSTu7Cl6mWvI5ShNw2SrF8u2Fq6ZCJ3a3RgV8PFiTk/5/ldVgiwPl2Ez/fpOGQ6aMSjPc9gJVf9J/cW6Cy7TKGL5WnyQyIgMEMXlTbGLuZIirJVxQ7KhUxVrr0DRCj3fybHMnU5nrtxaVqSnsMSSLfSyTzp9hk2jKyGHQdcfCUT7XlfrmgpBEAAqDaU8zEwmiNX7yuUcaHoEQuaH3TVpWmOPe6nCBbdnSIGMt75n0hI5EKLctrC0t5oWsHWSzO+rXrehcapILDbpb/I86PrByqZKbD2bdWnC6DnbVac2g4JBbcm1sZXK38nptQpL//VP8OWuqwGTn2L/lOi9DfeI9eZcuC3vj0Aw3B8CFx+wZzeoFQAnjCrTufxiEqGKSUmY/G3NGYoiDMiFVIFpsZWEuvFh2sQ/oqa/Ykp703dQJ6DqdDCNxsPYid4TyzJX9HmqGMqdwj0VQU69CaPxXIb/OvUaOYRoLK/NNzfxsKN2iPFu2p45OukWMa7eDzL3WvVOcrgGtd8bMf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bonbdQY9MC00886A+2f+GvCDa+RoCFPls2FOZupEOgWpNNwtohVF8xU/LlwPOB1uAPi1ZOk7UweHt/W7NptgwNQrgOFOkcqAQBI0yrmJ4+jNyiHcxuiu/kGoJwvrgvK/B2I9Oi/qpsrL6KRxAjfJHrzrC4ZdUF+YL/qE46xB9zjU5emzRxvHyFExQtG9HC7CuM+o9gMhYl1Dv8ng6Nn0CHmwlNn5KSeobNhntrCSMR7xIyJ9+SS5UzCoEo3Qly8h8Xd3YBg/Etu5TO2aq/9HfbzUgk0H6B8nWvMZVrFkXPwP6UqNa0q7um5hQGOSaO+oVDkpx1IDO0M9nNfK5/d768GVj68FPQJqCAw6H1/MhH5Qb4jYlyY45E0bdUZ8D4SGOrtr0ci9rqi1q361bB0nqRThjcsoyaC554ZlKQoyfHUDnBITx8FI7zZOUbZHOHX1uzXKlRD/4n5NulUf2TcBi/Xczba0WVvxmklxTlTz67TBpaxix1WwIJ/n4cexJKWg6kuN6UzQnmB5urO+toEqmQ2Rs8nTtIBEDyXpzIn6hjfLeKH/R/GoS4MAdG+8R/s6bbPgv8avl7HzkTcVmhl8b8LqC88dowAMQwmiKYAeLVMwioii0jPTjC0JOkCfNmZ1LTXKn4ltMs8qVK1VaaTHhE8TAGzgGIRSBVIkq5L2kOICtgwFmp9ckxZkATFjW3RiA9cotH53vTffbgEzL4o1QdIKI/2+o89VaUOdRLMAJhdp7x7OMYO+fT7HMqPBoj5isrJz8qhkCiOM2RSlhP5adNPg9duG4HS6K4K81rGAAdCw1uA54bV2kvI4/rvL2ZUmVvBOtxtMYzeU55QtDJ8vC89viox3haVVJWojvupK+j77m4Q7THWVEt6t5TmNBNSkSOWyhc+pfsTb8LHPb/PxYAt0i6PDja4RxEYXNSh5DsLHSFgppCn/W0GyJlN+EPMKeidWCopN/leeveg6E7Slf7USwk/0fYoN2Kc+4rsaqfKbOxkyfxnDO2dIFLMbenHCGX8X5KgpBkD/9K3yGty7yzueYWlvQRdIXUUsmUJxWuDE34np6jQ57+96NrgnuO7FgwXkdYaWDi31iC9DbtPO18JWKovIe8W22edLKg36rbsUtO2EdcDhWamFTWZLHG9imaOcFMYL/tEvebi6KgSlkIL9EeGEacb/kBv6W9YevzjqKxLQ/wQlJp6OJYoV4CWQmdwbpbwsFK7hltJqglbNxlwlnPhi4lbqcHBogqUtyTzyPqBWKTz0+dMrIpazWpvj788yAfT9DjgVgBNqhSCNEg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a615317-684d-4461-ac27-08dc2b5dea5c 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:34.5919 (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 09/23] avutil/hwcontext: Remove unused AVHWDeviceInternal.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: uPUx5FeDFlKp It is no longer used by any hwcontext, as they all allocate their private data together with their public data and access it via AVHWDeviceContext.hwctx. Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext.c | 9 --------- libavutil/hwcontext_internal.h | 6 ------ 2 files changed, 15 deletions(-) diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 63fc1a6a22..02e9668c31 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -139,7 +139,6 @@ static void hwdevice_ctx_free(void *opaque, uint8_t *data) av_buffer_unref(&ctx->internal->source_device); av_freep(&ctx->hwctx); - av_freep(&ctx->internal->priv); av_freep(&ctx->internal); av_freep(&ctx); } @@ -168,12 +167,6 @@ AVBufferRef *av_hwdevice_ctx_alloc(enum AVHWDeviceType type) if (!ctx->internal) goto fail; - if (hw_type->device_priv_size) { - ctx->internal->priv = av_mallocz(hw_type->device_priv_size); - if (!ctx->internal->priv) - goto fail; - } - if (hw_type->device_hwctx_size) { ctx->hwctx = av_mallocz(hw_type->device_hwctx_size); if (!ctx->hwctx) @@ -194,8 +187,6 @@ AVBufferRef *av_hwdevice_ctx_alloc(enum AVHWDeviceType type) return buf; fail: - if (ctx->internal) - av_freep(&ctx->internal->priv); av_freep(&ctx->internal); av_freep(&ctx->hwctx); av_freep(&ctx); diff --git a/libavutil/hwcontext_internal.h b/libavutil/hwcontext_internal.h index 4df516ee6a..374c6dde2f 100644 --- a/libavutil/hwcontext_internal.h +++ b/libavutil/hwcontext_internal.h @@ -41,11 +41,6 @@ typedef struct HWContextType { * i.e. AVHWDeviceContext.hwctx */ size_t device_hwctx_size; - /** - * size of the private data, i.e. - * AVHWDeviceInternal.priv - */ - size_t device_priv_size; /** * Size of the hardware-specific device configuration. @@ -102,7 +97,6 @@ typedef struct HWContextType { struct AVHWDeviceInternal { const HWContextType *hw_type; - void *priv; /** * For a derived device, a reference to the original device