On Tue, 28 Feb 2012 10:55:39 -0800, Alex Converse <[email protected]> wrote: > From: Michael Niedermayer <[email protected]> > > [[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 9e64a95..b24f469 100644 > --- a/libavcodec/aacdec.c > +++ b/libavcodec/aacdec.c > @@ -417,6 +417,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: > -- > 1.7.7.3 >
I'm not really qualified to review this, but FWIW I can confirm that it fixes the sample in mplayer2. And since you're not the author of the fix, I think you can push if you think it's acceptable. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
