From patchwork Tue Nov 10 10:48:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23493 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 BE36244B3FF for ; Tue, 10 Nov 2020 12:54:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9BD0468BFA5; Tue, 10 Nov 2020 12:51:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5441F68BF71 for ; Tue, 10 Nov 2020 12:50:48 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id a3so1218564wmb.5 for ; Tue, 10 Nov 2020 02:50:48 -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=4Tp92Ur2RGs+GrI42juDeTYy8Mdhfw7UMw5jweCYz3s=; b=TiLQD3lkDeT14VhkE0eXI+BA3knrE2t+F/3o8ztPRa1zsxy2/sqWJVR45NIZqJ0kq3 wmeXvtixe8CPosFVOLITb0H88yOMBwLwhjcGQuSd0Ez6kGKNeFDVrVg77h6vqo2oiMFz fLOcD7VquN/PJmNaYh1a2yYEWlTXARUGmzHgxSALoYP2iqw6cqbg+PwlGKRJQsgMmcfi WOaeEUIPBdJCmVIvbiA+YNwmBZBuXRsPFd8ocA49Pt0/pwNoM3zlSG7zD3Tf5ZGU23T7 qvoTwuYeEKoYCtZevlfEQNzzNX3//4+q4xpQfAfiTWLVjag8NaMuGIVr/5ZNtyqq//2g JFcA== 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=4Tp92Ur2RGs+GrI42juDeTYy8Mdhfw7UMw5jweCYz3s=; b=rn5UDRTWaJ94z388cWgoOwZENPI21rB7Bl6hRzJit73Dt8CGgeFag64VXgPl+I3wQu 42kxklNKwBP1HP6KJ/cIxnnMoGjpVW1eHf9No3L0Ad8sv3H4hX777oCZtbXaH8awNWaz qNTu8b+K02mrPtTc9R8pggy+NX+fHTtGok9bjFjuvpwtqFP9Ro6vOC7PRG/u2JFKFHDW rJo6T1aSMA7YF8JX/uKMEkkMZk/K4wRrLBv9z8VROrsfYFVzkt/DIn8R4/ui0GpyK9t4 BPKsSqrK6sZ11uKmgGAGtzL44OSxgSPZOT4xl1/hn5MFVFwUiMIakVSxl/laE39XIk+N MYRw== X-Gm-Message-State: AOAM531q7KsaFJrkwklW9kmgZs+73ZLHV81XhiA9jl9ToJ6/GpLr9WS7 AvvlmH+aI26lz6V1UY89+f4CrBxgkNw= X-Google-Smtp-Source: ABdhPJwClnoJvNes0lxODSw3kJYxWmIgSbkJswbby4jjQ1fRwbwelxZwB3z1ZAe89vL9sYa4f5tnOw== X-Received: by 2002:a1c:3907:: with SMTP id g7mr4029656wma.176.1605005447533; Tue, 10 Nov 2020 02:50:47 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id l24sm2572543wmi.7.2020.11.10.02.50.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:50:46 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:48:27 +0100 Message-Id: <20201110104851.321029-91-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> References: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 090/114] avcodec/atrac9dec: Use least max_depth in call to get_vlc2() 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/atrac9dec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c index a1af3c22ef..ecf95f1777 100644 --- a/libavcodec/atrac9dec.c +++ b/libavcodec/atrac9dec.c @@ -272,7 +272,7 @@ static inline int read_scalefactors(ATRAC9Context *s, ATRAC9BlockData *b, c->scalefactors[0] = get_bits(gb, len); for (int i = 1; i < b->band_ext_q_unit; i++) { - int val = c->scalefactors[i - 1] + get_vlc2(gb, tab->table, 9, 2); + int val = c->scalefactors[i - 1] + get_vlc2(gb, tab->table, 9, 1); c->scalefactors[i] = val & ((1 << len) - 1); } @@ -302,7 +302,7 @@ static inline int read_scalefactors(ATRAC9Context *s, ATRAC9BlockData *b, const VLC *tab = &s->sf_vlc[1][len]; for (int i = 0; i < unit_cnt; i++) { - int dist = get_vlc2(gb, tab->table, 9, 2); + int dist = get_vlc2(gb, tab->table, 9, 1); c->scalefactors[i] = baseline[i] + dist; } @@ -325,7 +325,7 @@ static inline int read_scalefactors(ATRAC9Context *s, ATRAC9BlockData *b, c->scalefactors[0] = get_bits(gb, len); for (int i = 1; i < unit_cnt; i++) { - int val = c->scalefactors[i - 1] + get_vlc2(gb, tab->table, 9, 2); + int val = c->scalefactors[i - 1] + get_vlc2(gb, tab->table, 9, 1); c->scalefactors[i] = val & ((1 << len) - 1); }