From patchwork Wed Jan 5 21:38:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33097 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1101166iog; Wed, 5 Jan 2022 13:38:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJz5mizvuzuu1OzeOhPecEYLl/iYTjdbvfL8boPO7gAlHN1rPljf1qJgLU00I0dT2iI4X7r8 X-Received: by 2002:a05:6402:1691:: with SMTP id a17mr55282249edv.109.1641418733521; Wed, 05 Jan 2022 13:38:53 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z26si23189ejc.578.2022.01.05.13.38.53; Wed, 05 Jan 2022 13:38:53 -0800 (PST) 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=dBdaLfk+; 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 CAD6E68ADE7; Wed, 5 Jan 2022 23:38:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2093.outbound.protection.outlook.com [40.92.91.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04B9A688093 for ; Wed, 5 Jan 2022 23:38:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dt8LdGESnK5F9QAQHuDshF/2qQLYqez9iAGN6assm4RdT/XQ9VUMsFZ5/JariTOFoMAij3RI+MXjnBbVl7DD6oMPKwEno6roCtMau87tKqCdlzSsZjP4BREEp8+8s01A9cWo1GjLAkkYBb6gktUczoAnLpgAe8UOg/MqJOULaGwVWdtiw26NkGyx5TxB1aewBcWLOVKpl3h2wQrhWZc0E2MLNwJ/OoeMsru1gehNYbtkRCaITnUrnf3U3w55QSe5SADoGtmtr/BiH8C9nRodapKhN5AItiDg0LiNtsw1A9Fg2DeqAmYwmqFwZccrloMHC/zHGAOM/BCCTKzzPq2hZA== 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=Zspc/ZUdF/IgGjVoiIC/zW+Tt0DOXfxNaVLK7fQhW5U=; b=Jy5WNX4sPpBkqPZok4l7dv6sgGGbDuX4JiQY4LGltRnE0d72S/Z0jiCTEHM1KVx7DCv7uWTJOUQl2AqHpGIuAJDVjmS1c9UiIQrthG6bIQbc5jlzCyE1Gy8xEGbnCBh9+M5XUJv9ihlu5hmaaIyoF5pzSLHFfUaAjwBE0I07uabj5E2j4i4ueZ3gSuKXJ/FMtkq6JOOIjFlbVUyVB0V5vHRLQyJUEEq4Xx9nRVuWfNgxl7slv92w63o/gkb41Pf/s0J+6rV4mpOhAEw16oH5hutOUe3F1YRQb7lRTNVn7JMRszPqqVUCbqrecCp1QtKbFM7PwjcZJ4fbXQpp5IVhbw== 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=Zspc/ZUdF/IgGjVoiIC/zW+Tt0DOXfxNaVLK7fQhW5U=; b=dBdaLfk+OsJ4LR3Qe3/DUSHml1JzYjy4OYkF9GrmwrJzSCLRhsFgThfqICbGL/Kv92HupwHhTF4og5v8WjqSmBkcoyc0eQoa9/6rcg7wmozJyJyTQApOMeU12dZ8OsCqtwYX0kXzPYNN7DE9Zlzpwo7gYa5rzvFyF+QNCelkDXQE0ptSWsK4rehDADWxmOE2asiG839BO7eYVEdo4sh16iKQcmMyEVa3JPqqy9itZk04fYQgSJT60ZvJ1hWvjSVbEmjpcFpb36+ER6mRF9IloYAGd9cT1hJCoeOx9g8uBPweAMfoVEX/YhCPwRvydhSgbjSNWmsh5O56FHEsgKrYLg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3959.eurprd03.prod.outlook.com (2603:10a6:20b:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Wed, 5 Jan 2022 21:38:42 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Wed, 5 Jan 2022 21:38:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 22:38:34 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [yxMZ3ouz8i8Pjb2zDT/aZ1kFzfATBsbD] X-ClientProxiedBy: AM4PR0902CA0018.eurprd09.prod.outlook.com (2603:10a6:200:9b::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220105213835.732247-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eac568ce-da48-4296-f2e1-08d9d093be87 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1J9/PYC/PnwrOOca7vuYflwCqYuAUcIP17Df7Z7CBwv0KCc/45gcMRBvSaUbOZQk3FztP+b39JjNc7i/d3Qi2TnsmsCl2fIB4yOTcNgFzm9kauOTt5ihWUJFgo5Sng2nI5fTx+goozzRz7UZhLEPq3ncSqnnzQ19XKzLMnIUdU624C9ej3E48z5xrN6HaLDY00suEbaz/XS3KF9+bmGkpXdxWV/YFdM/38856KY9gc1xKu1KsiHAL/5H+HYGY2sM7DGkQEa/o6GWArcXQxKS9JZvVCZE9pijndeRKmVPyP8XoyOc5oUgwGfA3o2QVc/815T/Zd0sGkzqQXhBxWCyNOK82Mdj4MrXeXJBGFZ4mba0bIBDf4BmCnJyBuKVQRCgF09J7zdjyqRAvhOH03VrmlE3K+cgMLQWlwpG28I9vunspGdUrA+aMI2h4GYwmHi38298hLThR9PscNBiAxwDaHIr1qcMhmLPbz5Z+aL6AtZTseK7yjIuDTepZiNHNmZU5291KHOwUKR8+FOMbkT2Z/h+vPeynDtQqYYR2BR3i0iUHBeLfQTIgUiU0iKNz9hDXpn9H2DaPVgFRxJA/K+NmjVIJUACHN2XyqZSL21PfCe3Iuj0giCrfE38BL7r5driabLOz6riP5LnfxgAQm3iZTJdLLzpbbyX+fsUu66nNOVFjQoJExxZ/ItPQPK4x/gOJ3MaMnn6YiSScpG0EDFnFIrDKq1CgAs9CBcO0W2Gx/Brk= X-MS-TrafficTypeDiagnostic: AM6PR03MB3959:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6qzk5BmVT4j+Ev7f+6ukSlEjx/jIOgsDqSZqTBxio9keU2/iYoEUlRvM4GqnLmkZn/Lhmrav60WnBi/Wm2UewUYhFOTJ72iapnhAjY3lc64076LNn7QJjnRiRan00C3RJvd1ERrdDjRAf3MBsrgpjZDe475EMEi8DycVB4QPFodk15KYNlXGu0S5CRizNaLKea6JELMQ4g0RIjivLv/OLI0eIrfq46CJtKSusnEI2CsWYFt3e7HzO5Sfk75D5oMNRfNNUJtz2LQ4k2Zn+3LLT0ck2J484/WH9lo44DNnFgA/gVijZSPIbn0TfV6CrxMkH3bCtTgTZ6Nu6/GN/g+fqXQzCNYcKUFrCriYId115lD2bR2IccUeOBS6ghSl2AAFZXJU469juZPOFYTWIWHYaU8FlAd8asDIZEWyBGjIgaFrUWf3tHHuUYSetCYlHorrXj+GuycTbbM5EMdh9eeOw+G/tXacYEqaeRHUuYvG8teL5f8nS1IAPHxMicOMXSQKzxWmnVVodKidS+v7H7PtUUUazYZyRteXXGyWyCicpnYgCWG5sCcoRI2wUOMUAsI8OAK63KBv/3kE489iArqzSA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JJxCbEz87l/z4zlmb514cmsH23zakv4rdOP/Q4i/YT/cFlH+ZcwLy03ibeb3RJ3BWwF00E/9AzYP1F1zgoKnbW7xr24FUWAtHQ93jo6BdpXrVqj5JELO8TxnODC8yJ/Ve/OAVF/KMJtzQjya3RHp7zfOOnqbp86ZZ6vbHEOAYgUQWUi04V6ldWctNuaQpxQpp1YkE4quAfTy+u61td36h8SpIMU0M1N4skHsyI1fvfTaT62mMpbl/csZv3gI6WSui3tUa/U+Kvmk4cWBgyntghZ1Lv6dz7yJa3LJMozkDrFx6uWagb2v17Y2xwDlwB6c7AmXVlY6lQCKyzpTzGjlMS/RItRnWAy+dWfari6FZ1HRe6toBashYf5ObE+QkjSp17wpqGzRD724LV6GIg4YIJOhWvz89YKhPGVQ+sjRNoY33ZwTXhV89dSOJm4ZN8O+Ua4o5lp2zq+ZqXSQLYe46d6D1J4s65BT3e/jc2oqJyIkOHwgBx4lwutSkwIK2LDUUyIZ7jdYY9CQVNvApLfZ+FW8OqHX2NRTrJoi+DTVBIFcPdHs4yourqFMTaCxQ5+/SGl5QkBb4TntHLbP6A0973SWDlyZk5TnfuzngDGi2oMTWL+pxP2MiiMUGAtUA4upvXzfVt6M+1kQej22dNYzT+Lc+gGf1zDQFrGkvpjjrd/do92I7OCN6wNVpP8+7CfoaisLropDDPyVSEHV7PcwH+Av9pN4TREn6guDFnZBPr7WzW+ekL5PIJjd+1qWNVicZLiOQv/sKTnMwVIXaawZlBwkILwD+3HPKiKV8YfcEDPXYyfOKi6dAgZg+Ikl2NQuO7sR4LjC52etftYMEi6azs4CV6C6wgb5aA25yyJv63qlr4+F0GIiW29IqSDmR4g9nyU2/DrcSIC7ymwg7jkjOmFS0bYe1htH3y1EYYSKS8ZKQL41OKssmsZs4Us1dCUVGqEu5uBmP7tZxoEvsH6uFg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eac568ce-da48-4296-f2e1-08d9d093be87 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 21:38:42.6874 (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: AM6PR03MB3959 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/mlpdec: Use get_bits() instead of get_bits_long() when possible 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: h8T13SB2exRK huff_lsbs is guaranteed to be in the range of 0..24 and so is lsb_bits here, so one can use get_bits(). Signed-off-by: Andreas Rheinhardt --- libavcodec/mlpdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 29fac54542..61b9a641dd 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -268,7 +268,7 @@ static inline int read_huff_channels(MLPDecodeContext *m, GetBitContext *gbp, return AVERROR_INVALIDDATA; if (lsb_bits > 0) - result = (result << lsb_bits) + get_bits_long(gbp, lsb_bits); + result = (result << lsb_bits) + get_bits(gbp, lsb_bits); result += cp->sign_huff_offset; result *= 1 << quant_step_size;