From patchwork Tue Sep 13 11:33:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37886 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp627827pzh; Tue, 13 Sep 2022 04:33:34 -0700 (PDT) X-Google-Smtp-Source: AA6agR64LmRKHh/s92ELKrwCn1zX5iLkh7K987NRhXx0QDLBxBirN0G61osEjnzwSbBjqXeyKON2 X-Received: by 2002:a05:6402:440f:b0:435:2e63:aca9 with SMTP id y15-20020a056402440f00b004352e63aca9mr25410189eda.162.1663068813865; Tue, 13 Sep 2022 04:33:33 -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 rq6-20020a17090788c600b0077afe48c781si6026937ejc.537.2022.09.13.04.33.33; Tue, 13 Sep 2022 04:33:33 -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=tgBUDLIR; 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 BE8C468B96F; Tue, 13 Sep 2022 14:33:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2070.outbound.protection.outlook.com [40.92.90.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D468668B96F for ; Tue, 13 Sep 2022 14:33:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lp5hXSHFSq2FrZ0Suw0te606dlPqOjxPGzyPkJ+4Cp6AVuA2hMUtIlMojXTYmcxa0Ti3XTIBfSihU8aYToJoe0ON/z8l6j/JqSVNanoq69fuEmOUOrxtM2gIzA/DbXUBjA/mo8aytQMUT+w0nNtLmShHKv1qjNtBfca1HmDH/75GfcQBVwc749ieXoN8aHnbl6OVgSUpGOW2lghYP59XIs+cHEgmwRhqGI945bRAnwCz81n+VYkMmFH83cQLQki+6ytgBWe+TcWls1Yz1xSaA9gpf7mOb+7kc3EkQTSRR6M7ftczHRPhE7KBludGAU9AGx30miief80gDcKs6qpcoA== 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=ckQFmkHE+n5MrEpVCEiWze4NLChHIi8jpdv1yPSAHIs=; b=H+fJ7tWMd/sbUu+57JEgjInuusZnkzOb4ua59BOkzK6PR7GAS+MZlDauKj6ktQMnTAqRKqiyfJTxbQzlh0JesWidY9r/TQMIcrHzcSVOW5aoirzdimbA/Kmm7UbCVTh7/a7jc6oFKQ8cnhXOA2XDB/nquCCHmIe30sSLTbGkwbAXO5ktZfOhvZ8gwcicONsD6OymmK8VuOfsHDedcJ+GhzBUTXY074VdRX8DL0OkPjTNmZ2e7JyJtDLSX3e/PcEz78p2gAPcwMwCAwyiOxYwo9XgHPau1K6BqKOwfb8Slld879d5FrgqH0BZ6ciX9nbQCEpMlJjXlHbWKTU9El0uXw== 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=ckQFmkHE+n5MrEpVCEiWze4NLChHIi8jpdv1yPSAHIs=; b=tgBUDLIRv62K/o9VCRmtdVsSBhHphJJM88scUwOHExEGrIpYLlL9CDr7l+K4ZeV8jAnNEF4yEzlISsYUQximY5bMA+NxzRSOVO/tFHGRVHPCsJrUkoP1TkIAS3aMGorVyjHJ34orTdy65AKeEHbJswYK0rIkzyFbOFCjFoxmaGGWfusTpS3u9lIxlT7zNMSSYGavI+7in6YGRkYK26WD0GlFc7lPtcFXNzdbVVwWnhvU13pPvO2GEC5GiosEOukMUXBFyO2uStSw1RxAV90nYYADV8Ok+duvnTwU0UrL2FnckfVnALbu/mVc3Nm7zRvLtEXGnZ3qD7ku86FJEdBfgw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) 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.5612.22; Tue, 13 Sep 2022 11:33:14 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%7]) with mapi id 15.20.5612.022; Tue, 13 Sep 2022 11:33:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Sep 2022 13:33:00 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [tmAu8kW8F6PlsCvaybUnDtCSAfsYX93A7CAO+M9tBWw=] X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220913113310.451876-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0072:EE_ X-MS-Office365-Filtering-Correlation-Id: d6d85235-63f0-4f50-5b0b-08da957bbee0 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpEumVcsW5Tnf3Q/Hh5f4HAvNJADN4LE2TlPGZjHeTBHsGBVXNFAezEUeeKM27ElpCVX5K7t4F6LO2c2U1Zeqr66p5HcdPRk7gqxbTQjBha6KEVhi+y9yyceiLbeL58GIm1QjAFg1CFcVPbIaaYMJe+w4bzRT2eOIzwL5H7SgQe35Szz/pysFYfUfuUqliloPTkySBpyi4KmXkZRSuxKzdkkpqTbpfoP3KFxLO10AwZGg0oHrZVM6k38uxTlbuRnMh+aMNDcyhVJvfwKmEP1xxmwsWH3AuoCofNgxA6h9Ox8z/ux2T0Egf2LnBHckVx7v+tmXumLT1ogkGVTUtdqdyDO6q+uAUEDvX/NCKGfstFti0vrxy7ORk+ZyFLj338I0bpiOcbd0JZapOQ6nicgIwg7t2Ta+KLZaK+9H0KD6JohrjH/R1r3TMoSi8lqhvrAJ26kxdJBotPZkT1R60CvNBeKY695fAnHW38B7DNWbm26xko41TbDSaHmV8HHMeNKT4cFhNQLQA+eyHUT3qb6BA63gImxY5OTVhNAbrFieg/Tfhl4DOHpizOeq+JzYgju19y29+7TU3ZPsXo6uWmcf3C2Acj7u1lKBEKoQL1YAj6j4V+iSwlGnz8vAowUOyKICDZO5ZaGGGJuHORJDHURabtcxWRsI8Uajq7/21YT1OyZ+OibtIbaOV5cQrDtq5xEkJn7HaDKikroOEWCIWHS4xEUe6MAAQaX8kbMKiSOuMZvemLPi6AQ2PZ7EtuabQnrxc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GkECk6K5vk4Y9en3J1DgKcO3/JPnC+SoFHTvd5/LxvXJqPs1ATKS+3sZ4/kaAsvegCQsXd/SSk2E/l8PNySaCNpWOsAn+hGlhrHuRj8f756Hs5fsvA9CYvBdsyyq+CJwcUNC6CdAtTJGQWwc8BGs+GfvfhI//Zjg3/zK9Ew5u4NNsB9GbrerFhuF2ZerYzqtLAz4cuLGNA5rs5m/sItVY5TyT7J8MAIMUNZ3pamLdi2oNlx3tVQCfzbfMIWk+343KqzEfIyUvxB/CqQ/fgnWEvNpsITDEJ/EpwHcEpm3Vk2wOgJiHcltR4ro3/63HF+HFMFcCRX4x1JxQ9tWUKOApszXeTrHt7XKERkSl0FE8Tly4qO2vXDkvHi86Ia+e4JNP9p9W5+xrA/OebhQxjGZmAjAzvApPhCTCQtCgmmd4RUFHw4THSR0ST/HZlOZWEnYgvhPksVv8dGYre+etW8m1XKbpFyzrn4bTeDNnw03C9oO5PbhyjP3NZ2g3IBWi6abE1CGF03VHm6OE4lSDepFMBLS7DDjnGIDQik4mSQgFEl1s83U1rjoee3dW0vtuliMZKrXbb/WWAIWubD6r/F0QAb58J3ZKO11VP7SjQds9qH/4CnJ0s46Kka+zTRs6bjUe7r6OsF/XceqevfXvFTCVg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pxi5zrLVuiDy6fgk3lWbD+LHMJVgFauk+gyVm0Uk5INMkq0HvPtck32jH+t/V/DbbQgGI+zrgcPzvUPP/e6FKx++DcKMPSfXVRAvquXBydL5+bP9d5BZxiA07NFTituqkRJSqjuE0K2eOhatsF1hOq0XsfQpXkD1wCna2r3AdsCdnuuYOjf/Tc/fjNYVsV5nhX1bgdvo4at+8CxaXfLQRyo0+YvaYkE5kmrtwbyMQrFi3UEiJeuviy4GGTXE8KFYdojS3nR+HIt8kGhcAaK7KiuOrwh7IjW3OIEqUF/8i5E08blgv+jFn3WehXqnoA3dpOjzlRMN79TDPMIHDEU+kiefXGfsE45D4lNegJoVxj1qjx67cWpYPdSyg9qANdHgvg31wYGJt3+qylBdSFoUPFLkKHCPw1eoSDq1j1PFwAcpoYagKYKcYocvY6yzXf5vkB9mex0cHWncTFHJBDiiyg7aRPAyaes3P9eVWcoQFgn0kNQaSxyO28dThlcHGH5g4P6jJpQEhprRzCul3HX1SYdr34rzxM4cvKcLAhlezLjUMhx2lIJUGOP/KBQHuw2oXGh6sWm7YQ+3BSoo9i9cQwpAG8FcL+FyOeX/CBG7z9jPR59qM5mQY56KTWV4s2mZIvJrj/+rGey5ygjtziJoOz2vQefj7QIaVgCi1FqGDyThXj57lOwbw7CT5SVRA96OJ9Aw9myL17w23E4r+EpfP4+i2ZTXmv4LqDsdPhvO5GA2SPpTy8/QDS94hmGln4984fQeiaLUN4qRvwvAa6qSlPfBtGkVwQvxYAZoad1KShnXhrjqOMbvX0v3MbjdFaKbut2KP4RyYmvYbR1jITedf8CLn3hMBKBZpdu2fdMDxgtF3Sm6ZXNZ5zI2frfwXo1lYSjgfq/bnHocGd8nE2gBYKiGF4v0Pr08fLjnFvzXTIvt5LrQ5l2PHGX69lsbDDcx/c7SGqyqqexpFM/hmG2TjqgBqUSj9Qr5DLKK4yzWxKrJDpGS3ouRk5iV+zNAWbYKRTZAfeqdPcbvCmi3WJO1QkC2sCmA2tIf/CjfXTGido1NKDwJFHQhnj8pZFSTrmHUifz297fQANXcHGtyQU1diHV1Q8MYT/PjxBmbEoiNfRn9UuCUwtkymW97CAJudielZ1EFjQsZ0tCpQ0ImrnhYMV7dt60KB1gwo31ZbpSu96mbXyJU3cLN3imYmaiyIvL1b44QkSH+dUwM+mpnARxd6YRwwPXlNEO7tIZYMwE6kbKb4+uT9J02rxxVBVmYjjXVn+DdMlgvQtEG2s6Ao/CbA0E7GvTT9WDZfBKxbiy6tGWf6RfFSp4oAlLm3hEb7Dr6 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d6d85235-63f0-4f50-5b0b-08da957bbee0 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2022 11:33:14.4267 (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 03/13] avcodec/dcahuff: Avoid redundant offset table 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: ctmh6Yk00cMp Signed-off-by: Andreas Rheinhardt --- libavcodec/dcahuff.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/libavcodec/dcahuff.c b/libavcodec/dcahuff.c index d1b64798ab..9b809cc415 100644 --- a/libavcodec/dcahuff.c +++ b/libavcodec/dcahuff.c @@ -1232,17 +1232,6 @@ static const uint8_t rsd_bitvals[18] = { 6, 4, }; -static const uint16_t vlc_offs[80] = { - 0, 512, 640, 768, 1282, 1794, 2436, 3080, 3770, 4454, 5364, - 5372, 5380, 5388, 5392, 5396, 5412, 5420, 5428, 5460, 5492, 5508, - 5572, 5604, 5668, 5796, 5860, 5892, 6412, 6668, 6796, 7308, 7564, - 7820, 8076, 8620, 9132, 9388, 9910, 10166, 10680, 11196, 11726, 12240, - 12752, 13298, 13810, 14326, 14840, 15500, 16022, 16540, 17158, 17678, 18264, - 18796, 19352, 19926, 20468, 21472, 22398, 23014, 23622, 24200, 24748, 25276, - 25792, 26306, 26826, 26890, 26954, 27468, 27500, 28038, 28554, 29086, 29630, - 30150, 30214 -}; - DCAVLC ff_dca_vlc_bit_allocation; DCAVLC ff_dca_vlc_transition_mode; DCAVLC ff_dca_vlc_scale_factor; @@ -1264,14 +1253,15 @@ VLC ff_dca_vlc_rsd; av_cold void ff_dca_init_vlcs(void) { static VLCElem dca_table[30214]; - int i, j, k = 0; + unsigned offset = 0; + int i, j; #define DCA_INIT_VLC(vlc, a, b, c, d) \ do { \ - vlc.table = &dca_table[vlc_offs[k]]; \ - vlc.table_allocated = vlc_offs[k + 1] - vlc_offs[k]; \ - init_vlc(&vlc, a, b, c, 1, 1, d, 2, 2, INIT_VLC_USE_NEW_STATIC); \ - k++; \ + vlc.table = &dca_table[offset]; \ + vlc.table_allocated = FF_ARRAY_ELEMS(dca_table) - offset; \ + init_vlc(&vlc, a, b, c, 1, 1, d, 2, 2, INIT_VLC_STATIC_OVERLONG); \ + offset += vlc.table_size; \ } while (0) ff_dca_vlc_bit_allocation.offset = 1; @@ -1302,14 +1292,14 @@ av_cold void ff_dca_init_vlcs(void) #define LBR_INIT_VLC(vlc, tab, nb_bits) \ do { \ - vlc.table = &dca_table[vlc_offs[k]]; \ - vlc.table_allocated = vlc_offs[k + 1] - vlc_offs[k]; \ + vlc.table = &dca_table[offset]; \ + vlc.table_allocated = FF_ARRAY_ELEMS(dca_table) - offset; \ ff_init_vlc_sparse(&vlc, nb_bits, FF_ARRAY_ELEMS(tab##_codes), \ &tab##_bitvals[0], 2, 1, \ tab##_codes, 2, 2, \ &tab##_bitvals[1], 2, 1, \ - INIT_VLC_LE | INIT_VLC_USE_NEW_STATIC); \ - k++; \ + INIT_VLC_LE | INIT_VLC_STATIC_OVERLONG); \ + offset += vlc.table_size; \ } while (0) LBR_INIT_VLC(ff_dca_vlc_tnl_grp[0], tnl_grp_0, 9);