From patchwork Tue Nov 10 10:58:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23580 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 47D634498CF for ; Tue, 10 Nov 2020 13:17:22 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3125968C0DB; Tue, 10 Nov 2020 12:59:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4AA168C0BB for ; Tue, 10 Nov 2020 12:59:37 +0200 (EET) Received: by mail-wr1-f48.google.com with SMTP id c17so12171284wrc.11 for ; Tue, 10 Nov 2020 02:59:37 -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=S59SQ5W9MrazHvjhRifH0nm66H1HvS39zbFWhrjNn/o=; b=sdppSMaJu9SzsYTSegCK3vcpOdJS3vgfNj+fbADVC2q5XDmPiJbntx3AihUAaOAmMb b3tu2Ydilr5XObZb+GPemHKFiJtZf1MAE1JYSPowGwLocZZj9FINa6Hasv087FgFs4cL wzhjHxfkqRz1shGM0Co4AEhlYnK5a3tow18YjTNfiZRfk7CZUd+3AFzohAmoeXUVDhAT D+h1XQ/4DDfNfxAT6V6oaNKc7/OiS3eMkKNWNB+RD2O1UfDVQZo+uXOSRh1DbewI+ltD CzpuTWjbyrz3pm/7VpwZcI+KNXwFT3/75hOXGamraa4JwXNaEqfUi44dKpoSXsrcB4aH HDJw== 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=S59SQ5W9MrazHvjhRifH0nm66H1HvS39zbFWhrjNn/o=; b=RPNy9D5uaPr/dMP56BDUpUXmcoXeJIgOzbeJoAjmiRyjftgcIneLC8Sr1/uSJBM2n5 qOAibe/vQ/FDbx9PCQN681BmJ2CajWxPdqYNZ8GW8zufKi7gGy6sOeWeu0Q8v0bjDjRu yNkOhOXz0V5psT1wOPJfo75ojo/ZUD/FkNTm07vh0Ydyt3T60Dwqfmjuyh0e9SYISHI9 VX+bXnYh3pwXSfrdfF7ORosVPasDMjtAAQzPrz/5FHcM4RU0qpbGuZ9wUiznbFhajOv3 NmMcSiLtkJ2Y/aGezGokh7BU5SmOlmnSDKWeSyn5iqn+RtDXU9N91a7mNuuxLS1txeEt VkyA== X-Gm-Message-State: AOAM531lWxJoSWSXkbnUSZKplvnc98Hv+TZpVyw6OhgLM5jrahjW9Pj1 ierzb4GNJ7RARaLqedlaj2HfKUNutvc= X-Google-Smtp-Source: ABdhPJwhNiMTblbPj9b9lEk3q2OHUYBey5hOQCm21zofT5s0M8ldGoP8MvAYwvbUb1uD0jSCzOBrwg== X-Received: by 2002:adf:ed11:: with SMTP id a17mr8531685wro.197.1605005976944; Tue, 10 Nov 2020 02:59:36 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id o197sm2561308wme.17.2020.11.10.02.59.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:59:36 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:58:36 +0100 Message-Id: <20201110105836.321916-23-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 114/114] avcodec/qdmc: Avoid code duplication when initializing VLC 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/qdmc.c | 60 ++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 34 deletions(-) diff --git a/libavcodec/qdmc.c b/libavcodec/qdmc.c index 2c870fcc1b..5aa13d8e8e 100644 --- a/libavcodec/qdmc.c +++ b/libavcodec/qdmc.c @@ -119,28 +119,23 @@ static const uint8_t noise_bands_selector[] = { 4, 3, 2, 1, 0, 0, 0, }; -static const uint8_t noise_value[][2] = { +static const uint8_t qdmc_hufftab[][2] = { + /* Noise value - 27 entries */ { 1, 2 }, { 10, 7 }, { 26, 9 }, { 22, 9 }, { 24, 9 }, { 14, 9 }, { 8, 6 }, { 6, 5 }, { 7, 5 }, { 9, 7 }, { 30, 9 }, { 32, 10 }, { 13, 10 }, { 20, 9 }, { 28, 9 }, { 12, 7 }, { 15, 11 }, { 36, 12 }, { 0, 12 }, { 34, 10 }, { 18, 9 }, { 11, 9 }, { 16, 9 }, { 5, 3 }, { 2, 3 }, { 4, 3 }, { 3, 2 }, -}; - -static const uint8_t noise_segment_length[][2] = { + /* Noise segment length - 12 entries */ { 1, 1 }, { 2, 2 }, { 3, 4 }, { 8, 9 }, { 9, 10 }, { 0, 10 }, { 13, 8 }, { 7, 7 }, { 6, 6 }, { 17, 5 }, { 4, 4 }, { 5, 4 }, -}; - -static const uint8_t amplitude[][2] = { + /* Amplitude - 28 entries */ { 18, 3 }, { 16, 3 }, { 22, 7 }, { 8, 10 }, { 4, 10 }, { 3, 9 }, { 2, 8 }, { 23, 8 }, { 10, 8 }, { 11, 7 }, { 21, 5 }, { 20, 4 }, { 1, 7 }, { 7, 10 }, { 5, 10 }, { 9, 9 }, { 6, 10 }, { 25, 11 }, { 26, 12 }, { 27, 13 }, { 0, 13 }, { 24, 9 }, { 12, 6 }, { 13, 5 }, { 14, 4 }, { 19, 3 }, { 15, 3 }, { 17, 2 }, -}; - -static const uint8_t freq_diff[][2] = { + /* Frequency differences - 47 entries */ { 2, 4 }, { 14, 6 }, { 26, 7 }, { 31, 8 }, { 32, 9 }, { 35, 9 }, { 7, 5 }, { 10, 5 }, { 22, 7 }, { 27, 7 }, { 19, 7 }, { 20, 7 }, { 4, 5 }, { 13, 5 }, { 17, 6 }, { 15, 6 }, { 8, 5 }, { 5, 4 }, @@ -149,40 +144,37 @@ static const uint8_t freq_diff[][2] = { { 39, 12 }, { 41, 12 }, { 34, 8 }, { 16, 6 }, { 11, 5 }, { 9, 4 }, { 1, 2 }, { 3, 4 }, { 30, 7 }, { 29, 7 }, { 23, 6 }, { 24, 6 }, { 18, 6 }, { 6, 4 }, { 12, 5 }, { 21, 6 }, { 25, 6 }, -}; - -static const uint8_t amplitude_diff[][2] = { + /* Amplitude differences - 9 entries */ { 1, 2 }, { 3, 3 }, { 4, 4 }, { 5, 5 }, { 6, 6 }, { 7, 7 }, { 8, 8 }, { 0, 8 }, { 2, 1 }, -}; - -static const uint8_t phase_diff[][2] = { + /* Phase differences - 9 entries */ { 2, 2 }, { 1, 2 }, { 3, 4 }, { 7, 4 }, { 6, 5 }, { 5, 6 }, { 0, 6 }, { 4, 4 }, { 8, 2 }, }; +static const uint8_t huff_sizes[] = { + 27, 12, 28, 47, 9, 9 +}; + +static const uint8_t huff_bits[] = { + 12, 10, 12, 12, 8, 6 +}; + static av_cold void qdmc_init_static_data(void) { + const uint8_t (*hufftab)[2] = qdmc_hufftab; int i; - INIT_VLC_STATIC_FROM_LENGTHS(&vtable[0], 12, FF_ARRAY_ELEMS(noise_value), - &noise_value[0][1], 2, - &noise_value[0][0], 2, 1, -1, INIT_VLC_LE, 4096); - INIT_VLC_STATIC_FROM_LENGTHS(&vtable[1], 10, FF_ARRAY_ELEMS(noise_segment_length), - &noise_segment_length[0][1], 2, - &noise_segment_length[0][0], 2, 1, -1, INIT_VLC_LE, 1024); - INIT_VLC_STATIC_FROM_LENGTHS(&vtable[2], 12, FF_ARRAY_ELEMS(amplitude), - &litude[0][1], 2, - &litude[0][0], 2, 1, -1, INIT_VLC_LE, 4098); - INIT_VLC_STATIC_FROM_LENGTHS(&vtable[3], 12, FF_ARRAY_ELEMS(freq_diff), - &freq_diff[0][1], 2, - &freq_diff[0][0], 2, 1, -1, INIT_VLC_LE, 4160); - INIT_VLC_STATIC_FROM_LENGTHS(&vtable[4], 8, FF_ARRAY_ELEMS(amplitude_diff), - &litude_diff[0][1], 2, - &litude_diff[0][0], 2, 1, -1, INIT_VLC_LE, 256); - INIT_VLC_STATIC_FROM_LENGTHS(&vtable[5], 6, FF_ARRAY_ELEMS(phase_diff), - &phase_diff[0][1], 2, - &phase_diff[0][0], 2, 1, -1, INIT_VLC_LE, 64); + for (unsigned i = 0, offset = 0; i < FF_ARRAY_ELEMS(vtable); i++) { + static VLC_TYPE vlc_buffer[13698][2]; + vtable[i].table = &vlc_buffer[offset]; + vtable[i].table_allocated = FF_ARRAY_ELEMS(vlc_buffer) - offset; + ff_init_vlc_from_lengths(&vtable[i], huff_bits[i], huff_sizes[i], + &hufftab[0][1], 2, &hufftab[0][0], 2, 1, + -1, INIT_VLC_OUTPUT_LE | INIT_VLC_USE_NEW_STATIC); + hufftab += huff_sizes[i]; + offset += vtable[i].table_size; + } for (i = 0; i < 512; i++) sin_table[i] = sin(2.0f * i * M_PI * 0.001953125f);