diff options
| author | James Almer <jamrial@gmail.com> | 2022-07-05 12:49:29 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-07-08 10:05:24 -0300 |
| commit | f9785a78da117be0c66f6d5d58ce7277c7029ae7 (patch) | |
| tree | b1aae4f2a03b025575dbf3cc3072ad691a6ab4a0 /libavcodec | |
| parent | d3cf7be5a4bd0c6bb80032c7697a8819563112c8 (diff) | |
| download | ffmpeg-f9785a78da117be0c66f6d5d58ce7277c7029ae7.tar.gz | |
avcodec/aacdec: fix parsing of dual mono files
Dual mono files report a channel count of 2 with each individual channel in its
own SCE, instead of both in a single CPE as is the case with standard stereo.
This commit handles this non default channel configuration scenario.
Fixes ticket #1614
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacdec_template.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 0135cb35df..10fba3d3b2 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -701,14 +701,15 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id) av_log(ac->avctx, AV_LOG_DEBUG, "stereo with SCE\n"); - if (set_default_channel_config(ac, ac->avctx, layout_map, - &layout_map_tags, 1) < 0) - return NULL; + layout_map_tags = 2; + layout_map[0][0] = layout_map[1][0] = TYPE_SCE; + layout_map[0][2] = layout_map[1][2] = AAC_CHANNEL_FRONT; + layout_map[0][1] = 0; + layout_map[1][1] = 1; if (output_configure(ac, layout_map, layout_map_tags, OC_TRIAL_FRAME, 1) < 0) return NULL; - ac->oc[1].m4ac.chan_config = 1; if (ac->oc[1].m4ac.sbr) ac->oc[1].m4ac.ps = -1; } @@ -786,8 +787,10 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id) type == TYPE_CPE) { ac->tags_mapped++; return ac->tag_che_map[TYPE_CPE][elem_id] = ac->che[TYPE_CPE][0]; - } else if (ac->oc[1].m4ac.chan_config == 2) { - return NULL; + } else if (ac->tags_mapped == 1 && ac->oc[1].m4ac.chan_config == 2 && + type == TYPE_SCE) { + ac->tags_mapped++; + return ac->tag_che_map[TYPE_SCE][elem_id] = ac->che[TYPE_SCE][1]; } case 1: if (!ac->tags_mapped && type == TYPE_SCE) { |