From patchwork Wed Jan 24 19:50:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45799 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp1503320pzf; Wed, 24 Jan 2024 11:49:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IEOa6n46mYfHu/UajBV0GHdvXGC33ats3LPRYswXCbhBsis9jGknqD07rqt0q4i/2/unlaY X-Received: by 2002:a1c:7415:0:b0:40e:47de:d7e1 with SMTP id p21-20020a1c7415000000b0040e47ded7e1mr1407719wmc.73.1706125772663; Wed, 24 Jan 2024 11:49:32 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y13-20020a50e60d000000b00559476ecefdsi10328537edm.650.2024.01.24.11.49.32; Wed, 24 Jan 2024 11:49:32 -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=DH2kBBaG; 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 97A8F68D124; Wed, 24 Jan 2024 21:49:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2092.outbound.protection.outlook.com [40.92.75.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20C7668CB3A for ; Wed, 24 Jan 2024 21:49:23 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aWtABK4BnAGmfZlhQMWRV3OShEpHXX32w8dqJ7vxxKUNP1bpUpxZujCkW57cwSNcMalLK5v6pcVD7tb5UI7ixR/SccSsKY6nJ4rAmH1qIrAcpxPnBY466mzve0G9inqlHmkIRY2Jai1Y8MbBmdijLLdj5X1mJgO7xxztSma0nI6wu7+fQAhc0jrt61+lksTpK15UQ1v+O7X2jOfAijP+6ZlHtmH/mjztJfh6rdLyLkIhr4HOQ6L18ndH7lsf/ZRecui8rMuHdmjxW6qJH3WPKZaAqs/bgqVpnu80vXFAfUFdYHeeDxsDvldOyUyrpBn0dgZvJJ0Um6P7+grRn7ziCA== 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=LfAFVLMMWgyPOzmCZzofkUP4UaMDtN+ODOOFAO139Hk=; b=ZoTJfBBx8eb14SW5lgrEW8zWhGmPfQ7hgMH8+1NbRPWFb9YeqmwFNSaKINR7m7Vedcudqegyr9wxtNA/xD5M0eHnxtd7gQhn7baIcdsXsFWrzK9tcydxhQa8LP/iU7ZKMif88DVuCHEFbs+0fAU7n68enmmo1WVL2lhTGL4RzZGcUfuRD7+AtgrzkWUrTo5t9giC72ij95Etf9PNOtXkW938eB6v4HAqPxGt8HfTbupVOGXeRQIrvnSr9+YzIUEM896qM4QF+h9n8QDwztmOOEcGiPN7VrynNyjnLWniSxZUgpfZSsu0tQAWiTUbMlKWl3j35d4zyyl7BMoC0BuaMQ== 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=LfAFVLMMWgyPOzmCZzofkUP4UaMDtN+ODOOFAO139Hk=; b=DH2kBBaGUNimxgzEUyrnlF+yX6/Ica8lVq8yfHyPKXYiFdzMz55cn+Swz+24R4aNYMDbdeI0x//L9y+/KwdOHq7MxUchDgiRHrzlfHodX4kR1zx87wXvkAN3EPpDEw/lZ2QBxOFPkJzq9CiYuEuCQwfpxV7Ta1bZEDRWXYZX5M5i4ka05kzi2ys7sWh1I97HvQSxySdy2kqYxyTAPhi/VcLO+imkEmILoYQzIQwNGwQHWNVDTkqfUFUJV4Jm78w1XJQ1AsfC7Ya2Lr15tGfUbDaYbOrM0wv9lBqFJaGx4DrNH31Y0xC0JhaLvL54QesjJXQCjs2IZ1NeJeDWlIOjRg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0350.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.37; Wed, 24 Jan 2024 19:49:21 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Wed, 24 Jan 2024 19:49:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 20:50:47 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [ZZF+hdIarzospir48fa67K4A0nV4ITBhgdrUNNzpe9w=] X-ClientProxiedBy: ZR2P278CA0054.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240124195053.558644-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0350:EE_ X-MS-Office365-Filtering-Correlation-Id: d7895ec7-7184-40c6-6052-08dc1d158f1c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k969ntDnYVcN3J+r/8RAq4bgd2By8LUkk9CZKayp00dVA1INeV+7IhWu3WBxOVQq5XlHWooujHwTUuZipZN3eBjtavK7C+CFXgxvQMKrU2BbOBf+KhcTRy56I0wYr0kXVUr8EI4sN/E8LuO5Gg9Pv3b7T6E8xPPJsXok/9c0xh0wWRPbC5nEdBiJzv6iN0bLsQWaOuidBzspUsmYUa616WOOkGDNGBaID/Be0iiWUIPj1DOSeuBaJN3nQqH9Fza8g5hp/dtxPt1pjqcI8103i1T0RQNvN6sgO7M2ArTJX6paTUrpiYigpnBzI2rSPy8xNXWCLFQlADuCwG2WZRhuDNbE8ZaKqOsM057uLeUdwfatExPu1FZsjMe9mkIhSfGQDtEjyzmLcA52oY5olUh4Rg3FAtqFq8uEShUvF0dhsacOsGzzuxXG2grvz+oPOgsxlkTax9XyWPxgB1BPsiNwl4kmjZpQ71XdMjlrFo0RL1Uk4knN6HUjcN+G67KZrvz1KY8CgODvpW2JPgxuH8D05so5hFrmpGdq2gcIcrNLxDXfy0EXJgMfodCMaNc648Ra4hD8JqGvpCypK9+HpoWMwskNh0xDca7TShqC9dR45dHYfrFehw+JtUnuWp8/jWn2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5OQurV8en/uX52EoX440ch8B/l+mCH6Ra/jz5gKN/R0ydCNDy9LGSIZ5HDE7WH5szE/lUwP2XwVzTJdOCVrEUoUQFVRW6+9CAqbPIwK5gl6tKjqKqq547jlXJi2Bq1vyT/cswmuJUCe5hHfGGFf64QPgTFlO4bgbhPValmClFB/KtueWwG01+1be0UJeO8XJQU8R266jaXRnUvPh3nIfTlIsOiGfkBhn/SYNQd5FI6t2NpiEzYSWTkMG/qjoMHfJJeHW0e6K64EHftbW+Pece2l4PNxKXHLl6qaKjbOdgz/kirfKVlqRU+x0FOhSz0SS8nHyt1LiO8Q+SgYtVBpv4dlePTvlTNSrX/erTR7U23RgMjqWpgl6nPWNZqDWtaRPYnIWQ6PsEcVIc/FRuMDVcIbfgPfGMDywuxYb499AJPXCX8sWaaewwsG/EEs8Tten/VMjWSwIiFi9NpRxbGHUoQzhrdCFvEN2OcY2/UEah85GlNHMNWZO+wiS6fzHUUwH4W0Hnrh+a71M5pY4Ys72pEMzpNJebfaIY2n1dSuk0yIX+D4bdA39wvHm6b1lV+RqR0UTmvDu52KZ2a6pX9cTjcSb5w4OrxBi9H+yo72kUyY0mfiv6FVCY68OgPB1rYN3ej6wSbKQvX5bvuNR4mBOG6T6mlVOt19mXBMFHEhhN3RSpYklrdSpUMRj0SDFVWHtgiBWzEiXhYizlUqrxVPTk+WNAzbhcaNTMnBr1jHYZxhTHQ8HMH7Zo6wD5xZwukkA0oeN96BF34dQFWXei0FeuRCN6WfsHm69DcpiaAZNtc3VYN96PmxHYtyDA0L2kByYJFQf+3a0l4i/0LlvXpJGZMm7GA6UQKO4RphiElXcWMnsaCYeePmcw9BZ8/A4ipVHkp+h60foMAFvdsbBRhq+tGwcFmOf4okLGrcg0nfMIVyj0IVvmjr7aBrd0mC2dZp4SemX5tKHDVyKHDeJX3I83dMEtB6+9uLEHuTNZmM4Ri2CeCXUS3eeRxK0Iz90WrFExq+MJqJwNlIoFHVH5khKODZeOxVZWyxia2tA9asgBsGlbXwK3hF7LbcPzkiylwgpVivvgIjKpu7p80G0iuN4l6ipa/vEJoJ/Ps1EtyyOTAQKWuSD3xlVPMRhVZB0PK2hylaYTC6/TmIyr248C8Sx/ADMi6SWFvwQpY+iF+ojB0XIC47rGh18QvYQMT+Q/whzr05CjX6Glt5q7koXlXFgaluxIPTxvF+ole33CAIqJ80jJYF2wKPybgJc3SwY2vTA X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7895ec7-7184-40c6-6052-08dc1d158f1c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2024 19:49:21.4001 (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: DU2P250MB0350 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/dxvenc: Don't cast const away 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: U8/U91WW8h4L Signed-off-by: Andreas Rheinhardt --- libavcodec/dxvenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/dxvenc.c b/libavcodec/dxvenc.c index 3a5b310c9b..10473038cc 100644 --- a/libavcodec/dxvenc.c +++ b/libavcodec/dxvenc.c @@ -56,7 +56,7 @@ static void ht_init(HTEntry *ht) } } -static uint32_t ht_lookup_and_upsert(HTEntry *ht, AVCRC *hash_ctx, +static uint32_t ht_lookup_and_upsert(HTEntry *ht, const AVCRC *hash_ctx, uint32_t key, uint32_t pos) { uint32_t ret = -1; @@ -74,7 +74,7 @@ static uint32_t ht_lookup_and_upsert(HTEntry *ht, AVCRC *hash_ctx, return ret; } -static void ht_delete(HTEntry *ht, AVCRC *hash_ctx, +static void ht_delete(HTEntry *ht, const AVCRC *hash_ctx, uint32_t key, uint32_t pos) { HTEntry *removed_entry = NULL; @@ -124,7 +124,7 @@ typedef struct DXVEncContext { enum DXVTextureFormat tex_fmt; int (*compress_tex)(AVCodecContext *avctx); - AVCRC *crc_ctx; + const AVCRC *crc_ctx; HTEntry color_lookback_ht[LOOKBACK_HT_ELEMS]; HTEntry lut_lookback_ht[LOOKBACK_HT_ELEMS]; @@ -309,7 +309,7 @@ static av_cold int dxv_init(AVCodecContext *avctx) return AVERROR(ENOMEM); } - ctx->crc_ctx = (AVCRC*)av_crc_get_table(AV_CRC_32_IEEE); + ctx->crc_ctx = av_crc_get_table(AV_CRC_32_IEEE); if (!ctx->crc_ctx) { av_log(avctx, AV_LOG_ERROR, "Could not initialize CRC table.\n"); return AVERROR_BUG;