breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

aacdec: expose decode_tns

Browse Source 
USAC has the same syntax, with one minor change we can check for.
This commit is contained in:
Lynne
2024-05-15 00:24:32 +02:00
parent 0f2303f629
commit f8543f3763
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/aac/aacdec.c
View File

@@ -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;
}

3
libavcodec/aac/aacdec.h
View File

@@ -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,