sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-24 02:09:03 +03:00
Code Activity

avcodec/aac/aacdec_usac: map USAC channel elements from the UsacConfig only

Browse Source 
Fixes: th6ELuT3oDwj
Fixes: wrong channel mapping and rejected frames
Wrong channel mapping and rejected frames Replicated through UnModified FFmpeg with plain output diff
Found during the review of https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/24677
Found during the review of https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/24678
This commit is contained in:
Michael Niedermayer
2026-10-13 05:45:22 +02:00
committed by michaelni
parent 3edc8c2e1e
commit acaba8d7f2
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/aac/aacdec_usac.c
View File

@@ -623,6 +623,7 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx,
m4ac->sampling_index = ff_aac_sample_rate_idx(m4ac->sample_rate);
m4ac->sbr = sbr_ratio > 0;
m4ac->chan_config = 0;
channel_config_idx = get_bits(gb, 5); /* channelConfigurationIndex */
if (!channel_config_idx) {
@@ -1932,8 +1933,6 @@ static int parse_audio_preroll(AACDecContext *ac, GetBitContext *gb)
if (ret < 0) {
*m4ac = m4ac_bak;
return ret;
} else {
ac->oc[1].m4ac.chan_config = 0;
}
/* 7.18.3.3 Bitrate adaption