From patchwork Sun Sep 4 21:58:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37659 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2274869pzh; Sun, 4 Sep 2022 15:00:14 -0700 (PDT) X-Google-Smtp-Source: AA6agR7/zevzDgatt+nbPfAf8Tsewiwea431a1AOZJmYQHGHAR2DK/k6wurJ3zHPuAXe/iYh2jLQ X-Received: by 2002:aa7:d315:0:b0:44e:6647:9dae with SMTP id p21-20020aa7d315000000b0044e66479daemr3768455edq.280.1662328813888; Sun, 04 Sep 2022 15:00:13 -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 ek10-20020a056402370a00b0044d7a93e44dsi3153927edb.579.2022.09.04.15.00.08; Sun, 04 Sep 2022 15:00:13 -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=R8OEPiAx; 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 7FE3668B85C; Mon, 5 Sep 2022 01:00:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2042.outbound.protection.outlook.com [40.92.58.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE8B568B85C for ; Mon, 5 Sep 2022 00:59:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mar3BegXcX7ENP7F2lzSA/j3iJLY5Jt+g2cO834JaE/4hchf+O6XAsaRx24Tp9MbZg+As8t46yNFDVIZI5I6h2x7CFb/efiBHJWJ7A6NkTc1RIVwB5vdnx6iV2JLRUd4pq5kROBG2yBOGZpIIBWoBVS/7dZnpC+zLvrHdE9sAQOcKCiSs3N3b7aQkf9dlhpJR8okN93mm9hyLSNQSG1LFAheyFAQg+oaLUacEAXVlXl5IfuZ8XZ9oM62OqS+Ei+bK1CouLed17tihChDQsF5Z4xaWwxnp77gWHa38Vk0ljr6ElYnyKus2naNAYlD3Nu0OVYofPSWUSMmlM6NB+pljA== 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=teZ6Lt87ajJ3UZoARQXwJa2JurwD+f1eB0qXXmTqdWc=; b=HgTRbznrI6ILXVd1aDFNPsXrTB4gRtUmqTiip9eCATxW6owDy76wjol0cCESZTPZo/H1DmWqw7juCQ3cyY/S0nE/FpMGF11TA6R8h4ZKNb6UfS+bCWBTYVIea2darRnqA5sdYtzoZKLnnLxrwTC9jZPhRIIIRkB96bn5tNyAIyZqm3yTRcbtuDtuIkmLF1+2DIp4430qETECV8V7FxPXdFfCqY/Rot8YZCIVyPlISJk0YEAZXn/cvLvzTX6fR7ASYJmHrkAB749qrRghq80qP7rROzNjmZron+i3tFurZOQAbItvYQ3czpoi835jUICo0ZwiSr6ogO6zCDWqrOJ11g== 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=teZ6Lt87ajJ3UZoARQXwJa2JurwD+f1eB0qXXmTqdWc=; b=R8OEPiAx0klW4qoqWuDQYBtUrrTrZegfiu3rwJpFKjh99fgLTNd7IZbNvZdWUqMSKmiG77hWPq0wzKnVqlvrbdSB1u5VKr7Q9OPW1m8yonQlAp4tNWhk+GoTprE3zI6pyej/kdUnMrp9+/BEbOmsNCdMNtzNQFfpReqDQP38Lw9k7xjQIduCV6isqe/2w593evMFntPykQ4hU4IG/ZkDyodxSsIFzXz7XrCbEFXvuTPXpiyd88ZLhbHAI7PhqGYT/FMVBi6PKxPoBeA9cGN+VgIbbbaJye05KhGjOKIC3GsIgF4EhmNiErIM5ozKA7SSJfNWUF5zZJW+AYED3KRkfA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0235.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.17; Sun, 4 Sep 2022 21:59:58 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f85a:9a02:f8be:7c47]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f85a:9a02:f8be:7c47%2]) with mapi id 15.20.5588.010; Sun, 4 Sep 2022 21:59:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Sep 2022 23:58:48 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [xum+FOfvz+UsjegE/2awC/iGF9l+k68FHlqZnakY/n0=] X-ClientProxiedBy: ZR0P278CA0037.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220904215851.4164981-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5b4b86a7-1fe6-4127-bb03-08da8ec0cf09 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKyWpuw8QwNKb6G2Lo6Ie5VpmlwHzwem1Y81Awo/dqQ3KqZ9AQ9Qn11u0bFHFcAThWDnyF/wixOrMUUbA9EAIqhai1jGJEWNRMAZWuYJgYahniP0HxEwp9m9miZxi+p+T89/5WcqOs85r8zbECgJxPJpQ60IY2trH8bpLWyxcSga+jghuFtSy3DwsDoThobOLsaI3ZRGkdL4SbvDLDEsfyznU+etJKWjj1XE8F4JfjLq16mHXVqd5JJJtpd04eGTmgCTrDqYWQ/tK5Z/DlOLzrVbHakxs+8Hbh/ZDvIKCvYmv0gJCq+VIDchoILh+gr4gPwDAGXOIUSYALVbbFaHuWpf3qXdaxw1aafKWb4VKoQq1mEb6U18S4auq+L3hbWhcfGPqXqEeNAvmVTXCf+usFMd7Ghe9qiNIFkAEWf1WnKnzkQQu/I6dHqzX4H4bbzGq/2DRYMOkj1C5d1/CyCB12wNc9Yy9x+3Au5KRSM1zLrXRC/TZlLN6/RXEtIjbytOFckS/YPP5difCh7QsQHnki6jwnChWzSMxPhpyqirG+BZClE1RbOaaXWwQjct+NB08hIOoXfWhNS0/aHv/223WWTiQjj1pcKVE+kV//wcrGZcAwQLW6J9mWHWJ2t6UNM24NEEe+JVcx62mhWUGSxnK/zwPxkzpIU5GF+LtsMkj20kv6pNd7cOHWCtRpu+Oq76TWt4BtHx6SOr3MN9hayr0qMMX86PkGVaqKw= X-MS-TrafficTypeDiagnostic: AS8P250MB0235:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1dcMvPMnSDev62pi9xVDN0XTOlvwwhOwQIlozOpFNavS4p/mjCiMxn4+FJo3pbknwWpGJmbcptUX6c6x0osL6wZ9yeKwb8G8mBy64UbIo1pEAEEO15C7Jm2dbNUM+PWMOhfzctGu0/TINgGPA2TCBFrcBToys7oxW4X0u9DNvmcmepKBb23l0DcOAa7CQVWr4yGYJFP3Dih4IFSUnrI0kaHYM9lD1ziE6HBO9F3Y+EuJ3SH5qZRZDdLRKYI5gMDgteFwBmVzKslY7TPaWj1HxsizsqeOnOpoO/xky8NpQpiqZg+WNrefHcQatwpj3QkEtWA0539dMucl1rwyFsk+gxNDd4txEw340b8C2z5nCzfpv0XjjwqKqjGYi+Kfvpzs/svn69db8L6G2Zkl7Vcwf77ELU5IQvLKX//KPrSLUlry9qPb/u0mLd+wIIUU7vt42SH+97QuEQ0KHWQGu4hBgSc/Usiwl7/CZxCe1yWR3Ez/gEI7DbFN+TjTSeSHxPw+IiurPexyqUn/S+Kpz0s0iemxJ0oeuhiWa5gWhSoYZd+CUxh4AvGjf9a2wsFp62zvS/CwYh4FP5oA/XAZ3YX9rKkh1EopXksvEy+vGlJQGLUaa4gFKYmMAag+YsSec7gjRXJidSh3rWUb7fQSrtSz1g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6r9iXlKwQYqRrhlCShYxDulWsVEam3pdWE7WXhOk9MeoXRrlx6F/f+Lph8AjOivA7ALGNejMbslopiI8u7RRm5XQggDAbG/0eBivsSK4OF5YRq894RzRk1IORzdQNp4h0j3zIlDfX5a4KhxFLTmCM0W52Q1SIZ1FlCEaNdm5k2DFf52kbt5jHXOFl1NO0oOogvC5PW+lTwkHWGWKB8WhAQCFDXpQx85J/fa37ZjR4Moxc4HjL9mfX0UCT8kF2sJdeZaFxsQz/0PY9LJcjmza/pZkVcYY77QehmJExMV7+V3RAw6r9d3Xta7IzkWCWBRuAxWaVOj3A6QYgKPdlIgKRUojDsu5ntv8RSCEuuiqAPLbKfTJ3gfd00m8p/RQk4yULX87j+WAyo5usqJhYleK+i//CgKOo3JSTrYIQ+XPc/qsAj8My3EELy156lEoXmJN9HZk/99EclCy4wzWvRC44MnlfV6cpDt/CEnjFeZE6tf0979SYT+4nO+0s9Nzh+z2MrXaZejqV2HwdqNrzOMkenF9hCQfOFMYHmY57zD6ZfrW+jV5IC1SAURyBudDST/YkMLPnBqlgmH5fkx4552cdHxN+nZ7W+IwnwiweH4Q93x3tocPIyFFkTkm5ktXfHrRped2fOeAozt775Dl+g3SVm9TTLFJjazZwRsPM8PUMddYPlkuQbf6tRsnYb6iEGeEhrO7o3F6jgbiq7ruSVfSZ3YRAW5vCq7ZXf5BLp4dqDrz5p2dOAN5jR0N1SuT42EUYs9imzxVFx6JqFJvlIKM5V+Cn5smojopyxHQn9Nqxs8DQ2JaJwHTGxZZfUkO2JFuA4D8Q0M36+YQtK+eRei6UZZ7cLbhsjMemDIhr8lr4utmjgdBC1r/h41LEJS0Gd36qsQKCDYRN25FyJAO6R87ID5Vc6ocpvxSaaU/I1R8YOc5u2ZWHx+jbuozMea7JN/77kvLHEi/70NJHb59r/uuRFhiSIg+HDjxusa08T0Ooi22z5dNAYZN4SZHghDIjryET9cFOWBXINaONwFhw6gUA9etNZBBZ6Jx6/kXnhyAWgxCUblICjanmsc9bR9l23DbCQaWoR2Xksrm8/1fTy4+B5xc0hwPSKXM2EUn1LAsn7CVa2xONRHXcd9gG+ZFgnZ12UhqOTTp6hH+SErWhHMiIlLu7W3iK7FvJMqeDA4Xg/vawbKxRaqLYUtOKtKh8Kjfg8gRjUjIXUlFTNThW5b9d28s+lsIJsVhnCzUMNWxGOqWTQHvqTwOOTqLdg4fuo7Vh6zoqEHfmCqn/AyW8FvmsanSEehKdnhH1xgLv+fmDmzpvCqV2TUDAA5SmJqAWzPO X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b4b86a7-1fe6-4127-bb03-08da8ec0cf09 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2022 21:59:58.6607 (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: AS8P250MB0235 Subject: [FFmpeg-devel] [PATCH 6/9] avcodec/wmavoice: Avoid code 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: rsmHSvQ2Vb74 These codes are already ordered from left-to-right in the tree, so one can just use ff_init_vlc_static_from_lengths(). Signed-off-by: Andreas Rheinhardt --- libavcodec/wmavoice.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index 8fa9db63ee..4438089e51 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -320,18 +320,10 @@ static av_cold void wmavoice_init_static_data(void) 10, 10, 10, 12, 12, 12, 14, 14, 14, 14 }; - static const uint16_t codes[] = { - 0x0000, 0x0001, 0x0002, // 00/01/10 - 0x000c, 0x000d, 0x000e, // 11+00/01/10 - 0x003c, 0x003d, 0x003e, // 1111+00/01/10 - 0x00fc, 0x00fd, 0x00fe, // 111111+00/01/10 - 0x03fc, 0x03fd, 0x03fe, // 11111111+00/01/10 - 0x0ffc, 0x0ffd, 0x0ffe, // 1111111111+00/01/10 - 0x3ffc, 0x3ffd, 0x3ffe, 0x3fff // 111111111111+xx - }; - INIT_VLC_STATIC(&frame_type_vlc, VLC_NBITS, sizeof(bits), - bits, 1, 1, codes, 2, 2, 132); + INIT_VLC_STATIC_FROM_LENGTHS(&frame_type_vlc, VLC_NBITS, + FF_ARRAY_ELEMS(bits), bits, + 1, NULL, 0, 0, 0, 0, 132); } static av_cold void wmavoice_flush(AVCodecContext *ctx)