From patchwork Fri Nov 20 07:19:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23822 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 DB4CE44B51D for ; Fri, 20 Nov 2020 09:36:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C3B5768BBA9; Fri, 20 Nov 2020 09:25:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A5CD68BB68 for ; Fri, 20 Nov 2020 09:25:18 +0200 (EET) Received: by mail-ej1-f45.google.com with SMTP id s25so11497377ejy.6 for ; Thu, 19 Nov 2020 23:25: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=2TkPy2FYbeGod4hfmGkwqpvsrSXGkg26yl66AztyyPg=; b=Dv0y1TbZ2C8Sv4bpbqo2W8Ta4ln2nACIQVXVqfj+9ZJXEHVpdlz50l1HkT9KSD1yb/ FEeaFMKOoneIw8011gEGZXh/l1ca1bwZL7QBbGKoHWsjr7JxuxawSE6FsD9RaPZlsyke 6LFYQ+Q4fKQ05QEiW5s2A5X1RCzZw8iwBA/q9UxmX4CYHODXq2BZGBVgLFhIP9dz+oQc 5niZO0ljALjv27++KEGGp3RybdzqKOkMqUtLHl1RE7NCPQIyF1SFSpDFwHEpTGY4BjU3 V0X7/c+oBzTkw6Zb2Rxv6gw0DO4MeLvYJl/Fzjj5/x4jDmnJLCcI5LXfHD629fksD+mH Du0g== 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=2TkPy2FYbeGod4hfmGkwqpvsrSXGkg26yl66AztyyPg=; b=Fb6P1g9nnPxCHSfpdTPHyzbz11chFzz3cfc24l7l28ERu8hdgb4z/jpByquYBSeYcO naQTwXDZdduAJhiGUC+muN8wBYL13SZK2rgpZrzAE2LcZIMiu3NG18Dxd+j5d1+AVxEl 4ziOI+4fDT8UwusS7EjbUVh1534C6o0p4UWdquwG4JO+sCTFY4C9LDpRN/cc7YzCMXUb +L7BTbmjEDhKUZjUxnyIFSg1MnPepolt8sMRNSnYG4bRiRUhOyfHxIVRv4KPX+R0rmvk 0kQaVNHSIT5CvZJi5mpmDFy6oAKXMhVwVOTKI+8oKKvHyST6B1WNuaOFP2qYGdi/TfPl U7Hg== X-Gm-Message-State: AOAM531FcJPPfGmraiUhQBiQsFRq3Z/emq0fDRHkM1O/q9pjJD101RNo 9R+1f1q8dnj+9VQeDJIshVvxwmbhvfRcDQ== X-Google-Smtp-Source: ABdhPJwggVlJxIcghbbQ0FAUMfivlp1ioa7vWaXe753RTqgTpnZzbydimaes08qspNIJUlT30HDruQ== X-Received: by 2002:a17:906:35da:: with SMTP id p26mr31810067ejb.256.1605857118144; Thu, 19 Nov 2020 23:25:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:25:17 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:19:41 +0100 Message-Id: <20201120072116.818090-69-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 068/162] avcodec/qdm2: Avoid offsets table when initializing VLCs 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/qdm2_tablegen.h | 42 ++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/libavcodec/qdm2_tablegen.h b/libavcodec/qdm2_tablegen.h index 2ae8449c14..ca47fea2dc 100644 --- a/libavcodec/qdm2_tablegen.h +++ b/libavcodec/qdm2_tablegen.h @@ -109,46 +109,44 @@ static VLC vlc_tab_type30; static VLC vlc_tab_type34; static VLC vlc_tab_fft_tone_offset[5]; -static const uint16_t qdm2_vlc_offs[] = { - 0,260,566,598,894,1166,1230,1294,1678,1950,2214,2278,2310,2570,2834,3124,3448,3838, -}; - static VLC_TYPE qdm2_table[3838][2]; -static av_cold void build_vlc(VLC *vlc, int nb_bits, int nb_codes, int idx, - const uint8_t tab[][2]) +static av_cold void build_vlc(VLC *vlc, int nb_bits, int nb_codes, + unsigned *offset, const uint8_t tab[][2]) { - vlc->table = &qdm2_table[qdm2_vlc_offs[idx]]; - vlc->table_allocated = qdm2_vlc_offs[idx + 1] - qdm2_vlc_offs[idx]; + vlc->table = &qdm2_table[*offset]; + vlc->table_allocated = FF_ARRAY_ELEMS(qdm2_table) - *offset; ff_init_vlc_from_lengths(vlc, nb_bits, nb_codes, &tab[0][1], 2, &tab[0][0], 2, 1, - -1, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE, NULL); + -1, INIT_VLC_STATIC_OVERLONG | INIT_VLC_LE, NULL); + *offset += vlc->table_size; } static av_cold void qdm2_init_vlc(void) { const uint8_t (*tab)[2] = tab_fft_tone_offset; + unsigned offset = 0; - build_vlc(&vlc_tab_level, 8, 24, 0, tab_level); - build_vlc(&vlc_tab_diff, 8, 33, 1, tab_diff); - build_vlc(&vlc_tab_run, 5, 6, 2, tab_run); + build_vlc(&vlc_tab_level, 8, 24, &offset, tab_level); + build_vlc(&vlc_tab_diff, 8, 33, &offset, tab_diff); + build_vlc(&vlc_tab_run, 5, 6, &offset, tab_run); - build_vlc(&fft_level_exp_alt_vlc, 8, 28, 3, fft_level_exp_alt); - build_vlc(&fft_level_exp_vlc, 8, 20, 4, fft_level_exp); + build_vlc(&fft_level_exp_alt_vlc, 8, 28, &offset, fft_level_exp_alt); + build_vlc(&fft_level_exp_vlc, 8, 20, &offset, fft_level_exp); - build_vlc(&fft_stereo_exp_vlc, 6, 7, 5, fft_stereo_exp); - build_vlc(&fft_stereo_phase_vlc, 6, 9, 6, fft_stereo_phase); + build_vlc(&fft_stereo_exp_vlc, 6, 7, &offset, fft_stereo_exp); + build_vlc(&fft_stereo_phase_vlc, 6, 9, &offset, fft_stereo_phase); - build_vlc(&vlc_tab_tone_level_idx_hi1, 8, 20, 7, tab_tone_level_idx_hi1); - build_vlc(&vlc_tab_tone_level_idx_mid, 8, 13, 8, tab_tone_level_idx_mid); - build_vlc(&vlc_tab_tone_level_idx_hi2, 8, 18, 9, tab_tone_level_idx_hi2); + build_vlc(&vlc_tab_tone_level_idx_hi1, 8, 20, &offset, tab_tone_level_idx_hi1); + build_vlc(&vlc_tab_tone_level_idx_mid, 8, 13, &offset, tab_tone_level_idx_mid); + build_vlc(&vlc_tab_tone_level_idx_hi2, 8, 18, &offset, tab_tone_level_idx_hi2); - build_vlc(&vlc_tab_type30, 6, 9, 10, tab_type30); - build_vlc(&vlc_tab_type34, 5, 10, 11, tab_type34); + build_vlc(&vlc_tab_type30, 6, 9, &offset, tab_type30); + build_vlc(&vlc_tab_type34, 5, 10, &offset, tab_type34); for (int i = 0; i < 5; i++) { build_vlc(&vlc_tab_fft_tone_offset[i], 8, tab_fft_tone_offset_sizes[i], - 12 + i, tab); + &offset, tab); tab += tab_fft_tone_offset_sizes[i]; } }