RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '0289f81241e720452b5a77713488d54d3ec252d7' 

* commit '0289f81241e720452b5a77713488d54d3ec252d7':
  aac: Correctly map multichannel ADTS AAC with non-zero channel_config + PCE

Conflicts:
	libavcodec/aacdec.c

Sample: 5.1ch_PCE_issue.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-03 19:23:06 +02:00
parent 6034b4bb88 0289f81241
commit 1200289687
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/aacdec.c
View File

@ -457,12 +457,18 @@ static int output_configure(AACContext *ac,
AVCodecContext *avctx = ac->avctx; AVCodecContext *avctx = ac->avctx;
int i, channels = 0, ret; int i, channels = 0, ret;
uint64_t layout = 0; uint64_t layout = 0;
uint8_t id_map[TYPE_END][MAX_ELEM_ID] = {{ 0 }};
uint8_t type_counts[TYPE_END] = { 0 };
if (ac->oc[1].layout_map != layout_map) { if (ac->oc[1].layout_map != layout_map) {
memcpy(ac->oc[1].layout_map, layout_map, tags * sizeof(layout_map[0])); memcpy(ac->oc[1].layout_map, layout_map, tags * sizeof(layout_map[0]));
ac->oc[1].layout_map_tags = tags; ac->oc[1].layout_map_tags = tags;
} }
for (i = 0; i < tags; i++) {
int type = layout_map[i][0];
int id = layout_map[i][1];
id_map[type][id] = type_counts[type]++;
}
// Try to sniff a reasonable channel order, otherwise output the // Try to sniff a reasonable channel order, otherwise output the
// channels in the order the PCE declared them. // channels in the order the PCE declared them.
if (avctx->request_channel_layout != AV_CH_LAYOUT_NATIVE) if (avctx->request_channel_layout != AV_CH_LAYOUT_NATIVE)
@ -470,12 +476,14 @@ static int output_configure(AACContext *ac,
for (i = 0; i < tags; i++) { for (i = 0; i < tags; i++) {
int type = layout_map[i][0]; int type = layout_map[i][0];
int id = layout_map[i][1]; int id = layout_map[i][1];
int iid = id_map[type][id];
int position = layout_map[i][2]; int position = layout_map[i][2];
// Allocate or free elements depending on if they are in the // Allocate or free elements depending on if they are in the
// current program configuration. // current program configuration.
ret = che_configure(ac, position, type, id, &channels); ret = che_configure(ac, position, type, iid, &channels);
if (ret < 0) if (ret < 0)
return ret; return ret;
ac->tag_che_map[type][id] = ac->che[type][iid];
} }
if (ac->oc[1].m4ac.ps == 1 && channels == 2) { if (ac->oc[1].m4ac.ps == 1 && channels == 2) {
if (layout == AV_CH_FRONT_CENTER) { if (layout == AV_CH_FRONT_CENTER) {
@ -485,7 +493,6 @@ static int output_configure(AACContext *ac,
} }
} }
memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
if (layout) avctx->channel_layout = layout; if (layout) avctx->channel_layout = layout;
ac->oc[1].channel_layout = layout; ac->oc[1].channel_layout = layout;
avctx->channels = ac->oc[1].channels = channels; avctx->channels = ac->oc[1].channels = channels;