Commit 7eacd70f authored by Alex Converse's avatar Alex Converse

aac: Handle HE-AACv2 when sniffing a channel order.

parent dc878b96
...@@ -404,6 +404,13 @@ static int output_configure(AACContext *ac, ...@@ -404,6 +404,13 @@ static int output_configure(AACContext *ac,
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
if (ac->oc[1].m4ac.ps == 1 && channels == 2) {
if (layout == AV_CH_FRONT_CENTER) {
layout = AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT;
} else {
layout = 0;
}
}
memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0])); memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
avctx->channel_layout = ac->oc[1].channel_layout = layout; avctx->channel_layout = ac->oc[1].channel_layout = layout;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment