From patchwork Sat May 25 02:27:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 49233 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2098060vqf; Fri, 24 May 2024 19:29:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUyU5a5N39QDKONtnhMAXo3jR0LrD2HAnn0a/vKR53n5UCMf9oMy2SDOfLlm/VdFCmCobWIHI/Ti7qAA2tF96KJjzVn9DylDN6eTA== X-Google-Smtp-Source: AGHT+IGWPZ+SGIcAiDSLN8ZVZ6nRB0QgrQsLAshSjlvf/rCQaQcTjRKo0E88yesI8WLSam/lncU6 X-Received: by 2002:a50:baa7:0:b0:578:57bb:112d with SMTP id 4fb4d7f45d1cf-57861d6025fmr1248740a12.19.1716604172148; Fri, 24 May 2024 19:29:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716604172; cv=none; d=google.com; s=arc-20160816; b=itlK+UuMx9JUPPP9xmrhfr480A4dZ0/AEthA8D1AtrDKhT+AkDGp9hdDi7vSyRljEP HbGqlWix2eLs8tGLen7b7Pg+X0Cj9RVXrdZJ1QdtVKZjJRlyb5/RuUSnjArVT/NBcOD6 Rqx+1wmTfEcEgtnLkMMSndBrDGjkM1NZ69wn/funD6uDfWyRtycIQiHmBto6PFvVaWMa m+8XnTlGaWTnQqMfZJTA8sP2CAGyUs9GwIIx09cYGaMsyu+jq/Y8TfygC2d/83JJ7jqy fWxUkjI4CtuJxn891x/1I0KgX6Ar2T9MqH8u9hXpn3l9Ff290ANz2RW/Bi2jzEFI6S6q Hm9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:delivered-to; bh=FuIPLPiQdnv52qo1RRq0QA97I67t1yZE9oCoS3Ntgxg=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=qA2N3VealUlFAlg7TnIDc/HDQqYPBTeH8MeB5m20Ria3Qv0nlvlHwY/+5gpZiFEJz6 1+jBr6o0Pe+yFFQ7Se5SvUlo3jAJwCMlLA27G5kP2gEa8NMYsK0JW8TMsPT4PpEcG9YV aIGzLzp0saC9z2pQwCcwUozj6XjBPDsmu+QJ2zKBC1NMGE9Yz/+3GRgM5AOgf3OtZz9i 9dDOfT7+CpvRz+6HFOS4APJ7scTr5lrahdV8F3tb2JIsM35Ge5lixqp04R/XYZjTG9kn D8NYnthjSByt87Oppw8JqlLSL+T47tA3v70R9dQ3wOHxh3pT5eKUb3EAfP6zZvQUl4WL TvNQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-578673f2b4dsi378366a12.221.2024.05.24.19.29.31; Fri, 24 May 2024 19:29:32 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 79FDB68D5EA; Sat, 25 May 2024 05:28:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3ED0168D589 for ; Sat, 25 May 2024 05:28:23 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 04:27:59 +0200 Message-ID: <20240525022813.2292001-7-dev@lynne.ee> X-Mailer: git-send-email 2.43.0.381.gb435a96ce8 In-Reply-To: <20240525022813.2292001-1-dev@lynne.ee> References: <20240525022813.2292001-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 06/10] aactab: add deemphasis tables for USAC X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GFT8GabLcaBt --- libavcodec/aactab.c | 25 +++++++++++++++++++++++++ libavcodec/aactab.h | 2 ++ 2 files changed, 27 insertions(+) diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c index 3718b81a07..8ce5e43974 100644 --- a/libavcodec/aactab.c +++ b/libavcodec/aactab.c @@ -3377,3 +3377,28 @@ const DECLARE_ALIGNED(32, int, ff_aac_eld_window_480_fixed)[1800] = { 0xffecff1c, 0xffed391e, 0xffed740c, 0xffedafb1, 0xffedebe1, 0xffee287d, 0xffee654e, 0xffeea23f, }; + +/* As specified by ISO/IEC 23003 */ +#define USAC_EMPH_COEFF 0.68 + +DECLARE_ALIGNED(16, const float, ff_aac_deemph_weights)[16] = { + USAC_EMPH_COEFF, + USAC_EMPH_COEFF*USAC_EMPH_COEFF, + USAC_EMPH_COEFF*USAC_EMPH_COEFF*USAC_EMPH_COEFF, + USAC_EMPH_COEFF*USAC_EMPH_COEFF*USAC_EMPH_COEFF*USAC_EMPH_COEFF, + + 0, + USAC_EMPH_COEFF, + USAC_EMPH_COEFF*USAC_EMPH_COEFF, + USAC_EMPH_COEFF*USAC_EMPH_COEFF*USAC_EMPH_COEFF, + + 0, + 0, + USAC_EMPH_COEFF, + USAC_EMPH_COEFF*USAC_EMPH_COEFF, + + 0, + 0, + 0, + USAC_EMPH_COEFF, +}; diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h index e1a2d8b9a1..91262380d4 100644 --- a/libavcodec/aactab.h +++ b/libavcodec/aactab.h @@ -64,6 +64,8 @@ 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]; // @} +extern const float ff_aac_deemph_weights[16]; + /* Initializes data shared between float decoder and encoder. */ void ff_aac_float_common_init(void);