From patchwork Sun Sep 4 21:58:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37661 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2274961pzh; Sun, 4 Sep 2022 15:00:28 -0700 (PDT) X-Google-Smtp-Source: AA6agR5vLg5qb/qK0gJTGhwNSXjOA2NlXoA4GXnuAmJMVP6I9nI4Dtp1TutwvK0Bh/ltksEMK8P8 X-Received: by 2002:a17:907:a0c6:b0:73d:bb3c:328b with SMTP id hw6-20020a170907a0c600b0073dbb3c328bmr32772366ejc.354.1662328828571; Sun, 04 Sep 2022 15:00:28 -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 o21-20020a170906975500b0073d6e0416f9si6967933ejy.671.2022.09.04.15.00.28; Sun, 04 Sep 2022 15:00:28 -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=JEfE9gzv; 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 7632968B9E6; Mon, 5 Sep 2022 01:00:08 +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 5100B68B8C3 for ; Mon, 5 Sep 2022 01:00:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WaQddanoKYgC1j/edvvLXgtYK1Elkiqw4yhluX0AOrn/AK3pIUGjhqprn9Aw1hJzUJSU6CEg2Tp2eqsfjAGSwoiND0Hl2Q3ZsdKRZGMXA/95H/MZq78Wsi3B1s4KYUHCJqtROl5LwmWP301cDI/mPDcw01bPu5rRk4DiXQmaNy/dKJm1rTXfkwPsq7XAJJJkTRPOZ+GhqRU1yJ7T88XgD4LqoS5YRi6mBN714YRzrJY/f6jnBIZ1MX7xGYw/OiiPcTOFLN6G1sVnLhMwvRInJt/9UZDARtq6M06oh/giOt0lJaxs4zQZcR2mOc9ZhrLjdizhrsnYcwMU6DsN9sD2fA== 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=Zc3Q6lGjdV33WhC/llsyQ4q7Cs5XO2LAfBuMetQVkv0=; b=DJN4g1NGtmEVhPkjGwCI7LrFywE0qJHoA6aaAyhYj4opntqshNIOUWhTWE/BCI6dNNeIFvoknSZl3Bk5xeHEMDlsEe7BU9WAPYvWdCcnr7hbhg2dxPUjb8EQr2n1YTK7mvEakWV0/vXb5u12Vuay2SojDNuBF8zfh8/oyuUGx11k4AdwvilSQHacjqSff4D1C2HQodhj4/lVOOplpNU9z0KPfSXz2EyPZIW7JX2SsZepcwQAYWwOC30KiNe4N3tSYqjN9OCKjolWJ5aa2lh/Jea5+rwdMjnU80vo6mLOegm8yZneigHxked1pMBG7V2strmTx1d87My/UQoPnMNuoA== 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=Zc3Q6lGjdV33WhC/llsyQ4q7Cs5XO2LAfBuMetQVkv0=; b=JEfE9gzvzOuYbgsHQWbUYBg46IXnpD1ivV8M/rTaufROzIhfcIRry/xh1rj4tV1mY+eBvMCZl6zPfLdf7IDvKw/vHfqT+JSS2Ms8uNpWOTsZm5SSNBpunonPmDMIf3Q2LyHq3mtHiE7VYe4iZwYM0fC5ytNP+ocEfrznbhNr0HKdxhUU0PWZzxte3txgOpQh4AnzVfws/afm0JSTP0hXEDUUpSWhAPA7wSomqIjX6YCkT8TMvXGeaG8NqRwMyU+oAsNN9uo2rtu37l9HXBZu2YNXu7E829LRps/W338BM5vXak/XtGcdK7fSeLNJLJjGttskHiOWHyeoGUvYDHI7dw== 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 22:00:02 +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 22:00:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Sep 2022 23:58:50 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [YtGftLedRHu4IbSvwMBjLDiENr0CJITOXoMlQCj1L8k=] 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-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 662bae62-df78-4cf1-4f64-08da8ec0d103 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpOESH07gTfyFtwl3n8uZhuc4hXAl/ISycNPAVE7a/iyc9nU4EFnyWhLiPtgFCK8hhhJNJZ3KppAQvah1zWN3arud5O5iZ7oejHz70qZS4k1rRzJ5MWdRohLLyVZ0t+No4jjodcUYlXQpJjx+CJFdc9pNrnNuRnpnh8KUu7PUGERg4ODbBQ/GgM9sT6II/i48fLlwu+hkawXdKkTkSp5f+nTmPXZJ4hHMxgy76quDLg63vYL5x2EVeh2JUEGR9JbzapTrVxsjvDM3LNhZSiuFV5tWKhlqWN2/LltZw/ORDZ2j+xusO5Te4++KcM6eJX7G10Dp6ethRalrLI28rhK0CR8VDxRwjwtyb03SoU62sIotiBrDFJAfdlT4D+umhWXCacl/pMoPWjr3D+zConlqIfGEG5PoQRv7u0sn11Kg41uqxZEI7iFKxg/w4Gt4uNPd/Hdgwd7itze3vTsR+jQBBijjtbyrjIwKUxBRF5rH4le4eIHE229XdEYMOeq1OUpWkxO51G+cvZCn9GWyjTeKb8LQeKkJ0IynnjuYMgg4sdkk1FsuxCJJy9t5yfmgKpQ9/zq4J8imQ9IyU7VBhHG0OQFJaeu2xqB9Q97thmott7PFmVGkz3qD2cYclvqLyNVoiGyOnUYtPNl0OyV6OiN0kuhe5kB5Buww67AUAzkS8SB1NYflDwFDptL26ESI1TxeZzv4b1evBtcgusNrCQI03xwauuaBCTw99ALwI1jor+TQjfcck9/C2OeTosxoooAHk= X-MS-TrafficTypeDiagnostic: AS8P250MB0235:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZOe3cHBK9Q6aVW4sGEP4bYWzg2hUvRFidlEIRPNqhqwD0jqW2AlhIdJkp+5icYVQWLk7lKH+PAo6crZYIrLJyBMiW2+JNHnLHNoc4t+Dx07ENpAH6UVe3YbUccmNtYWrv2GHzrTOMlJjAtVuC+71j1+G2zoKJiVT/eo7h0HkrZghdO48Wbq5wph4kjCPvJDfiD6YOx09rdiZfKOt+HJaMkEoCT8AM+rsekgjhDc5+5uALBcATyYm6A455X/JajL6k/kV51wxUPUVUptsyyTOAxZFID/IG+1tiPN4fI2gVIa7oadfmJZVkZOulqXd71+mGzlTvM2oGO2qsz0JrVTSSu6k3/aJM7v1lj0C3J2YPFPpEMN9/CaqvaEkkicb5xeqpUorisn/F08fcxKs+vMSkUhJbA/ING1fBFUUwifx9pTsZlwsFZPkGlDE/Ydmau/UMGXWJbGJXqbkrL7FxWdxvsQwmfJzne1GEniFevNJpOMYAm0zI8z5Wd1iS4yrpDH6QB7IOu9z5YZk4hQgepDBCfHn0T731HiGmd5HZTWsWqgx7x2fg9V1CyFpKTqbcDbR88fHt1Se/E8WoUrkrXHLjrWf108vmFXg972JM0a5PQkUynfHtiDp7wETy2ynG/ZadLgq9viNUHgaNl4k8hSn/w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EG/cwZx9UCx8nCPib6lfhPoPiw3OlSmJHnWCdI3LDFff5YqBlX9w0++G0na0KIgx2sK4Zam0p3qr/KMHm0W1+LYOX6JsrtAFfWO3bMDEugzGYT3jOmb/vc1oVzrhoPhy3BdZ05M5qCnmAAXRGfPpZX/b/l0yGeiQjqHVPNSW4SKMoZEOh4sni9Cd3+cffH38l7g32ID3G+gL1HLxTuCXx0AVRmslXpSjYRtqC1Oe/+n+7/v7E+HMfy7VatW1eRJH8YmJADlw6xtQAFnJ8hplGCse19DvjM6Gg7U1BJD4pv5IWDe1q/Y5i9m4zOdRJc83rYXxLIfiTFqbJGBwp+rP27uh6wIiHGobe636CyPJzY5tN5Evw4aokj0K9VLfZiKMPhN5QWbDo6OEG6aRcTBdVMzbyiL3UN6RdBn9Y1bkvLQ4TP2yM5hiilDwV9ABjzwFde7+MssJkklFmaMDtDk1MVP39IUBUKpqmGqvevS/PX5RSB1iqpYk0V5g3lzQpOMsX+8TBmiEGQdeQEKnhMQ9Xdvi42H0sR9zVSKbjKq7jcc82PSeIriywGbYwlf8tb+cTDxm0G3MEZx1+buHnATnjEZ0nmrOeCch9uUFA1yWoq853gCmJAIAZ6ESDzAgghyCXxbStY6IXVqB/TDRlv8E9CUyfeDwndtwShkILOtxbeMlDQRRL/Av0nxVIQ/2wTxODSiM6bN/R9/ubgRy9vqmtTQpVmMpNHUfB3TuFA8tgAqll17SGygzwwUPoaWa5tt8/zThsPvgbne6AUqLb+/XGphZg8QDEiWaN9eFaanMsOIsdMGkPPq6lupAp3ij9T5UUXva9llbHHIc6ewg2q5lzgX7BpTMR2rwtVW9pCHdVWuxtBNlCt8uIndpGAILFyyipfoFPTdJ1SWW6v1E6L/MkINhPhV8M5bXhRMJWK6BGCvhG4rnIv75ffLvFFQav5PEOOoNfBqTRC/5UXq4bNvO5J6NsJt7KpjAe3pNNehfnBjYrI2rDEdlgYARYpFkvyqSPqgxWmCpRJVX1c6q9HT8Ild0qeVkMxjcFOHPLhDjzObFHim0DSMxdnQdLaqctCyI/CdJ0nniOERm7Id4B2Cn6NM1lJBKb4MIuLepI77Y5evaBFb0vQEX2K5R5L4RVSn3/G1PJMj1qS9q03Dbv8Nf34w1+SUxwgNaoNP8SMCH5J3Nsulk6ZxkAzuBT2lEDe4YJjRa5Lfm3YlI7M8EA8OBfngdVLDAGhE116cuVN/DOPFU3WppN95a2E0fVcPiJifbhlzXgZDB2kw3/YpbfuiCLTXSN61Sl/QnLE6+KLpQCPuc9oA7dWzkcbb654t8XZJU X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 662bae62-df78-4cf1-4f64-08da8ec0d103 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2022 22:00:01.9741 (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 8/9] avcodec/wmaprodec: Move applying offset to VLC creation 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: Pxvtkd1UuFF9 Signed-off-by: Andreas Rheinhardt --- libavcodec/wmaprodec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 1909ce2dad..698841dcaf 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -320,7 +320,7 @@ static av_cold void decode_init_static(void) { INIT_VLC_STATIC_FROM_LENGTHS(&sf_vlc, SCALEVLCBITS, HUFF_SCALE_SIZE, &scale_table[0][1], 2, - &scale_table[0][0], 2, 1, 0, 0, 616); + &scale_table[0][0], 2, 1, -60, 0, 616); INIT_VLC_STATIC_FROM_LENGTHS(&sf_rl_vlc, VLCBITS, HUFF_SCALE_RL_SIZE, &scale_rl_table[0][1], 2, &scale_rl_table[0][0], 2, 1, 0, 0, 1406); @@ -1056,7 +1056,7 @@ static int decode_scale_factors(WMAProDecodeCtx* s) s->channel[c].scale_factor_step = get_bits(&s->gb, 2) + 1; val = 45 / s->channel[c].scale_factor_step; for (sf = s->channel[c].scale_factors; sf < sf_end; sf++) { - val += get_vlc2(&s->gb, sf_vlc.table, SCALEVLCBITS, SCALEMAXDEPTH) - 60; + val += get_vlc2(&s->gb, sf_vlc.table, SCALEVLCBITS, SCALEMAXDEPTH); *sf = val; } } else {