From patchwork Wed Jan 5 21:38:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33098 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1101355iog; Wed, 5 Jan 2022 13:39:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSnfyqDSqLFU91p9zEj/mm2TZMdXQBl4q7CkLXZ8QC/xCFdykef4xXf9smCLls+8/l/GOO X-Received: by 2002:a17:907:a089:: with SMTP id hu9mr45464881ejc.448.1641418754771; Wed, 05 Jan 2022 13:39:14 -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 sb38si22388ejc.620.2022.01.05.13.39.13; Wed, 05 Jan 2022 13:39:14 -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=ri4MLBXg; 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 E811668AE34; Wed, 5 Jan 2022 23:39:10 +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-am6eur05olkn2030.outbound.protection.outlook.com [40.92.91.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5DC16881C8 for ; Wed, 5 Jan 2022 23:39:09 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aVgZOCbGgL21N+CwG2DMsaE9oFej++FLW5IO3Nj45ZlnZo2Nmrn+LZw0FzOeQvFuX4r0tPTOIKMqxCcGGZRjir7+7TrNZXhqbegzkdDJ3YS3D2fXUicrzxc1ATUBEjTMXjpOJgqsu/KYlntIF+Gk8Ui542Vc6mnMbBWYtNq5iDSzuB1r/YCsv3lktvaZFVdjC8Wa8z6PN7++rNTjaO8xRdy9rovavVKklZpNDiDMnvflfg+dhv7n0jpy7595v7vxh+eKXpfO7UkAACDFDYdf1T/tGykIDMrCnVdO7ckMF7/8JPeR5Si+yCNfWl1lgsC9RhgEv4KahwV4lQu5c0dzfQ== 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=Xmdw7sBZFJ7iUXydMg3mxqhFpr0Hp5fA4Ikk5NaRhTE=; b=D2cEJDXqP/2rP1GGS++RBGm0ZbB6dmJHSKJxO1BhZpwQS+S9xiU7Rwchif8NaKTfr5qHE4o3Ti9RwkHHA76PVGjcNUgxouC4wRIjzGbHEaRxH9EGVsOVwn1NpXKVLoDP2WOCWTDmChOsZWudvkCctB/qJ0jNvdlrtBQ5oQXSC1D9RQC2CSwsPFy+6cIcwetnBmbNfKw8X9dpx3J3VKdKp266BOSZeTs5juGXgQSbVHw2G5pqvlJI0A/P2CLS7a+9sXJHh79U2VikGLU68A9IYn9bAyvFc3dHCP+A3l1CLC3SOpv1u4QHm19Ph9zWD1qOvNxGonfSa9Oe3Ea6zLgnoQ== 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=Xmdw7sBZFJ7iUXydMg3mxqhFpr0Hp5fA4Ikk5NaRhTE=; b=ri4MLBXgzKmeu2Rh6bW2vmtj1WyvxxbUJ/pmty5nFrN62ZLftuEJInTVwJe6lZpeJOw6AeNumDG3DYTTMAOZ3HXJf8XQMmgxqBKl0IyeON3WU7Eo+E1YhMOjwO76EEjyvJTfVdNN+CadnBa8tmXOpptwhxNi53KiGzvn9ePpNEdCBZHqVWMC5GQ5cGYTDttoHwdEtXHC9PoVImzPFv9yIIAVm/V2wyKDAZosK3KmNiEt6BV4uggx+lWDMFo2A0PUsxLP/bhIuFzhIx7cfhsHRPO2XYabGcjeEDPU8//7osDXqbIl29aKSKN66/fcxSMvnQDbq5HWTrSRbq2zi8euyg== 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:39:08 +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:39:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 22:38:57 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [DrP/DKq2dEr0whRIbPtr1IyUczRLEFCg] X-ClientProxiedBy: AM4PR0902CA0003.eurprd09.prod.outlook.com (2603:10a6:200:9b::13) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220105213857.732312-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f3006ad7-9c2e-4d24-d8e6-08d9d093cde7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JV+MSkOQrP/fLRNZgglVpZtXOx9X6+nppREVLtJLdg8PrIKfnU4eunbWBLMDFhGqna00Y+/Bdx13w6eWVFRxmTXZUNVVZqdS6bmnBF5uYCg4f4uBRTnHw+RU22cFEScj+Y7mdiiPWCjukTp1EMA/0FrIgu7rIqbFP4+KVu//55eGkbTexbNfCiQQdjAfEVuMKJa+8nV3/01VjXf61MQrG1gcvbc+QKy11xnM/1EkGoAnZDPscSCtH9H7yTvMv/xFinBruAT0fhHSe/sOQ0+HaXdxTiy+JZViUr6LKqBx9sFcs+MSg6dp+hmyTvZjTIvo4WAxnEUjrzzVi5yIgCP7SmuQZf5deIyycvaDQcJs1vbbEvKSi7e7bbWUq60CgV1paJVypYMcS8FtrLIRz0KNlbeRHM/LycG+SM+GuUXfINUVzOrxpvlidVl1xKUIIWzPb9yL2d9NcGjLHxaEdqUv+F/sTYRBNGODvEhL8MPVvgNHlUvow9dDFP1uhjmuaFYLM+GjTTZ0/iqZltCh1VBz4iN0JBS1gO68roTmDOmCAFMr6ToO/3rgO6e7mjQvAWZGlfyCGLm816FDXZe/tr5P3Wtp6Z95uf0CVfQjSGubC83mY9EaghZqsQcHKF8rCgVhIBnssuJmx69IZjF5xjZMnqOm9HXIuutFzo0MCL+rxVcFDE0szzPRVISXa1RfddTpcWRxR040vSDX2w4CHyLrVE/E2vBR0fQ1VF2nzXspUajE= X-MS-TrafficTypeDiagnostic: AM6PR03MB3959:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3DOJSOvejb946+bdZ1smir+GJbe7lZ9kvdtI6xP/9bay9HK4KHdlbeO262QLn7sfRT7LudWoMG882G047o1Mjp4ufW7O84jhmHcWhKwjubiclZufyYlY/xVmoc6fjU+ruHQJ1lvFA2lJkZOSZemmvIkc7AfziQm+WaDDdrfDg9RAqWQI2f0WHv4ADvgBU/o+QZOuhcZB/6x5s52qq4GAOcWhe7W79SFIkfO97FNq9Q7oQ8YoBslZMQFY/pnP2k6KDGfPvXCkItkGLkYsdInJx+YIIZpCjoP2qhElV51gdUkGztmPxjUcIMvLnCmx/YBb40kVENmx/nXfnUzjk9cht8kJKPxqjjQq06Ls8GFabWs3FQ4ME/GMD7Bnrpc+5moseXho7qdnarNyuy6+u5CnRzLkXlXDuR018yk0q6iTR4lYs8/4GX8CRdFt3s5qgfNFJsRKyjRkmTcP8U8L/IDKdUVW5/c/wy9Q2QTMfPwlxxlQ67FSFmKt7SXhQ5UcrEP/xgAdQp5PlfX5prBAKMooXH57I2lglqLD+Ez645cY1H3y9E5IkgoF1gXg4/GVlCHK6ZNmb83HJx0XHRbwHZdFqg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uuVFfWEs5GkyGTZiUr+6ik8nb+u4zm3w7JxT1lPbf6LP6VOziI65/zF5kGSj7fEuM5tG8tHbVG3ONp5fXeZ9oCsr4jz4Q96V/Vr5Q30RBLKC5yV6xGviAEqzj9oTmi1RtyW8BW+Y9N9/ccHWbNlg6QVgSMBsdFMHXEfOo/om+p19vXqPfC/xZYTozE2XAdkBSPxqg344athVm59iM3v/sLOqOOawZEOmodu+Nqt6Hv4WU53Gq8DNwWi345HN28jAvOPOV62mxn0Bu3yzlsgC+hWyGuiuPbXdVmSmWL6BRSPWdLq1ag+s6xr/42XBH9yukcrRefE3AjUK/LfaDuB3yHXi8rb9wri0FFZUkbq1fLDYhahwONgBfDNTB4d7ryKvXeZy+SpYD2Zo/sspZPzAH9F9oJaWVY5+OIPUjsH58Fv2W7cVIocGqvbszYhyrbWcrRdr654J/W3mv+/IMy64NWcZwHffpRS2Aehvm0zIR3+A5TRfCiytZTafBEhDpCmtdc+c2XrwNvXIkSXih5SXK4NFwu/zBLtfLOUnxqm5/dmy7PYHGzrg3Ns/BPnKn63I+4wNmoNg5f3+eDG7/JxLqtwAFZiqj1GW1Jwe6V/aNwIXMhD2Uuh7Vvsy+NA7cHDP0SuDCnDbp1DaWSH+W8uQ/J+G+sjt5V5AmKU5vEKj6wjuodmmOZLx51vCCvzyKouTFDuilQm/h2Xq74tzF98xMx+in1gtzRWRSXPU5/zG1kXK1j+qJSvwNyWIh3HKDyuKuoCpVJYdbr2ZejDdOJOqBLzDwh16JDXF+q5Aqvh5kalXivI8t9PLvuTKNSyk3o88WeDe7FM0cDeSSDKbOdrhBuLViVFuHW+WkzJnuVBMvU7VZq4831SLJ49u9x0dQfY3+KiuDiK5BhKAIj+J6yjXFN8aEN1Jrkd3ln3pLbVTfFglzrE2oLdyprPsf7E0AOyH7SBodFyeu7XTymbjK09zhg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3006ad7-9c2e-4d24-d8e6-08d9d093cde7 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:39:08.4804 (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 3/3] avcodec/jpeglsdec: Avoid get_bits_long() where 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: u9N9iU5FDOR4 It is possible here, because the values of ff_log2_run used here are actually in the range 0..15 given that run_index is in the range 0..31. Signed-off-by: Andreas Rheinhardt --- libavcodec/jpeglsdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index 32c0d2eb3f..269c71dc18 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -277,7 +277,7 @@ static inline int ls_decode_line(JLSState *state, MJpegDecodeContext *s, /* decode aborted run */ r = ff_log2_run[state->run_index[comp]]; if (r) - r = get_bits_long(&s->gb, r); + r = get_bits(&s->gb, r); if (x + r * stride > w) { r = (w - x) / stride; }