From patchwork Tue Sep 26 22:17:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43948 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp2210477pzh; Tue, 26 Sep 2023 15:21:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGDAYX41SBQknmj8xmO6/797QhEIbo4ZlFSdKKapeLj6f0qjpZS5Pw7f9q9sokyhUsAnLAh X-Received: by 2002:a05:6000:1c7:b0:31f:b7b2:d4e1 with SMTP id t7-20020a05600001c700b0031fb7b2d4e1mr42330wrx.20.1695766899900; Tue, 26 Sep 2023 15:21:39 -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 c19-20020a170906529300b00997bd26a559si12777552ejm.881.2023.09.26.15.21.38; Tue, 26 Sep 2023 15:21:39 -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="nk/msuS5"; 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 67FA168CB34; Wed, 27 Sep 2023 01:19:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2022.outbound.protection.outlook.com [40.92.64.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B08C168CB30 for ; Wed, 27 Sep 2023 01:19:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BsPLQt8Zw/cumhBHC0g5RAfAu/Hmc7x5043nPriBl8gAHMguRAeSHCfzpkdpKO39Y6dY9onAPCt0CdK22FB93wVHr7I9PZt4DC2ZVQ65t25gQ+cZ+B2NugnSkH94//9N044jZtpw/0SOrRNyg3R5/J81OYWe+p8+LKFio+7Lcu5JWtxVaJ8IWRC2EI5p/1469KMKpVHBTCoeoqVUSQ07xJ+GV31Y9Bc7sdeRprW0seEUbZ2MzNBjIp+F6oPv/bkFweZIllOWaJfLleD06KKKb7tdmr3sbWRmxHXiylYv7T/LMk3cs21/0xDl1v9b3zfHv6NpvPOkrpCz9nJ6umqS9A== 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=yx5cJZBP/sXZR1s/MreZ9EyjPcYSZnvB/NqUKZ1IcLI=; b=QQYLm1cgK0dWCxld9rK1s02O4VxTeDM9Ul0NI3vrOmrsX6oniy0Mq8tNruDa653tNESPu3Jq6jMixeQy7qONKwaRVInggVD+icgio+lcqQ9sO/dNxrusWFmNPo7c/5AeYZ1IVcHrermljNO6yysKi4lVDnpSh9bJ0CXbalZXo90yhr+x+vLEBqAgtwXkYyapAaK9hFpEVGpIiLUUFHRRt/CeZfAtJDi+jr/Ve/N3zPCKGbLR6+F8bVv1ZZZtoVTzSaU8QN5YaryNQbdc0V6N3WtBC3qDJgb/CH7L8f23qxE3dAJEjKRVlDA0bje0x1nsHcVBXxLy1MMVrAj0PrA/vA== 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=yx5cJZBP/sXZR1s/MreZ9EyjPcYSZnvB/NqUKZ1IcLI=; b=nk/msuS5pPC/9arw77aahhCIBSA4IzZDqVyMvaqsR5B4PQ8tp2SoJzRthAHtUzO6gHqDgl4ev88LphjOL8YC+ZSRb322tt5CsPMmRh3wdQXwZ3MYQTF7aoDTCzOgSZWYgBi0qEhirHCcGInLfqWpoRMLrtjDvhCSbh2RHSrgVSJ2kpb9M6qD98UDQZ1n3TFT+WkrYVIsB6xBtMc+Zo2EXeGzcvOt6nb101INn0lR4snaI+gFR7jXzZFvYrnsAJV4tQr7KG1fhNNMlHKK4tmNQgoO8maF4WcC9+wetJu/BihlqOPmPh09+pDtVCnL7u0a6wz0S5MsgDLU03XFKvzX+w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0393.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::16) 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:19:53 +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:19:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 00:17:07 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [DDiaDYxXoGcLEyAMehss3EXBQrjI6amM] 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-35-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0393:EE_ X-MS-Office365-Filtering-Correlation-Id: e3bf2882-22b6-4ff7-761d-08dbbedeb4bd X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8acliqRepSa4g8GF7noDBVC0LgBQn8aUOYpIdsAupq762Fb/Nksshp/9bU/20/+Hmh4zOJOGaK6ugWuB0L7L4CfaYAZdNq+02FdMj7M2+6EabkfduMWTwdFO1EPjsyslwAvYsKlvw00wcBT+0F+HRNHA5OxUacTl4043pBABOHnrwJVdvu9kbkfRosq69LpDdheOIpJpLlcvdZICKLrmFoaMTj+CnyNY5QBW0aPxufzt2p+6xj1Yb+Ivvz8TdRigDou8/PsqQjfPN/xsI9lszh66QVmNlTiE3K/kbFL5rybXuaKEGg6yiKeIjvKvMl5G/rxo6Oyn+nCKBQRwRQlwwFKKeNSJcd11GPMzEEXchgAlzasa8ALO+RNMTd7GiG1pCqEfCH7DPdtHs3akQZDWZsAggXF0RJT0NbwxsyF5XqB3A3CsaKDXifodQtNDypxyBT9ckNWKYWG1PwbZVjGDOMSaaqmgkqHBSiwF5gPyF3YNh0QUjihf6GpVO9nyHKs6tYXmS3K947XuNCVLiLB67RFBArwIPjdN9VwFAasLmjZG0Z2vJ8UWGyLYO5yam94cG5+jHFuBc1Q6aBFRvSh50A0Ae6jNcwspws1BV1TUfAoQcQQLCn8fSXVv5Uc6qPh6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MCJ/5tUu43OHsqlQLD8xWvCkMAn7An10VBtp5wMTPMza3xHgRIPgexZRpUhj4gsRpBlo7gOdUahk69c26/oF7umWSdqDHNIkSvvmwIBRiuA6+116kMoAnykox+FS3pkVZzHGTZDWZddJTfNnXqivurQhtkBK9V5wFB4Ey/3pWqX7vWKbFrmCHVTTn6h5Q9kMnm939zYdVcZ1OwUcwF3RXSdAJ7N5x7zazPDixXJmZ9VMDEaEwazKHrDcEjizmwJ3quiM3Kow/dGxrqR5T3PWGaciiUZWNEhY/1gAsiFzMVfV79RnCwENvoE6BCjvqYFt9jKA9LZlss1xZVZqo2L2f/3cnkmVbW2ocfE7rctqBqqajZtlb7mYGvA7ZAx8qh+oXcYGXKuy4tHRthRifH1ag335uoQFJEJKGnXvuLYan0DWfzkPGjuSp406UmunFUAZGXZ2X3didf28+UTmIaHWU802uxgMQ5JdKpfEIj5MPQc5hpRbpziA4iDn9GIxsdchlQEcVDm0AoQFpHoPjjg/fmNb63kwfVRGYdVO34xvwK08LLdjVsGwXK9FPZkPPzcU7xO+M3Z7VevQ6x2tSoddohAIv67D7HP/gYcXHG8HT9duUdEie9pQrxlLaedPZmv8YaJBCC9hRVs/nWR1Zf92BDZ0PJz983lpGev53VUruZwOj9yFwirrYa4J6awNatVPFtHF13LtkIV2A1GFT3E+SuV0mIGZgmi/UlBrS4qEN7dkc/tFes5el0vvAk0GNjbYxqMC+4Bf4NrN6OVtYcWlXTUj9Q2IIJWRPXoMLVpgeLmtsSZ1LBRsrxo41W1HMBQX0rtGGp8NvE5WuveAzv/KGtIOx5bXEyepB52HqcL+UpVtkPu9YFLBBge942n2HpdSVlNENnTrMslSps+ns8qZ0/EUJA4QRc2Yv3cJHk5owGi0rPFT7rnev6IDjKVQAWpIAxgMmAFr1ntr+seisNjfd7+4xnXjBNFwseeDdZdExXkCXqieaZ1z9CxlqORDjZxotQfAd4ZRPYose3IqQitbT+lpYvD57SgZJpyMB864cFcPhV1ItzubPouZUi+o4Jen5J4VPYeKd6l5DJaDa9iyS9wWkkHbc0UnlZcujM3/PlC7DstB0IDOjPmJJz9yNglfOht3No+nzM2bAeNALMSGLY/ypULLuiv/tey4GunwSaLBxcd0GpRNCdxTagfEaQGLVM1RkplsuQQ0LmvMJG+VVFoZD5sIHIH6xsgVoUvxNxg/ZFAA3y/sAniE8sU5Kczq X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3bf2882-22b6-4ff7-761d-08dbbedeb4bd 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:19:53.0082 (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: AS8P250MB0393 Subject: [FFmpeg-devel] [PATCH 36/61] avcodec/indeo2: 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: 7O8fVtc266Pb 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/indeo2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index 2f64320682..6878ab7cb6 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -42,12 +42,12 @@ typedef struct Ir2Context{ } Ir2Context; #define CODE_VLC_BITS 14 -static VLC ir2_vlc; +static VLCElem ir2_vlc[1 << CODE_VLC_BITS]; /* Indeo 2 codes are in range 0x01..0x7F and 0x81..0x90 */ static inline int ir2_get_code(GetBitContext *gb) { - return get_vlc2(gb, ir2_vlc.table, CODE_VLC_BITS, 1); + return get_vlc2(gb, ir2_vlc, CODE_VLC_BITS, 1); } static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst, @@ -226,9 +226,9 @@ static int ir2_decode_frame(AVCodecContext *avctx, AVFrame *picture, static av_cold void ir2_init_static(void) { - VLC_INIT_STATIC_FROM_LENGTHS(&ir2_vlc, CODE_VLC_BITS, IR2_CODES, - &ir2_tab[0][1], 2, &ir2_tab[0][0], 2, 1, - 0, VLC_INIT_OUTPUT_LE, 1 << CODE_VLC_BITS); + VLC_INIT_STATIC_TABLE_FROM_LENGTHS(ir2_vlc, CODE_VLC_BITS, IR2_CODES, + &ir2_tab[0][1], 2, &ir2_tab[0][0], 2, 1, + 0, VLC_INIT_OUTPUT_LE); } static av_cold int ir2_decode_init(AVCodecContext *avctx)