Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Lynne via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Cc: Lynne <dev@lynne.ee>
Subject: [FFmpeg-devel] [PATCH v5 06/10] aactab: add deemphasis tables for USAC
Date: Thu, 30 May 2024 04:37:14 +0200
Message-ID: <20240530023927.1205442-7-dev@lynne.ee> (raw)
In-Reply-To: <20240530023927.1205442-1-dev@lynne.ee>

---
 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);
 
-- 
2.43.0.381.gb435a96ce8
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

  parent reply	other threads:[~2024-05-30  2:40 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-30  2:37 [FFmpeg-devel] [PATCH v5 00/10] aacdec: add a native xHE-AAC decoder Lynne via ffmpeg-devel
2024-05-30  2:37 ` [FFmpeg-devel] [PATCH v5 01/10] channel_layout: add new channel positions supported by xHE-AAC Lynne via ffmpeg-devel
2024-05-31 13:39   ` Jan Ekström
2024-05-31 13:48     ` Lynne via ffmpeg-devel
2024-05-30  2:37 ` [FFmpeg-devel] [PATCH v5 02/10] aacdec: move from scalefactor ranged arrays to flat arrays Lynne via ffmpeg-devel
2024-05-30  2:37 ` [FFmpeg-devel] [PATCH v5 03/10] aacdec: expose channel layout related functions Lynne via ffmpeg-devel
2024-05-30  2:37 ` [FFmpeg-devel] [PATCH v5 04/10] aacdec: expose decode_tns Lynne via ffmpeg-devel
2024-05-30  2:37 ` [FFmpeg-devel] [PATCH v5 05/10] aacdec_dsp: implement 768-point transform and windowing Lynne via ffmpeg-devel
2024-05-30  2:37 ` Lynne via ffmpeg-devel [this message]
2024-05-30  2:37 ` [FFmpeg-devel] [PATCH v5 07/10] aactab: add tables for the new USAC arithmetic coder Lynne via ffmpeg-devel
2024-05-30  2:37 ` [FFmpeg-devel] [PATCH v5 08/10] aactab: add new scalefactor offset tables for 96/768pt windows Lynne via ffmpeg-devel
2024-05-30  2:37 ` [FFmpeg-devel] [PATCH v5 09/10] aacdec: add a decoder for AAC USAC (xHE-AAC) Lynne via ffmpeg-devel
2024-05-30  2:40 ` [FFmpeg-devel] [PATCH v5 10/10] fate: add tests for xHE-AAC Lynne via ffmpeg-devel
2024-06-02 16:47 ` [FFmpeg-devel] [PATCH v5 00/10] aacdec: add a native xHE-AAC decoder Lynne via ffmpeg-devel
2024-07-19 23:42 ` Michael Niedermayer
2024-07-21  1:16   ` Lynne via ffmpeg-devel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240530023927.1205442-7-dev@lynne.ee \
    --to=ffmpeg-devel@ffmpeg.org \
    --cc=dev@lynne.ee \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git