RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-10 06:28:06 +00:00
Code Issues Projects Releases Wiki Activity

aacdec_usac: respect tns_on_lr flag

Browse Source 
This was left out, and due to av_unused, forgotten about.
This commit is contained in:
Lynne 2024-06-06 02:25:03 +02:00
parent 25b848a0bd
commit 8ecaa64b9b
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/aac/aacdec.h
View File

@ -230,6 +230,7 @@ typedef struct SingleChannelElement {
typedef struct AACUsacStereo { typedef struct AACUsacStereo {
uint8_t common_window; uint8_t common_window;
uint8_t common_tw; uint8_t common_tw;
uint8_t tns_on_lr; ///< Apply TNS before M/S and stereo prediction
uint8_t ms_mask_mode; uint8_t ms_mask_mode;
uint8_t config_idx; uint8_t config_idx;

16
libavcodec/aac/aacdec_usac.c
View File

@ -876,14 +876,14 @@ static int decode_usac_stereo_info(AACDecContext *ac, AACUSACConfig *usac,
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
us->tns_on_lr = 0;
sce1->tns.present = sce2->tns.present = 0; sce1->tns.present = sce2->tns.present = 0;
if (tns_active) { if (tns_active) {
av_unused int tns_on_lr;
int common_tns = 0; int common_tns = 0;
if (us->common_window) if (us->common_window)
common_tns = get_bits1(gb); common_tns = get_bits1(gb);
tns_on_lr = get_bits1(gb); us->tns_on_lr = get_bits1(gb);
if (common_tns) { if (common_tns) {
ret = ff_aac_decode_tns(ac, &sce1->tns, gb, ics1); ret = ff_aac_decode_tns(ac, &sce1->tns, gb, ics1);
if (ret < 0) if (ret < 0)
@ -1214,6 +1214,14 @@ static void spectrum_decode(AACDecContext *ac, AACUSACConfig *usac,
} }
if (nb_channels > 1 && us->common_window) { if (nb_channels > 1 && us->common_window) {
for (int ch = 0; ch < nb_channels; ch++) {
SingleChannelElement *sce = &cpe->ch[ch];
/* Apply TNS, if the tns_on_lr bit is not set. */
if (sce->tns.present && !us->tns_on_lr)
ac->dsp.apply_tns(sce->coeffs, &sce->tns, &sce->ics, 1);
}
if (us->ms_mask_mode == 3) { if (us->ms_mask_mode == 3) {
const float *filt; const float *filt;
complex_stereo_downmix_cur(ac, cpe, us->dmix_re); complex_stereo_downmix_cur(ac, cpe, us->dmix_re);
@ -1248,8 +1256,8 @@ static void spectrum_decode(AACDecContext *ac, AACUSACConfig *usac,
for (int ch = 0; ch < nb_channels; ch++) { for (int ch = 0; ch < nb_channels; ch++) {
SingleChannelElement *sce = &cpe->ch[ch]; SingleChannelElement *sce = &cpe->ch[ch];
/* Apply TNS */ /* Apply TNS, if it hasn't been applied yet. */
if (sce->tns.present) if (sce->tns.present && ((nb_channels == 1) || (us->tns_on_lr)))
ac->dsp.apply_tns(sce->coeffs, &sce->tns, &sce->ics, 1); ac->dsp.apply_tns(sce->coeffs, &sce->tns, &sce->ics, 1);
ac->oc[1].m4ac.frame_length_short ? ac->dsp.imdct_and_windowing_768(ac, sce) : ac->oc[1].m4ac.frame_length_short ? ac->dsp.imdct_and_windowing_768(ac, sce) :