generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

aacdec: Support stereo streams that erroneously signal predefined channel configuration 1 (mono).

Browse Source 
[alex.converse@mgail.com]
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 <alex.converse@gmail.com>
This commit is contained in:
Michael Niedermayer 2011-10-21 09:41:40 +00:00 committed by Alex Converse
parent 2564f6e6d4
commit 956fb91e03
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/aacdec.c
View File

@ -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: