virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/aacdec: print a log message when treating mono HE-AAC as stereo

Browse Source 
Since this behavior is intentional, use the VERBOSE level instead of WARNING as
it's nothing the user should worry about.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2022-07-28 14:20:22 -03:00
parent 665349c4c0
commit 6406d5e430
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/aac.h
View File

@@ -366,6 +366,7 @@ struct AACContext {
int warned_960_sbr; int warned_960_sbr;
unsigned warned_71_wide; unsigned warned_71_wide;
int warned_gain_control; int warned_gain_control;
int warned_he_aac_mono;
/* aacdec functions pointers */ /* aacdec functions pointers */
void (*imdct_and_windowing)(AACContext *ac, SingleChannelElement *sce); void (*imdct_and_windowing)(AACContext *ac, SingleChannelElement *sce);

4
libavcodec/aacdec_template.c
View File

@@ -2584,6 +2584,10 @@ static int decode_extension_payload(AACContext *ac, GetBitContext *gb, int cnt,
ac->avctx->profile = FF_PROFILE_AAC_HE; ac->avctx->profile = FF_PROFILE_AAC_HE;
} }
res = AAC_RENAME(ff_decode_sbr_extension)(ac, &che->sbr, gb, crc_flag, cnt, elem_type); res = AAC_RENAME(ff_decode_sbr_extension)(ac, &che->sbr, gb, crc_flag, cnt, elem_type);
if (ac->oc[1].m4ac.ps == 1 && !ac->warned_he_aac_mono) {
av_log(ac->avctx, AV_LOG_VERBOSE, "Treating HE-AAC mono as stereo.\n");
ac->warned_he_aac_mono = 1;
}
break; break;
case EXT_DYNAMIC_RANGE: case EXT_DYNAMIC_RANGE:
res = decode_dynamic_range(&ac->che_drc, gb); res = decode_dynamic_range(&ac->che_drc, gb);

2
libavcodec/aacsbr_template.c
View File

@@ -955,6 +955,8 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr,
} else { } else {
*num_bits_left -= ff_ps_read_data(ac->avctx, gb, &sbr->ps.common, *num_bits_left); *num_bits_left -= ff_ps_read_data(ac->avctx, gb, &sbr->ps.common, *num_bits_left);
ac->avctx->profile = FF_PROFILE_AAC_HE_V2; ac->avctx->profile = FF_PROFILE_AAC_HE_V2;
// ensure the warning is not printed if PS extension is present
ac->warned_he_aac_mono = 1;
} }
break; break;
default: default: