From patchwork Mon Nov 23 19:37:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23992 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 CA2C544A49B for ; Mon, 23 Nov 2020 21:38:25 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A84D968BC05; Mon, 23 Nov 2020 21:38:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD4A968BBBE for ; Mon, 23 Nov 2020 21:38:18 +0200 (EET) Received: by mail-wm1-f51.google.com with SMTP id p22so314781wmg.3 for ; Mon, 23 Nov 2020 11:38: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=VusJULwoTD1Grdp2A8QsBWaSvmHqajlVanvv8FCCLFM=; b=ZLw3EqE6HUBer/0L5Oy5iXFwXT6Su5QJfTu0g91qwJkYX3d9XB6K7MX0dQKvvt2PZ/ ecGZP2RNCVrz8tyW5yCIswvNXjtXGhyr/LI+Mz+l8RONssvdX2tuiWysVBfr1zoEsE17 l7o8Io+WVgEVT+pG5N8r4L6pSmxpEuOop9UjMbvZfCoQibt72UsgdnuhfT/rr9n9yvAM R3gtM6GIGD8TEY3nyAn4sNmL/3tqv1WbbFuiUBNvw+hdBesHpRU4x5c+gLM+6pg6/Jhr NvXCOn9jDuGzJ95qieZ79+P24XvWmHLS+seT2mByzafgjkaUSMYr2qIrSuZP+jn0d6z3 GU3w== 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=VusJULwoTD1Grdp2A8QsBWaSvmHqajlVanvv8FCCLFM=; b=srHtCUSxTbu5CYjS/HjHnd5x3WPgT48FMVuxZMZlw8SbSlpdxFjZ1eCKSPIT0P8vhx ArpCfzxxzrYP22vPGff0eolLafle4wGeB7IMrrmKA9+HLWT0LFAibejvdrM1u9n75lnb z6NrOTgnfHSTdoD2k+slLWsIDvhttPl4ztPyJyHojK9fBzct0dnrEJZycK5jPneP/Ix8 +Ki0tTYbxtTwIotTALXQv8TfSM3ledeDa+CI3xT6nInR7QfvSbz/c8abqCGPkYRGub2I +nK/lgi6q+8OM3MLB98HZWep6TMPivMaV38I8Ee/GTmwL+d+JGLlqNzRlBCq8UHueETQ HA4Q== X-Gm-Message-State: AOAM533DC1kC8cC58mFA5ewYGKuZC+kaddihNoRIm30B33E/+cZo5mq1 a6i2y+a6wgzG9U9R+Me/RIl7Ib1fNWQxWA== X-Google-Smtp-Source: ABdhPJx9YNfD8YRw+kEH6ucdkiiutaEKmb7Rj/eHYa09vXLiri4DOlWMGLIZznJb5Ua4GS33KZsEng== X-Received: by 2002:a7b:c242:: with SMTP id b2mr482092wmj.162.1606160297937; Mon, 23 Nov 2020 11:38:17 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id e6sm564086wme.27.2020.11.23.11.38.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:38:17 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 20:37:23 +0100 Message-Id: <20201123193739.1249300-13-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 175/191] avcodec/aac: Share common init code of float decoder and encoder 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/aacdec_template.c | 10 ++++++---- libavcodec/aacenc.c | 6 +----- libavcodec/aactab.c | 14 ++++++++++++++ libavcodec/aactab.h | 3 +++ 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 3bf271af54..fbe3074071 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -1230,17 +1230,19 @@ static av_cold void aac_static_table_init(void) 352); // window initialization - AAC_RENAME(ff_kbd_window_init)(AAC_KBD_RENAME(kbd_long_1024), 4.0, 1024); - AAC_RENAME(ff_kbd_window_init)(AAC_KBD_RENAME(kbd_short_128), 6.0, 128); #if !USE_FIXED AAC_RENAME(ff_kbd_window_init)(AAC_RENAME(aac_kbd_long_960), 4.0, 960); AAC_RENAME(ff_kbd_window_init)(AAC_RENAME(aac_kbd_short_120), 6.0, 120); AAC_RENAME(ff_sine_window_init)(AAC_RENAME(sine_960), 960); AAC_RENAME(ff_sine_window_init)(AAC_RENAME(sine_120), 120); -#endif + ff_aac_float_common_init(); +#else + AAC_RENAME(ff_kbd_window_init)(AAC_KBD_RENAME(kbd_long_1024), 4.0, 1024); + AAC_RENAME(ff_kbd_window_init)(AAC_KBD_RENAME(kbd_short_128), 6.0, 128); AAC_RENAME(ff_init_ff_sine_windows)(10); - AAC_RENAME(ff_init_ff_sine_windows)( 9); AAC_RENAME(ff_init_ff_sine_windows)( 7); +#endif + AAC_RENAME(ff_init_ff_sine_windows)( 9); AAC_RENAME(ff_cbrt_tableinit)(); } diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 274e5ca294..070a2e706a 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -36,7 +36,6 @@ #include "put_bits.h" #include "internal.h" #include "mpeg4audio.h" -#include "kbdwin.h" #include "sinewin.h" #include "profiles.h" @@ -922,10 +921,7 @@ static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s) return AVERROR(ENOMEM); // window init - ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024); - ff_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128); - ff_init_ff_sine_windows(10); - ff_init_ff_sine_windows(7); + ff_aac_float_common_init(); if ((ret = ff_mdct_init(&s->mdct1024, 11, 0, 32768.0)) < 0) return ret; diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c index e886642e66..b9d1336d97 100644 --- a/libavcodec/aactab.c +++ b/libavcodec/aactab.c @@ -27,6 +27,7 @@ * @author Maxim Gavrilov ( maxim.gavrilov gmail com ) */ +#include "config.h" #include "libavutil/mem.h" #include "libavutil/thread.h" #include "aac.h" @@ -37,9 +38,22 @@ float ff_aac_pow2sf_tab[428]; float ff_aac_pow34sf_tab[428]; +#if CONFIG_AAC_ENCODER || CONFIG_AAC_DECODER +#include "kbdwin.h" +#include "sinewin.h" + DECLARE_ALIGNED(32, float, ff_aac_kbd_long_1024)[1024]; DECLARE_ALIGNED(32, float, ff_aac_kbd_short_128)[128]; +av_cold void ff_aac_float_common_init(void) +{ + ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024); + ff_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128); + ff_init_ff_sine_windows(10); + ff_init_ff_sine_windows(7); +} +#endif + const uint8_t ff_aac_num_swb_1024[] = { 41, 41, 47, 49, 49, 51, 47, 47, 43, 43, 43, 40, 40 }; diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h index 04180b96fd..02f79a16c0 100644 --- a/libavcodec/aactab.h +++ b/libavcodec/aactab.h @@ -100,6 +100,9 @@ DECLARE_ALIGNED(32, extern const float, ff_aac_eld_window_480)[1800]; DECLARE_ALIGNED(32, extern const int, ff_aac_eld_window_480_fixed)[1800]; // @} +/* Initializes data shared between float decoder and encoder. */ +void ff_aac_float_common_init(void); + /* @name number of scalefactor window bands for long and short transform windows respectively * @{ */