From patchwork Fri Nov 20 07:20:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23845 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 49FD14492D7 for ; Fri, 20 Nov 2020 09:41:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E0CE68BC26; Fri, 20 Nov 2020 09:26:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6D0E68803B for ; Fri, 20 Nov 2020 09:25:42 +0200 (EET) Received: by mail-ej1-f65.google.com with SMTP id i19so11474045ejx.9 for ; Thu, 19 Nov 2020 23:25:42 -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=0e5BTq51kVmS57TSmDOrXUvcFN5/wtqAkCFoF3vzLfY=; b=hIwElKiMPDPi2TAsRzvRgbK8+p9Uas6Qy0PDGqQKVHQGFCf8WX0iM030qM1Ymkee5k ultXEae0iy3euoT0L6nYLUV7kJHq9CCTINbdRTQ6KdkQmTUu78F7B2oUgOYqvV9MUZ6G fivneku6sUEeCB+JzdRYXlJv3ShnU4REQstTVX79ZZYLYvYRbe2Gt/IryZDdlJs5w03O dSDN4eygfRLVqm+BLyBVyM2G2iEazh3XxwHpMWt+tp6A2JNO4+GB8aEcPxSDV+FWC7Ke o6bHXhaUYans7XeeOGu/HRWL6/6y254Piulrq0b2QaF4O2siLY/OtKWUd+qYe4Ev4S7e ezNA== 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=0e5BTq51kVmS57TSmDOrXUvcFN5/wtqAkCFoF3vzLfY=; b=MG51Re+bZMykAJLsybFfUKLnakoPBkf/i/FytzfxD3w176Wh987i1b50o+9WPaS8pm Lg+0sVgzs5MV9Qotx4hLI+oZduD9QYqE4g7HH5ptFZOxofp3corhoPlyxIlNeqwJwidh wUbjexPlqq5hZ6/JyYDUj58VnE94yFSjem9kX1EIsDS6ydzqrwgYn5jzVCYalhZkoX4v Yq+FP3krjFlM9NRCCpgy4PGLZ5P2tdAgkWM3bdhRi+fZcQhApvFh/qs5X/m1a8GeZuJ6 unjcj6cKntAaAg+jaqdO03bYVxhG0P3513kmwHaQBDoAoKkaB3vvi+J5dT/xz2QWZeDm rdEQ== X-Gm-Message-State: AOAM530ycCVhtAhV+Ycc6iUYS6hjDfObnvd04/6MLLCLqcb2HWd4HFt1 fbSTlQUz3+Dx5RHZD7PBOUG3Ri/FlVoheQ== X-Google-Smtp-Source: ABdhPJya1Lj3dRfLH9+f3CtUaZBzj/X+Fnin4yVjsbS6WVhE8z5tDPK5MpkJjCWosjHoJEIrVCFdDw== X-Received: by 2002:a17:906:2f87:: with SMTP id w7mr34149876eji.83.1605857142085; Thu, 19 Nov 2020 23:25:42 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id lz27sm779419ejb.39.2020.11.19.23.25.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:25:41 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:20:05 +0100 Message-Id: <20201120072116.818090-93-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 092/162] 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 c93d42ab39..b22e773e8e 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 += 1 << wl_nb_bits[i]; 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, NULL); + ct_vlc_tabs[i].table = &tables_data[tab_offset]; + ct_vlc_tabs[i].table_allocated = 1 << ct_nb_bits[i]; + tab_offset += 1 << ct_nb_bits[i]; 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, NULL); - - 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 += 1 << sf_nb_bits[i]; 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, NULL); - 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)