From patchwork Fri Nov 20 07:32:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23862 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 57CCE44B2D5 for ; Fri, 20 Nov 2020 09:46:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DF43A68BCB3; Fri, 20 Nov 2020 09:34:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFCFC68BB0D for ; Fri, 20 Nov 2020 09:34:15 +0200 (EET) Received: by mail-ed1-f65.google.com with SMTP id t9so8492695edq.8 for ; Thu, 19 Nov 2020 23:34:15 -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=Rf5ix6JEVS3caUukrTMhNiloUk0B0iLJVfJ19E/qJDI=; b=TiUJzz5IqtuSlWYgA/z7Lhy2Fbg1PJNars1Q1w2ZAo6COcNwTt7elCPHg6eR80BZrn 7AbALNUWt3n2ETsRes1L39mPIdfLOIbdcoJuA4UL5iQVhtaAufQNBkePJRQ3qSZzTUKn 5cfZbwFh5fzF0uLdUm5pZbfCyaJyytPW1HSKW/AGqJiZqKh25Zyz8201XcVGHjB+4PSI KJt4qQY+YAHrqr433shzsni/4gTxTKIDtB6wfUzDleC95Yi5mnofqRIi2Adf2Ni7bc9F 2wrATss4BSVCkVms7e70LxqKT5n9LWcRXEYu0LMgjtKi0t+OxAQtCoEASeXwtZ8vNCeI /TdQ== 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=Rf5ix6JEVS3caUukrTMhNiloUk0B0iLJVfJ19E/qJDI=; b=mKMLDjMXJkdPX89sxjOqtsRsecC51BR6KyiGCMORiqqvMXxGjXghgqrc0rzqU92qGr WoIg2kMpydCuDJtk2Ocrl4ohsehFbT4bE1MGF7qvQeTmEdED3Z1qj6CQ58TSp+kTYiWJ IWDv9dqLxUTenhdLy8nWA4XnA4k0La7DV0jsQPC7fRIES0olSPfgwuy9pIcJ08ofQl9D +yucbj/ICgdJP5dnyFxw5ZvRfvQU6NTkcAcwSEycLTycGlabVNv/B9wHeo+fx97eUI4U oCykg6XPzYv/DkFp7hH6mGj7gMZKLSlCm/BAE/xHLuuSLbQw2UJc9Oa8Ny3R+wnNW3IB S++A== X-Gm-Message-State: AOAM530wGZRRSKmc+b4Wvz7DLd6iMcUWFiEcwnpkkhRlapy9f2JlRc28 9IWHpOX3ykBOl5ANENEfOgsyllkK0/j2GA== X-Google-Smtp-Source: ABdhPJzBWeHHvR+h7Ut6pGbmWRtCq+LhPxRGgEoxqEbCqk9iMKjwgAIn+LxNogG9FChFvDlKC0ayqw== X-Received: by 2002:a50:8745:: with SMTP id 5mr33937643edv.49.1605857655030; Thu, 19 Nov 2020 23:34:15 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:34:14 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:32:38 +0100 Message-Id: <20201120073327.820745-14-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 113/162] avcodec/atrac9dec: Don't confuse max_depth of VLC with max codelength 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 whole point of VLCs with their tables is to read more than one bit at a time; therefore max_depth, the number of times one has to (maximally) read further bits is given by ceil(max_code_length / table_bits) which in the case of ATRAC9's coefficient VLCs gives an upper bound of two. Instead the maximum length of a code of the given VLC has been used (which is not even a compile-time constant). Use two instead. Furthermore, given that this was the only usage of the field containing the maximum of all the code lengths of a given VLC the field has been removed from its containing struct. Signed-off-by: Andreas Rheinhardt --- libavcodec/atrac9dec.c | 2 +- libavcodec/atrac9tab.h | 105 ++++++++++++++++++++--------------------- 2 files changed, 53 insertions(+), 54 deletions(-) diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c index 075d610e75..a1af3c22ef 100644 --- a/libavcodec/atrac9dec.c +++ b/libavcodec/atrac9dec.c @@ -411,7 +411,7 @@ static inline void read_coeffs_coarse(ATRAC9Context *s, ATRAC9BlockData *b, const int groups = bands >> huff->value_cnt_pow; for (int j = 0; j < groups; j++) { - uint16_t val = get_vlc2(gb, tab->table, 9, huff->max_bit_size); + uint16_t val = get_vlc2(gb, tab->table, 9, 2); for (int k = 0; k < huff->value_cnt; k++) { coeffs[k] = sign_extend(val, huff->value_bits); diff --git a/libavcodec/atrac9tab.h b/libavcodec/atrac9tab.h index 8f290f158c..c25d0e2744 100644 --- a/libavcodec/atrac9tab.h +++ b/libavcodec/atrac9tab.h @@ -476,26 +476,25 @@ typedef struct HuffmanCodebook { const int value_cnt; const int value_cnt_pow; const int value_bits; - const int max_bit_size; } HuffmanCodebook; static const HuffmanCodebook at9_huffman_sf_unsigned[] = { { 0 }, - { huff_sfb_a1_bits, huff_sfb_a1_codes, 2, 1, 0, 1, 1, }, - { huff_sfb_a2_bits, huff_sfb_a2_codes, 4, 1, 0, 2, 3, }, - { huff_sfb_a3_bits, huff_sfb_a3_codes, 8, 1, 0, 3, 6, }, - { huff_sfb_a4_bits, huff_sfb_a4_codes, 16, 1, 0, 4, 8, }, - { huff_sfb_a5_bits, huff_sfb_a5_codes, 32, 1, 0, 5, 8, }, - { huff_sfb_a6_bits, huff_sfb_a6_codes, 64, 1, 0, 6, 8, }, + { huff_sfb_a1_bits, huff_sfb_a1_codes, 2, 1, 0, 1 }, + { huff_sfb_a2_bits, huff_sfb_a2_codes, 4, 1, 0, 2 }, + { huff_sfb_a3_bits, huff_sfb_a3_codes, 8, 1, 0, 3 }, + { huff_sfb_a4_bits, huff_sfb_a4_codes, 16, 1, 0, 4 }, + { huff_sfb_a5_bits, huff_sfb_a5_codes, 32, 1, 0, 5 }, + { huff_sfb_a6_bits, huff_sfb_a6_codes, 64, 1, 0, 6 }, }; static const HuffmanCodebook at9_huffman_sf_signed[] = { { 0 }, { 0 }, - { huff_sfb_b2_bits, huff_sfb_b2_codes, 4, 1, 0, 2, 2, }, - { huff_sfb_b3_bits, huff_sfb_b3_codes, 8, 1, 0, 3, 6, }, - { huff_sfb_b4_bits, huff_sfb_b4_codes, 16, 1, 0, 4, 8, }, - { huff_sfb_b5_bits, huff_sfb_b5_codes, 32, 1, 0, 5, 8, }, + { huff_sfb_b2_bits, huff_sfb_b2_codes, 4, 1, 0, 2 }, + { huff_sfb_b3_bits, huff_sfb_b3_codes, 8, 1, 0, 3 }, + { huff_sfb_b4_bits, huff_sfb_b4_codes, 16, 1, 0, 4 }, + { huff_sfb_b5_bits, huff_sfb_b5_codes, 32, 1, 0, 5 }, }; static const uint8_t huff_spec_a21_bits[] = { @@ -1539,40 +1538,40 @@ static const HuffmanCodebook at9_huffman_coeffs[][8][4] = { { { 0 } }, { { 0 } }, { - { huff_spec_a21_bits, huff_spec_a21_codes, 16, 2, 1, 2, 3, }, - { huff_spec_a22_bits, huff_spec_a22_codes, 256, 4, 2, 2, 8, }, - { huff_spec_a23_bits, huff_spec_a23_codes, 256, 4, 2, 2, 9, }, - { huff_spec_a24_bits, huff_spec_a24_codes, 256, 4, 2, 2, 10, }, + { huff_spec_a21_bits, huff_spec_a21_codes, 16, 2, 1, 2 }, + { huff_spec_a22_bits, huff_spec_a22_codes, 256, 4, 2, 2 }, + { huff_spec_a23_bits, huff_spec_a23_codes, 256, 4, 2, 2 }, + { huff_spec_a24_bits, huff_spec_a24_codes, 256, 4, 2, 2 }, }, { - { huff_spec_a31_bits, huff_spec_a31_codes, 64, 2, 1, 3, 7, }, - { huff_spec_a32_bits, huff_spec_a32_codes, 64, 2, 1, 3, 7, }, - { huff_spec_a33_bits, huff_spec_a33_codes, 64, 2, 1, 3, 8, }, - { huff_spec_a34_bits, huff_spec_a34_codes, 64, 2, 1, 3, 10, }, + { huff_spec_a31_bits, huff_spec_a31_codes, 64, 2, 1, 3 }, + { huff_spec_a32_bits, huff_spec_a32_codes, 64, 2, 1, 3 }, + { huff_spec_a33_bits, huff_spec_a33_codes, 64, 2, 1, 3 }, + { huff_spec_a34_bits, huff_spec_a34_codes, 64, 2, 1, 3 }, }, { - { huff_spec_a41_bits, huff_spec_a41_codes, 256, 2, 1, 4, 9, }, - { huff_spec_a42_bits, huff_spec_a42_codes, 256, 2, 1, 4, 10, }, - { huff_spec_a43_bits, huff_spec_a43_codes, 256, 2, 1, 4, 10, }, - { huff_spec_a44_bits, huff_spec_a44_codes, 256, 2, 1, 4, 10, }, + { huff_spec_a41_bits, huff_spec_a41_codes, 256, 2, 1, 4 }, + { huff_spec_a42_bits, huff_spec_a42_codes, 256, 2, 1, 4 }, + { huff_spec_a43_bits, huff_spec_a43_codes, 256, 2, 1, 4 }, + { huff_spec_a44_bits, huff_spec_a44_codes, 256, 2, 1, 4 }, }, { - { huff_spec_a51_bits, huff_spec_a51_codes, 32, 1, 0, 5, 6, }, - { huff_spec_a52_bits, huff_spec_a52_codes, 32, 1, 0, 5, 6, }, - { huff_spec_a53_bits, huff_spec_a53_codes, 32, 1, 0, 5, 7, }, - { huff_spec_a54_bits, huff_spec_a54_codes, 32, 1, 0, 5, 8, }, + { huff_spec_a51_bits, huff_spec_a51_codes, 32, 1, 0, 5 }, + { huff_spec_a52_bits, huff_spec_a52_codes, 32, 1, 0, 5 }, + { huff_spec_a53_bits, huff_spec_a53_codes, 32, 1, 0, 5 }, + { huff_spec_a54_bits, huff_spec_a54_codes, 32, 1, 0, 5 }, }, { - { huff_spec_a61_bits, huff_spec_a61_codes, 64, 1, 0, 6, 7, }, - { huff_spec_a62_bits, huff_spec_a62_codes, 64, 1, 0, 6, 7, }, - { huff_spec_a63_bits, huff_spec_a63_codes, 64, 1, 0, 6, 8, }, - { huff_spec_a64_bits, huff_spec_a64_codes, 64, 1, 0, 6, 9, }, + { huff_spec_a61_bits, huff_spec_a61_codes, 64, 1, 0, 6 }, + { huff_spec_a62_bits, huff_spec_a62_codes, 64, 1, 0, 6 }, + { huff_spec_a63_bits, huff_spec_a63_codes, 64, 1, 0, 6 }, + { huff_spec_a64_bits, huff_spec_a64_codes, 64, 1, 0, 6 }, }, { - { huff_spec_a71_bits, huff_spec_a71_codes, 128, 1, 0, 7, 8, }, - { huff_spec_a72_bits, huff_spec_a72_codes, 128, 1, 0, 7, 8, }, - { huff_spec_a73_bits, huff_spec_a73_codes, 128, 1, 0, 7, 9, }, - { huff_spec_a74_bits, huff_spec_a74_codes, 128, 1, 0, 7, 10, }, + { huff_spec_a71_bits, huff_spec_a71_codes, 128, 1, 0, 7 }, + { huff_spec_a72_bits, huff_spec_a72_codes, 128, 1, 0, 7 }, + { huff_spec_a73_bits, huff_spec_a73_codes, 128, 1, 0, 7 }, + { huff_spec_a74_bits, huff_spec_a74_codes, 128, 1, 0, 7 }, }, }, { @@ -1580,39 +1579,39 @@ static const HuffmanCodebook at9_huffman_coeffs[][8][4] = { { { 0 } }, { { 0 }, - { huff_spec_b22_bits, huff_spec_b22_codes, 256, 4, 2, 2, 10, }, - { huff_spec_b23_bits, huff_spec_b23_codes, 256, 4, 2, 2, 10, }, - { huff_spec_b24_bits, huff_spec_b24_codes, 256, 4, 2, 2, 10, }, + { huff_spec_b22_bits, huff_spec_b22_codes, 256, 4, 2, 2 }, + { huff_spec_b23_bits, huff_spec_b23_codes, 256, 4, 2, 2 }, + { huff_spec_b24_bits, huff_spec_b24_codes, 256, 4, 2, 2 }, }, { { 0 }, - { huff_spec_b32_bits, huff_spec_b32_codes, 64, 2, 1, 3, 9, }, - { huff_spec_b33_bits, huff_spec_b33_codes, 64, 2, 1, 3, 10, }, - { huff_spec_b34_bits, huff_spec_b34_codes, 64, 2, 1, 3, 10, }, + { huff_spec_b32_bits, huff_spec_b32_codes, 64, 2, 1, 3 }, + { huff_spec_b33_bits, huff_spec_b33_codes, 64, 2, 1, 3 }, + { huff_spec_b34_bits, huff_spec_b34_codes, 64, 2, 1, 3 }, }, { { 0 }, - { huff_spec_b42_bits, huff_spec_b42_codes, 256, 2, 1, 4, 10, }, - { huff_spec_b43_bits, huff_spec_b43_codes, 256, 2, 1, 4, 10, }, - { huff_spec_b44_bits, huff_spec_b44_codes, 256, 2, 1, 4, 10, }, + { huff_spec_b42_bits, huff_spec_b42_codes, 256, 2, 1, 4 }, + { huff_spec_b43_bits, huff_spec_b43_codes, 256, 2, 1, 4 }, + { huff_spec_b44_bits, huff_spec_b44_codes, 256, 2, 1, 4 }, }, { { 0 }, - { huff_spec_b52_bits, huff_spec_b52_codes, 32, 1, 0, 5, 7, }, - { huff_spec_b53_bits, huff_spec_b53_codes, 32, 1, 0, 5, 8, }, - { huff_spec_b54_bits, huff_spec_b54_codes, 32, 1, 0, 5, 9, }, + { huff_spec_b52_bits, huff_spec_b52_codes, 32, 1, 0, 5 }, + { huff_spec_b53_bits, huff_spec_b53_codes, 32, 1, 0, 5 }, + { huff_spec_b54_bits, huff_spec_b54_codes, 32, 1, 0, 5 }, }, { { 0 }, - { huff_spec_b62_bits, huff_spec_b62_codes, 64, 1, 0, 6, 8, }, - { huff_spec_b63_bits, huff_spec_b63_codes, 64, 1, 0, 6, 9, }, - { huff_spec_b64_bits, huff_spec_b64_codes, 64, 1, 0, 6, 10, }, + { huff_spec_b62_bits, huff_spec_b62_codes, 64, 1, 0, 6 }, + { huff_spec_b63_bits, huff_spec_b63_codes, 64, 1, 0, 6 }, + { huff_spec_b64_bits, huff_spec_b64_codes, 64, 1, 0, 6 }, }, { { 0 }, - { huff_spec_b72_bits, huff_spec_b72_codes, 128, 1, 0, 7, 9, }, - { huff_spec_b73_bits, huff_spec_b73_codes, 128, 1, 0, 7, 10, }, - { huff_spec_b74_bits, huff_spec_b74_codes, 128, 1, 0, 7, 10, }, + { huff_spec_b72_bits, huff_spec_b72_codes, 128, 1, 0, 7 }, + { huff_spec_b73_bits, huff_spec_b73_codes, 128, 1, 0, 7 }, + { huff_spec_b74_bits, huff_spec_b74_codes, 128, 1, 0, 7 }, }, }, };