This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 3654a14795fb67ef5bdc0702183fedf74fb356ba Author: James Almer <[email protected]> AuthorDate: Mon Aug 24 23:05:57 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Wed Aug 26 12:28:53 2026 -0300 avcodec/libfdk-aacdec: add support for bottom front channels Same as the previous commit, actual samples with less than eight channels including these is very unlikely. Signed-off-by: James Almer <[email protected]> --- libavcodec/libfdk-aacdec.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index 9aa9ef5e09..41ff4887a6 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -151,12 +151,14 @@ static int get_stream_info(AVCodecContext *avctx, AVFrame *frame) channel_counts[ctype]++; } av_log(avctx, AV_LOG_DEBUG, - "%d channels - front:%d side:%d back:%d lfe:%d top:%d\n", + "%d channels - front:%d side:%d back:%d lfe:%d top:%d bottom %d\n", info->numChannels, channel_counts[ACT_FRONT], channel_counts[ACT_SIDE], channel_counts[ACT_BACK], channel_counts[ACT_LFE], channel_counts[ACT_FRONT_TOP] + channel_counts[ACT_SIDE_TOP] + - channel_counts[ACT_BACK_TOP] + channel_counts[ACT_TOP]); + channel_counts[ACT_BACK_TOP] + channel_counts[ACT_TOP], + channel_counts[ACT_FRONT_BOTTOM] + channel_counts[ACT_SIDE_BOTTOM] + + channel_counts[ACT_BACK_BOTTOM] + channel_counts[ACT_BOTTOM]); switch (channel_counts[ACT_FRONT]) { case 5: @@ -275,6 +277,24 @@ static int get_stream_info(AVCodecContext *avctx, AVFrame *frame) break; } } + if (channel_counts[ACT_FRONT_BOTTOM] > 0) { + switch (channel_counts[ACT_FRONT_BOTTOM]) { + case 3: + case 2: + ch_layout |= AV_CH_BOTTOM_FRONT_LEFT | AV_CH_BOTTOM_FRONT_RIGHT; + av_fallthrough; + case 1: + if (channel_counts[ACT_FRONT_BOTTOM] & 1) + ch_layout |= AV_CH_BOTTOM_FRONT_CENTER; + break; + default: + av_log(avctx, AV_LOG_WARNING, + "unsupported number of bottom front channels: %d\n", + channel_counts[ACT_FRONT_BOTTOM]); + ch_error = 1; + break; + } + } av_channel_layout_uninit(&avctx->ch_layout); av_channel_layout_from_mask(&avctx->ch_layout, ch_layout); -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
