From patchwork Fri Nov 20 07:32:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23859 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 8BFB444B17A for ; Fri, 20 Nov 2020 09:45:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DD0968BCBC; Fri, 20 Nov 2020 09:34:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2444D68BCA2 for ; Fri, 20 Nov 2020 09:34:18 +0200 (EET) Received: by mail-ej1-f67.google.com with SMTP id f20so11518547ejz.4 for ; Thu, 19 Nov 2020 23:34:18 -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=zAEfyK0D8FCXfVdA+6KrlxkCyINpFblxXGWWtiz0hgM=; b=UwzPdTGK5mVn40NMu31/vkVLY0jHGUa5oJtTIblg5X5WSMpedVgrc2ItToWOKL/xSN hD3YaE5lGPCloEc/Jgdutl6tx+jNBV8K8nW6Hj4g3IntQmhAdW5ACe+VLVcQGl79XsnD fMu7OXDkTfbdsc5BjaEt+PZR9sRki2eaKBnrESvw9rl0k+N7HDerNEUlt/U7NriX1Wc3 wGnA+qCppwFY0EfLFUPlScz7HEwihuOWRNfMPPVK8qrz9ytJhVPMoltQpkhRQ2GKRsvn axDOjCmWeyO7eNnl9uzj3ewDm+WQlw8uXs3eB2g94BxBVT+DGLSSpHlNXHa3RYIrf5pQ G/QQ== 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=zAEfyK0D8FCXfVdA+6KrlxkCyINpFblxXGWWtiz0hgM=; b=gUXAQo4jhS7st2DgNC4Yb1vifuPqsiXp5ZpT/bKQ6tnHQaSEjDn4QrZbMyqPYLudTN OvI3mJ1HKBCdHC42ma+y4IzIRud+SHqMJAn9aINz41vgRRqkxaprVCykxX0OV10MCVSt VHwptoSl+4l+IjIEq9V6HUKl+HPLLB5/ySzLfUZVarr1RLHsGMYu3bms1ZGDgKcBfWFv 29Zs1SNmsQCFiYfdQ77YFRzeS57CRvecsAU6jZ4cnTCb3ZDI+58LBVhfoxsrptIwkrpv 8aNElIk+V+zr7ace4YiChdeeTafkA0d0q1IKwmTBZrHlAel7jZZOIPzzFRpco4iUPzxJ PY5Q== X-Gm-Message-State: AOAM530wcQ37fM+HTB9x3Jp4qmEvOFEPB8VPpvopg5t1StyDnAYGmcHr NrM1BOeGRaTgyLWL4YQoP5PYC6IgTesNig== X-Google-Smtp-Source: ABdhPJxREB2oZYNwkfCL+rRT/k+nzMjLdnCLIp7yE+TpZI6S5XjRH9Dag8t2+dXZqElXYgIanWP7tA== X-Received: by 2002:a17:906:3ac4:: with SMTP id z4mr31661054ejd.92.1605857657122; Thu, 19 Nov 2020 23:34:17 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:34:16 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:32:40 +0100 Message-Id: <20201120073327.820745-16-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 115/162] avcodec/atrac9dec: Don't use unnecessarily large VLC tables 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" Using more bits for a VLC than the longest code has has no advantage. Signed-off-by: Andreas Rheinhardt --- libavcodec/atrac9dec.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c index ecf95f1777..0477b304d2 100644 --- a/libavcodec/atrac9dec.c +++ b/libavcodec/atrac9dec.c @@ -26,6 +26,8 @@ #include "libavutil/lfg.h" #include "libavutil/float_dsp.h" +#define ATRAC9_SF_VLC_BITS 8 + typedef struct ATRAC9ChannelData { int band_ext; int q_unit_cnt; @@ -272,7 +274,8 @@ 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, 1); + int val = c->scalefactors[i - 1] + get_vlc2(gb, tab->table, + ATRAC9_SF_VLC_BITS, 1); c->scalefactors[i] = val & ((1 << len) - 1); } @@ -302,7 +305,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, 1); + int dist = get_vlc2(gb, tab->table, ATRAC9_SF_VLC_BITS, 1); c->scalefactors[i] = baseline[i] + dist; } @@ -325,7 +328,8 @@ 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, 1); + int val = c->scalefactors[i - 1] + get_vlc2(gb, tab->table, + ATRAC9_SF_VLC_BITS, 1); c->scalefactors[i] = val & ((1 << len) - 1); } @@ -930,7 +934,8 @@ static av_cold int atrac9_decode_init(AVCodecContext *avctx) for (int i = 1; i < 7; i++) { const HuffmanCodebook *hf = &at9_huffman_sf_unsigned[i]; - init_vlc(&s->sf_vlc[0][i], 9, hf->size, hf->bits, 1, 1, hf->codes, + init_vlc(&s->sf_vlc[0][i], ATRAC9_SF_VLC_BITS, hf->size, + hf->bits, 1, 1, hf->codes, 2, 2, 0); } @@ -943,7 +948,7 @@ static av_cold int atrac9_decode_init(AVCodecContext *avctx) for (int j = 0; j < nums; j++) sym[j] = sign_extend(j, hf->value_bits); - ff_init_vlc_sparse(&s->sf_vlc[1][i], 9, hf->size, hf->bits, 1, 1, + ff_init_vlc_sparse(&s->sf_vlc[1][i], ATRAC9_SF_VLC_BITS, hf->size, hf->bits, 1, 1, hf->codes, 2, 2, sym, sizeof(*sym), sizeof(*sym), 0); }