From patchwork Wed Nov 1 08:34:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44459 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288019pzb; Wed, 1 Nov 2023 01:33:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHrwMnlKVuvS2J+SVSbYQ3g6/5ZmieYlmEW0c1CYnaMDUopKT/t0f6eEDq3qvKDkMgSGnbI X-Received: by 2002:a17:906:81b:b0:9ae:5879:78dd with SMTP id e27-20020a170906081b00b009ae587978ddmr1590724ejd.1.1698827634948; Wed, 01 Nov 2023 01:33:54 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qf14-20020a1709077f0e00b009adec4bd976si1280653ejc.375.2023.11.01.01.33.24; Wed, 01 Nov 2023 01:33:54 -0700 (PDT) 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=ppbQSjvI; 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 3717A68CC87; Wed, 1 Nov 2023 10:33:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2015.outbound.protection.outlook.com [40.92.89.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05F8D68CB57 for ; Wed, 1 Nov 2023 10:33:14 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QYORAnwv8zgOD/c77KZdmSOYhhpZ9g8j4dNI0dfeG82OiRjB7BccjcWfJHOdffxrfSTbKuKNDzLz0mErDN/JZKsExj/9/PZV2NK2xEaFRrxEOBrgC3j6AWmlZNHpubXBh7KvzxYcPbQBAWSGmVXdNULr5nHQUQAeV5LrhzP6wdru8MBRzUHiW09bGgWZmRXbaJoUNIJD+HRKjucRGmIVQnU0uE4E5NuyB5OSNu3PUY8OxKHNcTrzUMkW6HOaAs479KBcx4Kb/q9BIiwySSlrrZW+RZ9qO9Fi/m1oSCii7rR0JDf1FcrJ/xP3e3QrKGi90V97HcfKHTHCY97mG2+0QQ== 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=RMNMZZBFUbia6tUyVUE3Yw1Sg4EaIACKjEVxBIprxn4=; b=Fb6riHSycyinOtj3cFB37IQ9h9I+NARzp/kbpJVe7fz6ZpyoTJmfbY7jDdJmZfdXIegXphwXkYKswfycUDnkWEDKIvuayKlkp5WwrZo1D4rvlQw5YeorLbNw3BIwsTxWsab6oyMNWZhXuZvwH2JGlq+OwhQkVvV1SFzE+1vi7M3F8hpFIGJ4BhXwj3pymKV0JtlPryGqQ2/cXlktL749BJMT23IUUi0Q+C5lRponrYOGSkRhPSubUt6hiesKjlInEm/0gD1jVeA1FhgK3JMb9FGuivkwL54QtFRt6QUCs/HKkGkV9/JF7HbnwGYe+0ziw0MddLTZlXH6JssQkaGxiA== 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=RMNMZZBFUbia6tUyVUE3Yw1Sg4EaIACKjEVxBIprxn4=; b=ppbQSjvIxDSvRenK7hVKhCx7t+4xVs58/ylquR4E+EMpSYI4DJ/F41/mYYnk72fLYXkAvNF++FbsxAK+2KGvxwR0jNgbQWeg0N3xaM0ioGSaBGfBrzUy4KdbC4/4UxNXcvGhs9oPm7JshOYB7P8KNBqL77MhofVsvCv28efEob42rmCDnwTsjkyWk+VQOdFz0iFcCUOlNXyElfM8gFJpzrmXrE+4ZdC7rCuCgLrrk/YnXlrx4jfzaW4ArZphnvbujX1bpE570/RN9IvraF7TLzVvDSYlX+58//IDE5LUj8Z5JjEbpC4PESzOtkA0BAkW0YrQMtqQBO97gZQJvlENMA== Received: from GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::7) by AM8P250MB0215.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 1 Nov 2023 08:33:12 +0000 Received: from GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM ([fe80::54a8:bde1:da41:a768]) by GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM ([fe80::54a8:bde1:da41:a768%3]) with mapi id 15.20.6933.029; Wed, 1 Nov 2023 08:33:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:34:13 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [cepN8cVyLcQ7OgSdZxRe4GpZaOm3d0BqWBlgOuZFQAw=] X-ClientProxiedBy: ZR0P278CA0093.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::8) To GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::7) X-Microsoft-Original-Message-ID: <20231101083423.3398491-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0033:EE_|AM8P250MB0215:EE_ X-MS-Office365-Filtering-Correlation-Id: b2950e43-676e-42bc-e92d-08dbdab52e3c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y+D7mhTW/tWJJczycRn7Qywc1RqwERtUiYIUosYJv8SEq8pL1rovd5gfTE+4+NaSDvtwxEP77Y6afuASPMLwtbRF4GId6UtSOL9AxhyBTwhxVvjuKy7FW9/ipSAQPf6AicmaSaIuvTg/kibWHMApRYPI6UcumC7s3wCfrz0itcCTb8L4MqwjYdTyyVhZ0yoa9ABeoBFeGIXSbemY3AgjhJ7IQ/B2LlGzD63+PCJdR7HH4kCjxtwy7ujuYeggLu+LWtk7kJLocMNSk9dn/qMR8MXDnGmBkQvf/lhVghKAE/qbFNvJngd519CS11lItnGtQNYrt5gIMbxVliqHLqLxFHKqTlwXC97UrBloIzaUL3mt9Ykt+UOhu1xqxng5M5g/YvOFTmalj9Edbmodg9WBBpF8HfOY/BDuHL4cZZ4se5KYDnWIUTIhMDxxDWo8J1ws1iZq5lu/AETDMbeggiHTbwGG2ZRtb79VikoQrenlZVTyBE9y/s6h0nIyUpQQvG6u9UARitN60LKMAzYWPR7faeJuKoFS88m6l7vUI9sutfL7abYOyVVVk4pd4dslsDuck6WtUdUOJ80coolDaapeORINbkdWoN9AOrUKpXI1LDMzDNJiWQyPDBc/RSn6CljP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IXHByvJ/UilTwIHtyrPjwdOzREboRjmg7c3itjUBVL6/im6plrs/71AK4dBOabDPrskwB7+ZVWV+tgqz2GVroQu41cngMYKr9xt6J4uYqgERefPHocrq7gzHTI3b1M+nxfd1Km1TmUlJlWpk7LdJFyz0hetoY//YStZtDa2k3mM/XISnsE/sSE3RsgdaWvQH/ZsbKupHrcthvFzJ3IBVptRTsu2NlByRWUswbXKk5kQY5WcI0fuTFERyhPEEm61EqrnFOX9/+/f/Znpv/EmIw5mQDaOc8iFsf27gVdzluHab8QTyLRwy4RRrR6aTnm5amzUK6hFbIn9lwIrhYV5cUWu/x6scDW3dpBfQZNcu6aPCeOxUL4bM2id/BA4VeDyjpEJ1kfG23w71l8U4vUMaKr/AxU/5hoHzfEGO/i1B+eZMXZhaI4nfKoATf5vmvIFP+ufZso9kCKzEy0JwbhOCelpGXCXHmfW8lVGQPwwRIHqYTbR9L+AMXUCLVWtN+kaSb/p/AqBmgauWTkmWdDXhxwqjpF9zSw2CozAHEmUSBpZv5mAV8uaQbkDqgxak+PRl/Yyda8IymPnF8HfclE+WhAaeIWsAZwL8omdiOS0Yf0XuIar+bRFn4EYnVM95h759Yk4de8nH5m19GuLsf6aCqpqSaViL5bojm/LdSaMC0qbSTTCscHnH4uoTi5JqS9+/WpBo6aD+8M+gbQnXnisDYaUHPWGP+A6B0ZPlX3qEje7+MkMKOtk/q+bbfC6et6pTlRVo5xRiMvZJ3el6LUGHoF1vrLTEEHWGnGZkC55uG4dcABhR7p7DiEWB4l0Eu2i47UF/XoC+2zObvPR/KvoW2XwAJym/0XGIrxl3+0Cl00v89XqY7JQcc9YUxG8oUo9NNUy2EsybDlXsnXsKlDRdm4uQjMUC8t+us4tclV/gJZ4WLf2csbJAPkmlV8TNvDkO1OaNd5o/19xsI9P4TryV55kRm7G7G9EhV3fSrhbL6Oy178poI5JMmTedDaiQEpXjb2tbulx6WalhRwRyR4BK6gZtZ0KGsbBdAFMUlyPQWN2Po7n8DJ9G7mcqeDxjx1Cl/lqNqnLHWFt1xV2iYZwM9O4/vQTy8zHKoeiIaebHt7StpAYeXw90Rt1+ilST1Tfp91jdLTRpjQvp7cTcMscTxtlyLVBaJkRe2yyTK7SzbQtqNCkwr9F4kjeNSnZSFIpPMw3g7NnTxQUeY7ZQ84NrF+RfEm60wTqoCGu8LTyDdfbEykdaSYcVUlYLwHey8nES X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2950e43-676e-42bc-e92d-08dbdab52e3c X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2023 08:33:12.2722 (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: AM8P250MB0215 Subject: [FFmpeg-devel] [PATCH 01/11] avcodec/aactab: Deduplicate swb_offset_960 tabs 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: L1t3Fu5NQr8D swb_offset_960_48 and swb_offset_960_32 coincide. Signed-off-by: Andreas Rheinhardt --- libavcodec/aactab.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c index d20ac56a3f..63a478f33f 100644 --- a/libavcodec/aactab.c +++ b/libavcodec/aactab.c @@ -1331,14 +1331,7 @@ static const uint16_t swb_offset_960_48[] = 672, 704, 736, 768, 800, 832, 864, 896, 928, 960 }; -static const uint16_t swb_offset_960_32[] = -{ - 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, - 40, 48, 56, 64, 72, 80, 88, 96, 108, 120, - 132, 144, 160, 176, 196, 216, 240, 264, 292, 320, - 352, 384, 416, 448, 480, 512, 544, 576, 608, 640, - 672, 704, 736, 768, 800, 832, 864, 896, 928, 960 -}; +#define swb_offset_960_32 swb_offset_960_48 static const uint16_t swb_offset_960_24[] = {