Module: libav Branch: master Commit: 956fb91e0333634aa25dcb5632c6e4e3769d05ee
Author: Michael Niedermayer <[email protected]> Committer: Alex Converse <[email protected]> Date: Fri Oct 21 09:41:40 2011 +0000 aacdec: Support stereo streams that erroneously signal predefined channel configuration 1 (mono). [[email protected]] Move code to get_che() Update for AAC new channel configuration interface Only set chan_config if output_configure succeeds. Signed-off-by: Alex Converse <[email protected]> --- libavcodec/aacdec.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 340052e..4f94f5f 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -415,6 +415,20 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id) if (!ac->m4ac.chan_config) { return ac->tag_che_map[type][elem_id]; } + // Allow single CPE stereo files to be signalled with mono configuration. + if (!ac->tags_mapped && type == TYPE_CPE && ac->m4ac.chan_config == 1) { + uint8_t layout_map[MAX_ELEM_ID*4][3]; + int layout_map_tags; + + if (set_default_channel_config(ac->avctx, layout_map, &layout_map_tags, + 2) < 0) + return NULL; + if (output_configure(ac, layout_map, layout_map_tags, + 2, OC_TRIAL_FRAME) < 0) + return NULL; + + ac->m4ac.chan_config = 2; + } // For indexed channel configurations map the channels solely based on position. switch (ac->m4ac.chan_config) { case 7: _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
