From patchwork Tue Nov 10 10:48:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23482 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 7B93D44B616 for ; Tue, 10 Nov 2020 12:51:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0248E68BF20; Tue, 10 Nov 2020 12:50:47 +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 EBE4668A800 for ; Tue, 10 Nov 2020 12:50:30 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id k2so8768191wrx.2 for ; Tue, 10 Nov 2020 02:50:30 -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=urlXyvL+OoT4RbzJpehHHY3bkokPuCJUFQNBrLL1T8c=; b=ctXm6HV7J7rwrDSTEtqEX0qOXRVKauOZNGhYvh2qP8rUNWSu6LL7NAG7CFHKKB5/n/ /2deJzOxSYsKRcHeyMaOd49Hizs5AyoHGDXgm2s0l5CcxgfPsEM5IVOCC+QfBsZtomFe GW2XWDNBm+g3VGo9J9umGf0WpRxDlpM2+mh/960mPfFqG5cohY5fa61uDfvtcOee/Hpm e1qUdAc1Es7Uub8KWuTj5poyOEJoCPBUeYbBqE3wXcKoEYMrp8Lm3tmJL1dTRo+fYjvc MNlKEkPqvhSKQATHCEdk0+ja6vF7mVESQZ67VaI5Yylk04hN8t6wDCSzayg4UfueiYBr cKTQ== 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=urlXyvL+OoT4RbzJpehHHY3bkokPuCJUFQNBrLL1T8c=; b=XR5AKHBhZNJBzTU865a2EXBYC4WOCfDl66DAxKobadibiVmAVHTTJ6MArRw8wnl/tv QONIP5CK+FtTnqoU2MYSc/v2CtUWv/aftmCCkvVKXRU7jmozZFqCdWv7J87a++gw90cK xDsd0nFrNuoP47L/5YBMse+MYZvYspxHQxedaVKsFyqkLqBE90wTIGtrLg7dwMroxN7D KjUGoIAHPu8xoyRi+5DOSwu2Ud2hsPBHcWwU2+w4tdKMc7u5lY5P4TRKflnKXJdc4sfx bnumPDAuhDXQuW/Oqpeb53MjJkN2oKztf6QMe1F6vy4WaGv1rtmeO3L+YrP0gACJo7dQ zFeA== X-Gm-Message-State: AOAM533k/loXREbL4DdUjr+YLB42VpzJNRMDUDY77CZUM4aTvVmFQJZ2 9UUK5Rpvdy0B9PaPw+nDyo42xYsVhr4= X-Google-Smtp-Source: ABdhPJz811QyzjvLCBX9CQ7VtBiIXRxKc8NogZ76T5TmtnXHTuMJQJxpU8K7cy4r2PsRHjLqXnLlRg== X-Received: by 2002:adf:91c6:: with SMTP id 64mr22444156wri.192.1605005430120; Tue, 10 Nov 2020 02:50:30 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:50:29 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:48:09 +0100 Message-Id: <20201110104851.321029-73-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 072/114] avcodec/atrac3plus: Simplify getting offset of VLC in VLC_TYPE buf 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" The earlier code used several different offset parameters that were initialized to magic values. This is unnecessary. Signed-off-by: Andreas Rheinhardt --- libavcodec/atrac3plus.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/libavcodec/atrac3plus.c b/libavcodec/atrac3plus.c index 955c9901a1..889526e338 100644 --- a/libavcodec/atrac3plus.c +++ b/libavcodec/atrac3plus.c @@ -75,7 +75,7 @@ static av_cold void build_canonical_huff(const uint8_t *cb, const uint8_t *xlat, av_cold void ff_atrac3p_init_vlcs(void) { - int i, wl_vlc_offs, ct_vlc_offs, sf_vlc_offs, tab_offset; + int i, tab_offset = 0; static const uint8_t wl_nb_bits[4] = { 2, 3, 5, 5 }; static const uint8_t wl_nb_codes[4] = { 3, 5, 8, 8 }; @@ -127,39 +127,34 @@ av_cold void ff_atrac3p_init_vlcs(void) atrac3p_huff_freq_xlat }; - for (i = 0, wl_vlc_offs = 0, ct_vlc_offs = 2508; i < 4; i++) { - wl_vlc_tabs[i].table = &tables_data[wl_vlc_offs]; + for (int i = 0; i < 4; i++) { + wl_vlc_tabs[i].table = &tables_data[tab_offset]; wl_vlc_tabs[i].table_allocated = 1 << wl_nb_bits[i]; - ct_vlc_tabs[i].table = &tables_data[ct_vlc_offs]; - ct_vlc_tabs[i].table_allocated = 1 << ct_nb_bits[i]; - + tab_offset += wl_vlc_tabs[i].table_allocated; ff_init_vlc_from_lengths(&wl_vlc_tabs[i], wl_nb_bits[i], wl_nb_codes[i], &wl_huffs[i][0][1], 2, &wl_huffs[i][0][0], 2, 1, 0, INIT_VLC_USE_NEW_STATIC); + ct_vlc_tabs[i].table = &tables_data[tab_offset]; + ct_vlc_tabs[i].table_allocated = 1 << ct_nb_bits[i]; + tab_offset += ct_vlc_tabs[i].table_allocated; ff_init_vlc_from_lengths(&ct_vlc_tabs[i], ct_nb_bits[i], ct_nb_codes[i], &ct_huffs[i][0][1], 2, &ct_huffs[i][0][0], 2, 1, 0, INIT_VLC_USE_NEW_STATIC); - - wl_vlc_offs += wl_vlc_tabs[i].table_allocated; - ct_vlc_offs += ct_vlc_tabs[i].table_allocated; } - for (i = 0, sf_vlc_offs = 76; i < 8; i++) { - sf_vlc_tabs[i].table = &tables_data[sf_vlc_offs]; + for (int i = 0; i < 8; i++) { + sf_vlc_tabs[i].table = &tables_data[tab_offset]; sf_vlc_tabs[i].table_allocated = 1 << sf_nb_bits[i]; - + tab_offset += sf_vlc_tabs[i].table_allocated; ff_init_vlc_from_lengths(&sf_vlc_tabs[i], sf_nb_bits[i], sf_nb_codes[i], &sf_huffs[i][0][1], 2, &sf_huffs[i][0][0], 2, 1, 0, INIT_VLC_USE_NEW_STATIC); - sf_vlc_offs += sf_vlc_tabs[i].table_allocated; } - tab_offset = 2564; - /* build huffman tables for spectrum decoding */ for (i = 0; i < 112; i++) { if (atrac3p_spectra_tabs[i].redirect < 0)