From: Lynne via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Cc: Lynne <dev@lynne.ee>
Subject: [FFmpeg-devel] [PATCH v5 04/10] aacdec: expose decode_tns
Date: Thu, 30 May 2024 04:37:12 +0200
Message-ID: <20240530023927.1205442-5-dev@lynne.ee> (raw)
In-Reply-To: <20240530023927.1205442-1-dev@lynne.ee>
USAC has the same syntax, with one minor change we can check for.
---
libavcodec/aac/aacdec.c | 6 +++---
libavcodec/aac/aacdec.h | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c
index 40554ff9e4..a7e5b2a369 100644
--- a/libavcodec/aac/aacdec.c
+++ b/libavcodec/aac/aacdec.c
@@ -1542,7 +1542,7 @@ static int decode_pulses(Pulse *pulse, GetBitContext *gb,
*
* @return Returns error status. 0 - OK, !0 - error
*/
-static int decode_tns(AACDecContext *ac, TemporalNoiseShaping *tns,
+int ff_aac_decode_tns(AACDecContext *ac, TemporalNoiseShaping *tns,
GetBitContext *gb, const IndividualChannelStream *ics)
{
int w, filt, i, coef_len, coef_res, coef_compress;
@@ -1690,7 +1690,7 @@ int ff_aac_decode_ics(AACDecContext *ac, SingleChannelElement *sce,
}
tns->present = get_bits1(gb);
if (tns->present && !er_syntax) {
- ret = decode_tns(ac, tns, gb, ics);
+ ret = ff_aac_decode_tns(ac, tns, gb, ics);
if (ret < 0)
goto fail;
}
@@ -1704,7 +1704,7 @@ int ff_aac_decode_ics(AACDecContext *ac, SingleChannelElement *sce,
// I see no textual basis in the spec for this occurring after SSR gain
// control, but this is what both reference and real implmentations do
if (tns->present && er_syntax) {
- ret = decode_tns(ac, tns, gb, ics);
+ ret = ff_aac_decode_tns(ac, tns, gb, ics);
if (ret < 0)
goto fail;
}
diff --git a/libavcodec/aac/aacdec.h b/libavcodec/aac/aacdec.h
index bea0578e92..499bd8eefc 100644
--- a/libavcodec/aac/aacdec.h
+++ b/libavcodec/aac/aacdec.h
@@ -351,6 +351,9 @@ int ff_aac_decode_init_fixed(AVCodecContext *avctx);
int ff_aac_decode_ics(AACDecContext *ac, SingleChannelElement *sce,
GetBitContext *gb, int common_window, int scale_flag);
+int ff_aac_decode_tns(AACDecContext *ac, TemporalNoiseShaping *tns,
+ GetBitContext *gb, const IndividualChannelStream *ics);
+
int ff_aac_set_default_channel_config(AACDecContext *ac, AVCodecContext *avctx,
uint8_t (*layout_map)[3],
int *tags,
--
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".
next prev 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 ` Lynne via ffmpeg-devel [this message]
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 ` [FFmpeg-devel] [PATCH v5 06/10] aactab: add deemphasis tables for USAC Lynne via ffmpeg-devel
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-5-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