From patchwork Thu May 30 02:37:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 49381 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:5c1:0:b0:460:55fa:d5ed with SMTP id 184csp32009vqf; Wed, 29 May 2024 19:40:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVeSEwrD9Vy7Lb92Adiiva6dR+uBYl8ZqBHi4F4pUH7ZYOZ/7qX8btZR/aZ9WCTxGHbjhzI4334RItBkRoITlv4s4BO7HoQb/TTaw== X-Google-Smtp-Source: AGHT+IFtB4fYWS695oR37ZGeLRKpzq9nOhqgnGwYd3izwCjj2GPSx5SmLB/sG7qdO3mgW/tVFM5y X-Received: by 2002:a05:6512:3b06:b0:52b:60ed:3f0d with SMTP id 2adb3069b0e04-52b7d480e83mr628098e87.60.1717036844718; Wed, 29 May 2024 19:40:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717036844; cv=none; d=google.com; s=arc-20160816; b=XAL2WbDlDaYVI15MYM3ijxbCum3mANzwXo//e9y6Xs/dobh7huXx+m2kUHwvgj8qlz Eg3u2KQDA2kf1iBvySrgchPWONLnfZumPI35vXL9DoR+jtykoJwz2V7hyOIBGGGOb9Ki lzWNYMXF+YYDD15gV+wNuyQ3yj4cpX0OD4SQyg2gXPqSsYXq8KS61aoEJfkAoIGLooq3 rJYV5xoz7hgv4VnNMbOyU9Jbr39oMAbO9r03e7WAcKmgaEPvOcFzxzdbJv2hrNcA7f5t QBcJ+3F1zpkjxLdwYoEWFiS7Srb0HcRQqhh8ejt4/hq8pvNqCRS9wLa5FwSvvkSxdDfD yvIw== 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=Fe3KbuPIineTakcNZSdj0SeM52VQjsnThFcyNvrGarjwOA/UpsZ3xWOX+gcYeoaXEX 29koRwtljRegfedLtZ8ZN5IVtELe6sNb3D4iwuHoJEM1naLtBSWbefKl4VlsAKJ+r1tG I4Y7XcTqRvzuSABonASfvnr3w5HAuBTol1fLavuydqSK7y7tu3XKKfXg28Iu8SQoJlz+ swQ/kHb/N/u9wEt0jRsahghOEUFXtlBEF+C6NawqEr5lLTNBYAKoKHBZxnaaECgSakk1 qO2hyCoG3oT9MW3kQsMLJwiE/VxXsWDh4ahJSyRVNvNxEM6+gpn7dP5NUditsFhUjaxZ dA4A==; 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 2adb3069b0e04-52b51315a53si612259e87.636.2024.05.29.19.40.44; Wed, 29 May 2024 19:40:44 -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 B50D968D58F; Thu, 30 May 2024 05:39:52 +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 1080B68D536 for ; Thu, 30 May 2024 05:39:43 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 May 2024 04:37:14 +0200 Message-ID: <20240530023927.1205442-7-dev@lynne.ee> X-Mailer: git-send-email 2.43.0.381.gb435a96ce8 In-Reply-To: <20240530023927.1205442-1-dev@lynne.ee> References: <20240530023927.1205442-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: e7HIatKZ1K+T --- 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);