From patchwork Fri Nov 20 07:32: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: 23864 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 1C0E544B2D5 for ; Fri, 20 Nov 2020 09:46:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22E7568B939; Fri, 20 Nov 2020 09:34:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDA5D68BC9C for ; Fri, 20 Nov 2020 09:34:16 +0200 (EET) Received: by mail-ed1-f66.google.com with SMTP id q3so8465427edr.12 for ; Thu, 19 Nov 2020 23:34:16 -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=NJRBTiJrvHPBlpuAvpIaogGJgfroY4mvQg9WluAkxCgHKkqcqRc7pUV0Lw9QNMQiR0 bGJs8nH+MXfPy139un7YqGSmyIvszbC9DXRcLCKXNCLJ4tmW++lswVzid75GsGMw2DWP yp6kGzFfHm0P1oDwCQtPc8ttG3YgHPTVUWbLqOdz1ACC0eAb5SCFbQER8yWZwkGdY/ft JWcWHxzeVkN7ox84kVHxwxL1kBQz+bjOVaRTNuBEG6qVjvZelHn9N0razz0jjXrBrRVS 7pRhP+gCDaB7T40IFQGopygJ3If7HBYIaIHkBQVNeUj8zkEsaRTPxs/XR5TETCtq44oN s0mQ== 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=iWUz18P38wire1G/Ck7y6wTxB9r8CxLh4hmgJe9Ia/+hfrfi+UdgHXVpQVtI2UtzPK U+DVCtAlKx65UYZD2P8x6DGiXpHChSkRSjmuMUZ/HLh2bCxWm7uqcYF4DEtHrBPiMjRY BtL5DT5GJdskA/usyR3Onq6dGSX56LdaZeBds1znlMOlrxy/AtyMwFlO88k9AJHKgaBg DFxTubPZ1BdMLVo/epMeBCKDdNiYQrM3ZgSOQIVmP5vtOYnkl67j4GMfS0/jupDrPyLh wDIaf3/CfhG+Yd9U97ZmReU8vh6oL0G9x3YxWm5vbhdVDF3GUN4OhbcC31SkJ5w0MOLb cLig== X-Gm-Message-State: AOAM531PQbvaFR639/0UH8b+Ahi7lrQdFkFJorYAA/sPniADt+ZF/uNO gIV1Yj402iKtT0r1D186EpdJIy/FT9HgQQ== X-Google-Smtp-Source: ABdhPJwNPS6eqj4TA0Gcb5hKf//AzHYaJd1+4Z155wDUrJYNwPXuS/LBKdkYV8+9tgInqdPIADJbLg== X-Received: by 2002:a50:b224:: with SMTP id o33mr33005541edd.21.1605857656221; Thu, 19 Nov 2020 23:34:16 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id i13sm769110ejv.84.2020.11.19.23.34.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:34:15 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:32:39 +0100 Message-Id: <20201120073327.820745-15-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 v2 114/162] avcodec/atrac9dec: Use least max_depth in calls 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); }