Skip to content

F
ffmpeg
Commit f1ecd080 authored by Alex Converse's avatar Alex Converse
Browse files
Options

aacdec: Support native channel layout when requested.

parent 37bed6ff
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 10 deletions
libavcodec/aacdec.c
View file @ f1ecd080
...@@ -416,11 +416,13 @@ static av_cold int output_configure(AACContext *ac, ...@@ -416,11 +416,13 @@ static av_cold int output_configure(AACContext *ac,
} }
if (channel_config) { if (channel_config) {
if (avctx->request_channel_layout != AV_CH_LAYOUT_NATIVE)
sniff_channel_order(layout_map, tags);
for (i = 0; i < tags_per_config[channel_config]; i++) { for (i = 0; i < tags_per_config[channel_config]; i++) {
int type = aac_channel_layout_map[channel_config - 1][i][0]; int type = layout_map[i][0];
int id = aac_channel_layout_map[channel_config - 1][i][1]; int id = layout_map[i][1];
int positon = aac_channel_layout_map[channel_config - 1][i][2]; int position = layout_map[i][2];
if ((ret = che_configure(ac, positon, if ((ret = che_configure(ac, position,
type, id, type, id,
&channels))) &channels)))
return ret; return ret;
...@@ -437,7 +439,9 @@ static av_cold int output_configure(AACContext *ac, ...@@ -437,7 +439,9 @@ static av_cold int output_configure(AACContext *ac,
* channels in the order the PCE declared them. * channels in the order the PCE declared them.
*/ */
uint64_t layout = sniff_channel_order(layout_map, tags); uint64_t layout = 0;
if (avctx->request_channel_layout != AV_CH_LAYOUT_NATIVE)
layout = sniff_channel_order(layout_map, tags);
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];
......
libavcodec/aacdectab.h
View file @ f1ecd080
...@@ -83,11 +83,11 @@ static const int8_t tags_per_config[16] = { 0, 1, 1, 2, 3, 3, 4, 5, 0, 0, 0, 0, ...@@ -83,11 +83,11 @@ static const int8_t tags_per_config[16] = { 0, 1, 1, 2, 3, 3, 4, 5, 0, 0, 0, 0,
static const uint8_t aac_channel_layout_map[7][5][3] = { static const uint8_t aac_channel_layout_map[7][5][3] = {
{ { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, }, { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, },
{ { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, }, { { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, },
{ { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, }, { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, },
{ { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_SCE, 1, AAC_CHANNEL_BACK }, }, { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_SCE, 1, AAC_CHANNEL_BACK }, },
{ { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, }, { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, },
{ { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_LFE, 0, AAC_CHANNEL_LFE }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, }, { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, { TYPE_LFE, 0, AAC_CHANNEL_LFE }, },
{ { TYPE_CPE, 1, AAC_CHANNEL_FRONT }, { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_LFE, 0, AAC_CHANNEL_LFE }, { TYPE_CPE, 2, AAC_CHANNEL_BACK }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, }, { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_FRONT }, { TYPE_CPE, 2, AAC_CHANNEL_BACK }, { TYPE_LFE, 0, AAC_CHANNEL_LFE }, },
}; };
static const uint64_t aac_channel_layout[8] = { static const uint64_t aac_channel_layout[8] = {
......
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