From patchwork Tue Sep 26 22:17:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43970 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp2211946pzh; Tue, 26 Sep 2023 15:25:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFTXUpE0I0TiAbdVTkTQyeEOH1PrJGgG47rhReDncKo0oT+G2Fd7DPiV9CEbQKFK1WpSfnZ X-Received: by 2002:a2e:95c8:0:b0:2bc:efa4:2c36 with SMTP id y8-20020a2e95c8000000b002bcefa42c36mr304846ljh.11.1695767108057; Tue, 26 Sep 2023 15:25:08 -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 y25-20020a1709060a9900b00991df86ac0esi7712858ejf.338.2023.09.26.15.25.07; Tue, 26 Sep 2023 15:25:08 -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=c+5VkV1V; 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 AD17D68CBCD; Wed, 27 Sep 2023 01:23:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2040.outbound.protection.outlook.com [40.92.66.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 871A868CAF7 for ; Wed, 27 Sep 2023 01:23:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZMh4L8BkrHZqd1iV0UeLWgYyhucODxVnUYYsn3W+IRfbLd9WJP7D4eoGy47zG79RxN9prEQAAQxIeZpuXolh5LdP3a4HG6Gr23xUtT8KKuuti+Mj8AMSb/NEY8wDa6PLHWrG4YIL14r97epmO0I/56ReiBNmVYC3QEYT8Y5wBsCxBvup1K5cFmPUE1f+SGSaJoFJNP48Y24N5G/r/J/ADmZpXNqd7I+9mTOWalZlGDkbA4uHWSsnbwy+c1rQ9AgwEC4zM2LeX/r2o1LUprp4GiFGlMbiZ1mslXYolPogctiJSDbrhH8qvi9NpCQ6zIlMQ+VtwBbE60DDKF+tQkB8tA== 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=8uY1xh/Kb7iUrb9jEmEHdGwOLVZy0tU1xyJcr7nBI7s=; b=Qial4C7VAXITgUEmqSJ5d8tQETKb9rargnBVq8m5I5ChysT/Ppf+62gMaM9uwwOqC1RGG1EOIWfPpVJnJnq/IxncV7zOiK7eDYbxWBf1/QcjZemyWaJ+VvMXEktXtlzR4++3OVzux87g9OQDvXNlRX0RbNLm1SPkJW/KMrcKu0m+0t0R6wZzUSzbnwBwqthRaqizUQ5BHzQQfUd3ato+Bx6swiM7g9hG2gVVzIJgDgLAH7Fg4QTB23PEh4cVNqnLheATy3kMdc+mJA2YdG1hDMKK06zY/dyML4qtKjECfPXM4/4fDzNjC2krQv4fHhVKhzEa1fqleki2GEgkdG03ww== 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=8uY1xh/Kb7iUrb9jEmEHdGwOLVZy0tU1xyJcr7nBI7s=; b=c+5VkV1Voj4dePqnc7E3b8pL4a9MWxEW9Hmt9DMHIQN043/SuL8KhjYoRAykYMQr+UBDsVxrl7XMAvpO+IIUrBvq37AOlpFP4KuRaBTXYYErAWifHuS+ZtG5jx8mSfgCv9Nrkpc7MAurzoGsbFEjQXPIZ/nwht9sJ2ic+dwpt2ZiCpPfNLvK85yJOagpPs6R/4p2EO10cO52Q4iYT6epi0Aebyuts889hnobWC+JOA1AS3vslvF/w9NAYPNlMV3DZlSx8/MCiZaZGizKswOMdGOz4VCdtbjHbYE5MOjvwfxdJS3dnnc5U/2Ndn72Pt/YrTv49p3ldtzsb1s3IdFIIw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0160.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:323::5) 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:23:09 +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:23:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 00:17:31 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [+1QZnnRKxJ7cvxy0G1YmrDso1sFxkeDh] 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-59-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0160:EE_ X-MS-Office365-Filtering-Correlation-Id: 2904378d-8ee2-40ee-01e8-08dbbedf29a4 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o2Ks72BihDnSMsA8hApWQ79CNa74cX5plvqmfp+i8eMqC1cwTqSTe1tBpCxYtEf5yf1C7NsN2A2IVXomgorhcDrIY9EfUnCUnDapwM1QqI/cGNKXVv7nZOybz/tLBSqIxlexmIUiZmLmO9d4THlP49WIXI3iyFJK9XHAqRprZ1B9asY55kd9SWlTm4ZNQaCLfXMcAvQP3sRYE7L53F3SEVT1g4H85VkP3qPKci1r2S897mAy/pQ7J4uC/Lwa2YYCkI6i71Th1j8ci3qsi/n8wCS1YPpF1wHfOr0flqcHu6hnFJMoEKWtlDzKwb12tM1lHFCPyAMeIJl+2Lwn4nS5xmmKm8Qy7/mGg/aOuuOsLEwyAGB9MBh7/Thb/6BSnF7mCnJ5PXi6ub5vJHd9NXoaebYB8Zfwr00GQGMDtb3KJp3fVgultuPbz3N0wlv38niuVa/nvcSg+8eaecyPmZC8GAgtpOf00oxA815vXfUOgjtgNoTRhn3fqoKrx01RV8JzRkdj5SmTo8hSkrv7/Z8GAnkXF2rcgpz3uxd8LWyLvR7utJeDfOtCEot/An8LCeU2c8O40DNPJca3Ss5NZvxFjFV1/Tlp8i9eJ2gka7imKSFDvjKPPhXhYVUTDEWlnHk1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 14x2VqbAu5Id76U6xTlfVTScQyeC7eIi3E3Kcd1bGQfCoEb+VdSyB1M9Wl7cT/grIBPVSZXHwsZwjCNgo+SR+sQHjoj8f4Um2HVtgsf6FsD6/qg7e5rUZ4CEIGEqAocC/JdvReESjnlN3VfnwACZv1YnSAndVfRk97QPxfo9zjWApttgLjA+w6uQGltYDpmrI8TEAhC/V1KE+9MEuM3gZ7qhZL24A+m6WLVT7AB8mFYifEOPIv6gcEH98u0DL16RG62DHQxI7dXtpDrvbE09ebNPl2De4mZ6Iu+FoNsPBS/pzKllBeG248K0CjNYv5Wmkb3sIYRDV3TcSmDIdtUms7EQ7idQka6JP9H9uUmxOexCUL0G4Tf/Lfl7dfbAGQ9NKTANbRVXm8rvOSOJvzZeWs3IkegVPbo5dew7z5KmIom+4W/4bOkERLIzCR23tNzp4Ouv9pWpac771qnJu7L829/elsDU7QO0uqni2Qqr1uFbdMg6FwhuPvgISvEulNcK9X0EbPNmoEa5BqjBDHvCIoJuyjEisAyhYdeyuDiVvVBG1ZPhVaABClt38HCups39fC4A0GjHAVfn46EHdxqZXtgZlTo6ouAicJMeGE5+Y01uGBqSHWfK5XUvWUKpVIwSyyfKP16mlm/2isqflJGwmup9+y9y/SEabL79yI/ey2RgWN5/9XpkJ3wo/34LZlYJ1QN1Kjnz2VE1b104E0VBAMx9SnXkmuNHFSEOepK/kFjuiUBHAGSdupwrrTuIv+z8NEerp3LrP2bl63/tC54O05xQ74/Mjc5AA073UDvZJfyhjdK9Hwt7lwQ4b31Vu9n6c0tNVP1qFR0KX9K5fzvnZJZh5X5/6T60mMaCnDXvuUh2qJHAAPQCdHAtxjlLysFpOidb9QnApDipt/tVBOigHMkhoKQkbjVdlSieY9iz0pG9JAO5fk49B6zW7b3svgiaS9Ji2zDniOfqXLd07RWobUNw2cRQc4H6ZYXJ66JQnbLwtkcSgfU9jUIUCCcljFL9FycjPA15KMU50UbEBcMLfrlCmE2qpIJdiEJkaQK8k4dVWJBWHds31tpwVLaXIlanffpU5oheQl891DpmBVNa3+3tSbUmlS0Wk2vZ4o/fND36XzNhjHUfOzIVbmH21ET1e4vyh7Twd7IdLsieDZ5gSqhD0Px1BQrzfpBQfx57Wqv+DJdzlMgNuELjfYDVa5TbAp9LxYITgOcWNR2EU/62m0Bsa26hn+VDwcjsM5R9aBRTKInomsCJsOQ6S2XW/U9U X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2904378d-8ee2-40ee-01e8-08dbbedf29a4 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:23:09.1022 (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: AM8P250MB0160 Subject: [FFmpeg-devel] [PATCH 60/61] avcodec/wmavoice: 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: lBqE0vEPf23B 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/wmavoice.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index dd7cc64d63..4e93aadab2 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -60,7 +60,7 @@ /** * Frame type VLC coding. */ -static VLC frame_type_vlc; +static VLCElem frame_type_vlc[132]; /** * Adaptive codebook types. @@ -320,9 +320,9 @@ static av_cold void wmavoice_init_static_data(void) 14, 14, 14, 14 }; - VLC_INIT_STATIC_FROM_LENGTHS(&frame_type_vlc, VLC_NBITS, - FF_ARRAY_ELEMS(bits), bits, - 1, NULL, 0, 0, 0, 0, 132); + VLC_INIT_STATIC_TABLE_FROM_LENGTHS(frame_type_vlc, VLC_NBITS, + FF_ARRAY_ELEMS(bits), bits, + 1, NULL, 0, 0, 0, 0); } static av_cold void wmavoice_flush(AVCodecContext *ctx) @@ -1503,7 +1503,7 @@ static int synth_frame(AVCodecContext *ctx, GetBitContext *gb, int frame_idx, int pitch[MAX_BLOCKS], av_uninit(last_block_pitch); /* Parse frame type ("frame header"), see frame_descs */ - int bd_idx = s->vbm_tree[get_vlc2(gb, frame_type_vlc.table, 6, 3)], block_nsamples; + int bd_idx = s->vbm_tree[get_vlc2(gb, frame_type_vlc, 6, 3)], block_nsamples; if (bd_idx < 0) { av_log(ctx, AV_LOG_ERROR,