From patchwork Tue Sep 26 22:16:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43939 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp2209793pzh; Tue, 26 Sep 2023 15:20:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF/LgAtkIdgAUeFi+yd6YPvWKhPacZoWN76k+3idJWzv3sVeq3Kkr3sC+Ia8WnrEj4zq6AO X-Received: by 2002:adf:dec7:0:b0:319:79bb:980c with SMTP id i7-20020adfdec7000000b0031979bb980cmr3671wrn.64.1695766810250; Tue, 26 Sep 2023 15:20:10 -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 gs8-20020a170906f18800b0099381745ba7si12032103ejb.878.2023.09.26.15.20.09; Tue, 26 Sep 2023 15:20:10 -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=dSzmatbN; 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 532E668CAFD; Wed, 27 Sep 2023 01:18:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2108.outbound.protection.outlook.com [40.92.74.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B35368CA85 for ; Wed, 27 Sep 2023 01:18:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N+VtEtnvwlrCjYsPrNSze+G+8eyY7fWhk7APRcu2jhj8kwQ3qbTUutBCkHBRYhjzvdFtfb7U6/xk0IN95laXSBKW6CiXMOjBs+dKaxCY8zOFNwQb5lnt7xnjK2uYiJSNUs6MJq4665/0zgMGcb4JzaLweQxFh3X2HdU1oRYA1pcybwVH32wq+fU8QU1+VHej6WvcKM5ZnpUBQ838mh8Lv/smw7Bmr9oOOiJyTD0ylPcP5jOP8LiA0YcbQ1jaFwvh/TRL/r/WlwyUUctoOMptlf2/DA/2W8bphd2GOXzxU5PMA2Qz0G1iU9f+HLB8nlS8L4bLjMVjdPIS7+xV5Yr4sg== 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=7g4bJpEQn1pgd3fGGGuMjHIg0etAADTPFSzlmn2KNRg=; b=CUjXDyT+gnFsPHgAaQQs6r6YIJ6imtlk3JXbjfsIEuI98PsL52UJ+NnPzlR+tOO3+AFXrhPJ7DQQEpw+oCi/AAF6YNZ3c1FczCPpvzWn52kpiGDNZF1DA5SAOTuJmMLYG3c0UNGELNAb5wA81FwZCqysYUO6d8qSEvxSwDiZoTY1AKOG+UpegqIa4cgwLQFEZ5veuxJmh4koS33Dpi1fi06db+PijZ/jtJkGED88BYteQAZ/xF2xMUIuNswyS98kPnXZKMOtPFD1DjcskYviYgp3FkFsRBNLe900R95zs9eJ3//ixcOjg9KKrexEi1CjMETeqn9f6RUQ2aNUbYqWPQ== 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=7g4bJpEQn1pgd3fGGGuMjHIg0etAADTPFSzlmn2KNRg=; b=dSzmatbNN+S2VvdJIBDisGm1ExyxuTOf6ccqWeWxcUNAR87HFZ61+7AdSK3TVwQ5UfW57JtseS5CJBlKQwi5yFzyflayVix5zvVsXmS0n1piVukbK/HKJNjeLHddseQHQwxAqOzIdWTcUBBkyKwVT6N9MtjICdaLfY56ArQ34ogGK3hbeUH0RLetRMa22OVASIgwQeAhaLGtoCiONQ/oNGqVymQJlbtpQDmNHrOADHf8Uq4gOPPNPcnINsTECv9kVZQq+6nfYIMfpSeP7jc5LvVvqSIsMQHeX1gQbglTj2L+pCYThaa2iVIomqTY/Du/0/PItlTN/icMauikTg7Cng== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0189.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:275::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 22:18:24 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::9d42:7b4f:71ef:c76a]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::9d42:7b4f:71ef:c76a%3]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 22:18:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 00:16:57 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [/HkWmnpwKwxDsdAJDB3IXPHOuSIeoG0q] X-ClientProxiedBy: FR3P281CA0019.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230926221732.3711507-25-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0189:EE_ X-MS-Office365-Filtering-Correlation-Id: 8fbf063b-84ef-4ff5-eb71-08dbbede8038 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u/J6Zkt4+t7jrKifDds2ylChD3pJwYfAOPPF/6lo2OevWSKNlKXp54v92+wx3KkbnIImUDc8hsMCwTTDog6OpJPcRHq0ibLqN9tBYAECGGzRU1/WV+i0sBj5tb9DfSMsCO9wXIWLZgOXUuAgNxIs7KGGLME2sJBlFGL/2Yqqi1/gQMuA6PG5222rtT4jJ0lFEegRrC9xTV9GfS0c5V6pOaorDNURKRZQNF5FcPfck+QA+dh/P9JFrMEGjRpCkUFJzjstUb3i1I4txng2eITp+QItcBMKkSda5H1X6BAvPISbbqJw75X/Mrrh50rcO4e0YI3819TzsrtygBPIx0S4jbypiChkvH653Ww5IVDgQ+heTB+rHN7mwi/vT5qQ5c9a32yhnGlW4NzKFFRrDcpTfMcNGVQSgRVJwwMJsTZNDuMwNoIyvKp1IFEhDtTOzVJHX+zqK2DqD/dbdgu2PvyYc5sdiQNy3DGOoKY7GOyGBaqozdwlBqiXC8JyHBcXRvEvodF2oSxaCyw+mVvLksFWzjznZjgsVCEtWlBOZs5Yanp6G16eL7QsD8V+0vD+1pHUETP0YaxV8Ui0SZD9EI/A6g4lWkst3vpUpsgpqK17kiF8wyca7bwQzP9jN+jLY1Mk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J1cq7uW5ExcTJdzqXoJICEu7b/Fy2hnPmJg726J0ACeVAtvuzeSxMFCYj9OLvNiizpdB3+ZKSzozGkQutrP8hGNvjcaXd7aWxmGd5iPjBe7r+1YPdO34qA4H6zFNze9//r8CRCBmbYzVhCgtbymE+Z/EEXhRumCaAcBEwdXD3KDFFg+ADHB0z4b5yDg1aH00fHyEx1eSfCiort9nlBhZtfaxPepq8mf2YKKUGb6K7ykkSpBP9QFdTNRL1F6sy8krLnZG8gVjMMeujY5BG45Ii7OR6RAYNurRU8fKNbI/rWQrGNnjN+zwVYvSVhp/KH93X6kQjUlNT8Z+SWCdBJLx/oTOUEMn9tUPufMX/CmaNs5gx+qusKGVDbYZtAXWg9B+VhcaJa1HxKwSrXanaRzIo6crbCXv4rJhVxEUIvGJlkb+wzdBUwIVHq5JsueVECmI2ojkpoQNuMKIfdcuQcAiFfWvLrZjACtYWf/RE5V7AqRynz1RMaQDM5ESE92Xc/RCxp3mn9Pnj/gZSEQPx4hovxVHThitv28ghcWIqxgTj48tJoKuNv0aDjRU/d4+agQXhfNOa6CiBGy1wGq8iE1me7YtWzF85c1doyL+Up9B1S7Nzm9XFyaOOXILENmITR8b5zlWM0upS147cFFRzS9Y7va5iJbvkPOA2RFcOFLavaAz4lTCsOpzNZup3PZMK54f9dWW0q/S9EgQsEFXUIieqHOr428Y3lhcx/NY93kmz0OHmBsiGvzut695qBpW20FPZ5/v5sJItI9h+fiYPNhoHh7icahWh6Y0IgAHVvfbRNMit7mlLmqmSONZfrZ91/lodqqaQIhcwsoW3hB3/sQc+vNXvJWZ+y0pKXdNsvRuq3OegC95p/XL5OIMKSkJkNNyLDYjApWbVHW1pis5LU/ZRycDzOmWb/7kPUZHp7VaBMHwwTt2fYEs4v1gAglJgTwvJMa5qOSHRyDRRKQPKhwzFZkTfhkNy3Cc9aMd8DlvXGF2S/Wxjkl20Z74H4L/IZD6d6AmWnTaomZe5CPGv4kTUrfzkBkt94l1/5ef8h977h0jDYsj8vwh7riWXOkyFdJF7LUEsXl7GI67CGcA07Ljer43MizN20JeUfrv3skzvU1SVSqrMj2g+MS1FclYB84nXTmKWkuE8XmL6poOnzpE+IUXMFZn9gw7z9gJGO8o/lzuMkpUCzPlpdjTBz6X4551gBnP38zVbaHB1uz5iHV28Ua5JRUwVWy0sVlsvE4aiT7qhAXXdnKpPC/FIPEYYqVy X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8fbf063b-84ef-4ff5-eb71-08dbbede8038 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 22:18:24.8631 (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: DU2P250MB0189 Subject: [FFmpeg-devel] [PATCH 26/61] avcodec/wnv1: Avoid unnecessary VLC structure 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: uyx02XmBpbCm Everything besides VLC.table is basically write-only and even VLC.table can be removed by accessing the underlying table directly. Signed-off-by: Andreas Rheinhardt --- libavcodec/wnv1.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index ffc9174ab2..0e8dae598f 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -39,12 +39,12 @@ static const uint8_t code_tab[16][2] = { }; #define CODE_VLC_BITS 9 -static VLC code_vlc; +static VLCElem code_vlc[1 << CODE_VLC_BITS]; /* returns modified base_value */ static inline int wnv1_get_code(GetBitContext *gb, int shift, int base_value) { - int v = get_vlc2(gb, code_vlc.table, CODE_VLC_BITS, 1); + int v = get_vlc2(gb, code_vlc, CODE_VLC_BITS, 1); if (v == 8) return get_bits(gb, 8 - shift) << shift; @@ -115,10 +115,10 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, static av_cold void wnv1_init_static(void) { - VLC_INIT_STATIC_FROM_LENGTHS(&code_vlc, CODE_VLC_BITS, 16, - &code_tab[0][1], 2, - &code_tab[0][0], 2, 1, - -7, VLC_INIT_OUTPUT_LE, 1 << CODE_VLC_BITS); + VLC_INIT_STATIC_TABLE_FROM_LENGTHS(code_vlc, CODE_VLC_BITS, 16, + &code_tab[0][1], 2, + &code_tab[0][0], 2, 1, + -7, VLC_INIT_OUTPUT_LE); } static av_cold int decode_init(AVCodecContext *avctx)