From patchwork Mon Nov 23 19:37:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24001 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id B5A8F44A49B for ; Mon, 23 Nov 2020 21:38:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9872E68BC8E; Mon, 23 Nov 2020 21:38:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 869BB68BBC9 for ; Mon, 23 Nov 2020 21:38:34 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id m6so19782370wrg.7 for ; Mon, 23 Nov 2020 11:38:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=PbeqjXCa1IXIvK4tg7UTDErx7fdzzf+FarRYt1QQ0Xw=; b=TJR90nWO5Qn9x8aVXoEBst3sH2ASQA47Y8YSRI2gdrd9lPo8GSvI8eb5KYywv90DcV DnEWKW5+uT3qKByb9YQZ1GVyRv26yksUsnqO8QMcVYPp/lP6sL0fKi3eQlxtih9FGQ72 83eR5kEtFhHc8d4ODxO9eltOOkh6rMIB2ZTg0RftIqhh0IOiewIpy7rXanh5zlsAn7zQ pk1hhMb+ujFlTy931H9N2ku3qqgJMe1WCuym5Zhqc880uHJD0frihhBnkyX/Jm4NVA+x UMmTzGm/6FDygJMA6+ly6X/9WxtOJeVHaLtSdC5mA2j+0LsL4kr90L5VF38Q/XSfPrCn z6KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=PbeqjXCa1IXIvK4tg7UTDErx7fdzzf+FarRYt1QQ0Xw=; b=ZMQzCxDggzWWPXUuO3Vqk9UmuqxKznPXPOudFgqvWovuSL0eSJDzdgSFHnyxddMEUy wihYzj8qQBVoTPm+761e8aet8emamN9g678/MrktiRCnaV5t0+pWJwXOtvpHoqN+C91y 1T2tpBoP0SniHkCXvb3sS71/StqiFwQxloh8J7ui40y/AL5G4vOI1N/xbZgP6x+ztPPO XzswU+w1USNin1uPpndBBuPjSssV/qWe9zBFFvdxLiMgcy2iaQFjudbO0i2I8oDKKq5C 0Yp9jC9mITYRpEfI5e23zZZibMf/towycS9QXXqxOWfYkPfgvRKAIe+O3Ld6JjZ17yv4 PwHQ== X-Gm-Message-State: AOAM532lmeHuPnRieVKKCCxWXdchU0LUyiXb63q+lVa6E0//MVO6zCWf LrDEAOaeP1Eu0uRhq5I7UpueKqsL6/YbZw== X-Google-Smtp-Source: ABdhPJypwmlyEWmjVwOM0FtKd+xOtiXlgQ5FpySRl87R1Ss4MGHajRR+gRFTJxwUHgT46O+N35OH9g== X-Received: by 2002:adf:9787:: with SMTP id s7mr1305889wrb.286.1606160313721; Mon, 23 Nov 2020 11:38:33 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id e6sm564086wme.27.2020.11.23.11.38.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:38:33 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 20:37:39 +0100 Message-Id: <20201123193739.1249300-29-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 191/191] avcodec/wmadec: Apply VLC offset during init X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/wmadec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 2b9499eba7..9c79556bb5 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -112,7 +112,7 @@ static av_cold int wma_decode_init(AVCodecContext *avctx) if (s->use_noise_coding) { ff_init_vlc_from_lengths(&s->hgain_vlc, HGAINVLCBITS, FF_ARRAY_ELEMS(ff_wma_hgain_hufftab), &ff_wma_hgain_hufftab[0][1], 2, - &ff_wma_hgain_hufftab[0][0], 2, 1, 0, 0, avctx); + &ff_wma_hgain_hufftab[0][0], 2, 1, -18, 0, avctx); } if (s->use_exp_vlc) @@ -545,7 +545,7 @@ static int wma_decode_block(WMACodecContext *s) } for (ch = 0; ch < s->avctx->channels; ch++) { if (s->channel_coded[ch]) { - int i, n, val, code; + int i, n, val; n = s->exponent_high_sizes[bsize]; val = (int) 0x80000000; @@ -554,9 +554,8 @@ static int wma_decode_block(WMACodecContext *s) if (val == (int) 0x80000000) { val = get_bits(&s->gb, 7) - 19; } else { - code = get_vlc2(&s->gb, s->hgain_vlc.table, + val += get_vlc2(&s->gb, s->hgain_vlc.table, HGAINVLCBITS, HGAINMAX); - val += code - 18; } s->high_band_values[ch][i] = val; }