From patchwork Wed Jan 31 09:31:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45922 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp2712511pzb; Wed, 31 Jan 2024 01:29:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IFBWXVkUCqcgMYW6tAuwdpl6cQS1Ejmqk/XIjkOZqPpi00Eih0AQWfnpTeKSGPuTdnYhI4u X-Received: by 2002:a17:906:4155:b0:a35:cd66:3e32 with SMTP id l21-20020a170906415500b00a35cd663e32mr676821ejk.35.1706693384173; Wed, 31 Jan 2024 01:29:44 -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 kq8-20020a170906abc800b00a35b2e36aa9si3106957ejb.560.2024.01.31.01.29.43; Wed, 31 Jan 2024 01:29:44 -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=ILTIw8Tz; 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 EE13768D13E; Wed, 31 Jan 2024 11:29:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2097.outbound.protection.outlook.com [40.92.50.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9ED3F68C92E for ; Wed, 31 Jan 2024 11:29:34 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Behzsv9XDCCpqN1m1uXR3legz2G0sSJdkgXvc5MfDTPwbBJsazBdn+Qra6L2z7jrNF3dn4LSHKmpKkbI41q0ArVE8FGEh9RwEeNfZ1Afl78N2sgGlJtvTOLlirs7vi1LbUvF4TWePAjQM0zdJr0h7OJOJQEhg3NP5vDqorVpcEWxgndPZmaF++iKoYDNqvKPDMHrXj1FyR3/iADBj1NP5HDFIq93lWV0O2viFCi7iZR9V3kgEmmug+JXuehYjwKMlzGenBROxBkxQxYBJenICAhvWwlF0Ome43XFX0lZsFi3RVqNC+c+VgvqnrNlqgacpjLRjpUdkMHI+Bornfu7nw== 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=8p9ZwfD1+eKrOnT9jzhwAhGILDYS5yP7n8BfhjvqW1A=; b=Ide7+cngxgj6CYUuvPE5hZktMSN2jgjzFk32aTG84HP0w8J1m9cUtMt997toxO6WWmntqe44fALkUhviVQZUmuVje6u+nErCQfQgm2e/LkB4a0YYFcQOyCLP3RC38Zm42qFDH+z5MXUS7ma4Lsww/RvJcPZu1kKir+voVuHsyDguMTdhU/PxlS4dQktKx3/SChirxgGU/737lqM/fUtkGFMhBp0whklN+bBTQmDsqFyEmNqJMExQNuVU/trnsfBN6LFB18UbBcXu/g83ZZK8hE62BOcms4cR59js5Vh5c4o/8c30d/FvP3ZP2AAlNIf8eHq//vT+dUc5oIOMau+xDw== 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=8p9ZwfD1+eKrOnT9jzhwAhGILDYS5yP7n8BfhjvqW1A=; b=ILTIw8TzmjIYihjjZ2Lr5xVwp7+zKRvNoLt82OA26qzE8qZzuTKyr6LgRFIuES2VVDu+mUPN7FQsS6xohWG0Kbl3RZXOK3YYBl6EYJ5Xumc/N2NJgugpW79hxUkjUpNU6BGgPJwLo+HYobu0Kys8icaea3rvLEeqGIlAJqH6XC5Co8escMrWHbSJO33W4ypincx65OH0uDvQiTz86TBwYdcH76NWOjBD++BProFR16sTTrfTABPIGsKScc7ciI/AE3FAiqtWNrCGLw8X3Ge24w5urG81KA2oDj1lzKHje0Htx+0tOK0eJiCC9Jn+YyZVpABxgOtJK3pkj306jMEDRQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0289.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.24; Wed, 31 Jan 2024 09:29:32 +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, 31 Jan 2024 09:29:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jan 2024 10:31:18 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [qxo/UVAW2+LWC6Sn+mJzpC0JHluS4839p3SSzm0zz/4=] X-ClientProxiedBy: FR3P281CA0025.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::23) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240131093118.749243-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0289:EE_ X-MS-Office365-Filtering-Correlation-Id: 33d2e6c8-ecca-4acc-90de-08dc223f21ca X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicCdh7p5dSsaunIxzpUhwFBOJbQ5dJr2EZHALTy/edbPnq81kgmjzbqtLgFOAucrp5y8WVUF/93xBcpGja42sc66zRfJITBNwZ6OuPx57Nxl3hIaOMydyqnA0fWrmaOyD+85apEKWR5i20S462nhKmcnx0DfMLbPR8a6LvomUDTocQmQx5LsDZmnQqvbLRsj60FZKYxbV7FTkxlk3tCKvI6aAbZ0ZScul2zY86a/YjMpW5d233tjEidSxfR/2i6D44P+wsS+1vJ1m5aZ3CHL1Bq4afKD6k80HjlE13n8X8i2mzrM8iRigEGXgTiUqAJ3gZ5bpTOvaaprpj/LcCDZNJtg8Hla33dqh/iRBn0G0Pvsz14QcPXXfqQV1wjeWRN5NqQ6ZAkBfY3BfPVh7moO3xpsoeexvygL8z8NICUOQ+ghRSXY8vSbX5cXbBGpUD7jpWZPDwSlnESN9JABB5ztmZ2UWwrrQ0luOG4mXAB4tU3PCsQT84t9ysBBSPIqfDR0sjFajsFPZp8AkilnEwk2y7NvUS4GoJTxrABi4g/pfvdmuR2UjCNsEvHX+UPqLnvdFnnXOjWuLsnyeU50svyyLww35Omn7ezF5FtRW3gkYV/rkAVgzZ3uMaunVE/iorGJK5eXQ4bxbOiVj+OJpwwvUt6twVfx6dQNhFW32JHEYTcsUFE0+KuRlcgRFqPafzheUyRojlDWw9UD6xgSFLpRBakjciibFlRyWjjhD8hcmTmw2Q== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /MOcibvVTizty/RzG0aB44n9gzWFH6up8eBRKvtfqD2zH19snnkl8I0o26W3eOO1QrVNxGefrQLN5WOuCyAXcusTdvPSpJbh0QWNjtHKSlXpHZO8p3m5lwwB40wCWSqr11C52qosPWSn91CMezJYAPt94kekd7QjpApk+ylA6r7t8GDCJ0dvy0xKSfGe0d5RX1cedpo3UH6H1Tb1gmMt42Wt4bUFk0VIO/EYHKvZq3aXl1YS0q2bj/axnmy4aotzQAziKTwVodQTDj1jSUxqWfMBpvPkRt/fkyZCwCJZn/KenKfM28GUal73lcoDHpLwdc3JwPr6CAeOhNFlyhScW1UmJG53m4PgZb07DGcN+PTlgOb5gv89cSJkfRMkPEJZhO82PpC1+bY8vaNP8fPoaqeXBt6ZY68YOvZZsLKqqtt/VTxunmoXjV3IpeOz/ysQtrvHcfVDyZT+JDWcvZXLi4b/anKBJQd1qY6k3XdpvEwNWvRHYIMqff/n6z78VXgySikmSCB+SFpkg/wWmKTO+eVBNGBZv461ZFM2+7BTKjlrx81JYil4vHGYEv2UNEkNeOzhc3LUjgSfFCICOrJFcbYG3LP4DdhlvA10Yj+r0zlpLyXHbJjn27lFj4lW3xeM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oHhEHyBDLDdFuFp43AzSTTKUySIM96uUsF/ick1AD/aml7gCxvXj6hyybhXQCglZqEr9trrrGZZlAQSfsFXx79fyLstnFH3pnwwrGGzii/Y/c75yC/YEA7DPNqr5ZmUN9Rg9s7khqIJtil86NmNCZJyfKw68+rzIuDrfOH4pMELdCGr1MORwA0l0w6NOxTuVNCoRO/zdA6YFLPnD3n5NCYU6LKSnCGihq4fDgLvv9oVHELXQqLXl6Y9FuJ11GRiTGMbzTmAzYF7todOOT2FVwzi//w5fPEwijXiu/Oy0oEBq3FwdL+BqE6ZfxetvG1YOgcd2JKsOtnECWdsum5I88tCWwTFu9ZFyGdarJrL/A+JMXioAE153gFjQjnxm2qyIuVvZRj/Z6peV5EfTeqVyu8OIAQep9vfF19CP4ZBaBv+/XAziYG4zSsF/li9DGLdQc5iTnGbHfYOyoHrQYDv4qgCbGH+F6Fdax/83FHswxKdL1I3xaLO1PZQXqKK6EZYC6HDdJ2lVNprZnTc+RstibcqOpI9Le7cPTa5v9h5s4RUH50ECZvNMRkIGDvcrY/FMT/uH1lfw79xqrBXhgPHl25cnn6Lc98mmuh76gnoFDELmf/E8XuanA62LJ3Qa907F5mnPv7B1KEEN78tVFKcuVyGfdeFMEFs7pmEjWg3aRs2IOqCSQMXhi1EQwOV/ra5qQ2L7GLpIkRSf6eR22LPT3J5zdcL1TVM/nwkcVU/iMT8j8Upwfe3LUCSmhJBcErI5qZPEHd3k+l7DIKl70eclpZQO7Sd67VegAXUpEV4BGEcRs6nbaZkMVmbs+OwSpQ+10GHnCoGvaLpR6nFhSAB5c4+TKAOKdm1LiLp1bLAcT1e9Lwg8JDa7S8ShUqCUl2coCEgi+mauWSDf8+ImfNhKfgxx9eUxfwtLBIe0bMpORBOtSsj23rveBBPHAVJetZpONy8h8+EIut/u9FrMgHDbMWoogi2dD/bDHz9aebk2K5P1cwhNgCYuTeIDGkLta3C3iZ7NNSnder7suDf0wOSCc1r/N39FHfJ6+kruJooQ8d6jtARvcjF98DDniGTYwrzeJChDC2o4J89VExjZsAh31seHX2vkOGMSClN2vPgDkwtXG3qm3dFncD5vdqxVr5eg5qcH9zLjUFITt08Z4bG7EXpTCH/41tq9VVIRiq9VkbfxiKCDOMK+mFfHeEJnHYuoI3FdLY1XvukUv5U0EocDT0X7Z8RYhlG3Hx80bxi22IK6rCGZeaej6nFQT7Gu+BSD X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33d2e6c8-ecca-4acc-90de-08dc223f21ca X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 09:29:32.7048 (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: PR3P250MB0289 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/vlc: Remove unused macros 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: lZAd970br+6Z Signed-off-by: Andreas Rheinhardt --- 1. This has already been sent months ago, but I didn't apply it because Peter Ross has sent patches that make use of them and I did not want to force him to adapt. 2. I do not rule out that there might be scenarios in the future where creating a static VLC (and not only VLCElem[]) would be useful, but this zoo of macros is nevertheless too much. There should be only two macros: One with symbols (i.e. "sparse") and one without, both having options for flags. libavcodec/vlc.h | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/libavcodec/vlc.h b/libavcodec/vlc.h index 679666801a..0cc106c499 100644 --- a/libavcodec/vlc.h +++ b/libavcodec/vlc.h @@ -185,47 +185,6 @@ void ff_vlc_free(VLC *vlc); #define VLC_INIT_OUTPUT_LE 8 #define VLC_INIT_LE (VLC_INIT_INPUT_LE | VLC_INIT_OUTPUT_LE) -#define VLC_INIT_CUSTOM_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, \ - h, i, j, flags, static_size) \ - do { \ - static VLCElem table[static_size]; \ - (vlc)->table = table; \ - (vlc)->table_allocated = static_size; \ - ff_vlc_init_sparse(vlc, bits, a, b, c, d, e, f, g, h, i, j, \ - flags | VLC_INIT_USE_STATIC); \ - } while (0) - -#define VLC_INIT_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, h, i, j, static_size) \ - VLC_INIT_CUSTOM_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, \ - h, i, j, 0, static_size) - -#define VLC_INIT_LE_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, h, i, j, static_size) \ - VLC_INIT_CUSTOM_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, \ - h, i, j, VLC_INIT_LE, static_size) - -#define VLC_INIT_CUSTOM_STATIC(vlc, bits, a, b, c, d, e, f, g, flags, static_size) \ - VLC_INIT_CUSTOM_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, \ - NULL, 0, 0, flags, static_size) - -#define VLC_INIT_STATIC(vlc, bits, a, b, c, d, e, f, g, static_size) \ - VLC_INIT_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, NULL, 0, 0, static_size) - -#define VLC_INIT_LE_STATIC(vlc, bits, a, b, c, d, e, f, g, static_size) \ - VLC_INIT_LE_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, NULL, 0, 0, static_size) - -#define VLC_INIT_STATIC_FROM_LENGTHS(vlc, bits, nb_codes, lens, len_wrap, \ - symbols, symbols_wrap, symbols_size, \ - offset, flags, static_size) \ - do { \ - static VLCElem table[static_size]; \ - (vlc)->table = table; \ - (vlc)->table_allocated = static_size; \ - ff_vlc_init_from_lengths(vlc, bits, nb_codes, lens, len_wrap, \ - symbols, symbols_wrap, symbols_size, \ - offset, flags | VLC_INIT_USE_STATIC, \ - NULL); \ - } while (0) - /** * For static VLCs, the number of bits can often be hardcoded * at each get_vlc2() callsite. Then using a full VLC would be uneconomical,