Turns out those ones make the decoder unable to accurately determine the
layout, hence making some API users' guess, and sometimes those are correct
(ffmpeg.c), but most often (especially with side channels) they're wrong.
The removed ones need to be investigated into as to why the decoder rejects
them.
Signed-off-by: Rostislav Pehlivanov <atomnu...@gmail.com>
---
libavcodec/aacenc.h | 177 --------------------------------------------
1 file changed, 177 deletions(-)
diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h
index 5a015ca92e..74f8fcf43a 100644
--- a/libavcodec/aacenc.h
+++ b/libavcodec/aacenc.h
@@ -167,38 +167,6 @@ static const AACPCEInfo aac_pce_configs[] = {
.config_map = { 2, TYPE_CPE, TYPE_SCE },
.reorder_map = { 0, 1, 2 },
},
- {
- .layout = AV_CH_LAYOUT_SURROUND,
- .num_ele = { 2, 0, 0, 0 },
- .pairing = { { 1, 0 }, },
- .index = { { 0, 0 }, },
- .config_map = { 2, TYPE_CPE, TYPE_SCE, },
- .reorder_map = { 0, 1, 2 },
- },
- {
- .layout = AV_CH_LAYOUT_3POINT1,
- .num_ele = { 2, 0, 0, 1 },
- .pairing = { { 1, 0 }, },
- .index = { { 0, 0 }, { 0 }, { 0 }, { 0 }, },
- .config_map = { 3, TYPE_CPE, TYPE_SCE, TYPE_LFE },
- .reorder_map = { 0, 1, 2, 3 },
- },
- {
- .layout = AV_CH_LAYOUT_4POINT0,
- .num_ele = { 2, 0, 1, 0 },
- .pairing = { { 1, 0 }, { 0 }, { 0 }, },
- .index = { { 0, 0 }, { 0 }, { 1 } },
- .config_map = { 3, TYPE_CPE, TYPE_SCE, TYPE_SCE },
- .reorder_map = { 0, 1, 2, 3 },
- },
- {
- .layout = AV_CH_LAYOUT_4POINT1,
- .num_ele = { 2, 1, 1, 0 },
- .pairing = { { 1, 0 }, { 0 }, { 0 }, },
- .index = { { 0, 0 }, { 1 }, { 2 }, { 0 } },
- .config_map = { 4, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_SCE },
- .reorder_map = { 0, 1, 2, 3, 4 },
- },
{
.layout = AV_CH_LAYOUT_2_2,
.num_ele = { 1, 1, 0, 0 },
@@ -215,46 +183,6 @@ static const AACPCEInfo aac_pce_configs[] = {
.config_map = { 2, TYPE_CPE, TYPE_CPE },
.reorder_map = { 0, 1, 2, 3 },
},
- {
- .layout = AV_CH_LAYOUT_5POINT0,
- .num_ele = { 2, 1, 0, 0 },
- .pairing = { { 1, 0 }, { 1 }, },
- .index = { { 0, 0 }, { 1 } },
- .config_map = { 3, TYPE_CPE, TYPE_SCE, TYPE_CPE },
- .reorder_map = { 0, 1, 2, 3, 4 },
- },
- {
- .layout = AV_CH_LAYOUT_5POINT1,
- .num_ele = { 2, 1, 1, 0 },
- .pairing = { { 1, 0 }, { 0 }, { 1 }, },
- .index = { { 0, 0 }, { 1 }, { 1 } },
- .config_map = { 4, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE },
- .reorder_map = { 0, 1, 2, 3, 4, 5 },
- },
- {
- .layout = AV_CH_LAYOUT_5POINT0_BACK,
- .num_ele = { 2, 0, 1, 0 },
- .pairing = { { 1, 0 }, { 0 }, { 1 } },
- .index = { { 0, 0 }, { 0 }, { 1 } },
- .config_map = { 3, TYPE_CPE, TYPE_SCE, TYPE_CPE },
- .reorder_map = { 0, 1, 2, 3, 4 },
- },
- {
- .layout = AV_CH_LAYOUT_5POINT1_BACK,
- .num_ele = { 2, 1, 1, 0 },
- .pairing = { { 1, 0 }, { 0 }, { 1 }, },
- .index = { { 0, 0 }, { 1 }, { 1 } },
- .config_map = { 4, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE },
- .reorder_map = { 0, 1, 2, 3, 4, 5 },
- },
- {
- .layout = AV_CH_LAYOUT_6POINT0,
- .num_ele = { 2, 1, 1, 0 },
- .pairing = { { 1, 0 }, { 1 }, { 0 }, },
- .index = { { 0, 0 }, { 1 }, { 1 } },
- .config_map = { 4, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_SCE },
- .reorder_map = { 0, 1, 2, 3, 4, 5 },
- },
{
.layout = AV_CH_LAYOUT_6POINT0_FRONT,
.num_ele = { 2, 1, 0, 0 },
@@ -263,111 +191,6 @@ static const AACPCEInfo aac_pce_configs[] = {
.config_map = { 3, TYPE_CPE, TYPE_CPE, TYPE_CPE, },
.reorder_map = { 0, 1, 2, 3, 4, 5 },
},
- {
- .layout = AV_CH_LAYOUT_HEXAGONAL,
- .num_ele = { 2, 0, 2, 0 },
- .pairing = { { 1, 0 },{ 0 },{ 1, 0 }, },
- .index = { { 0, 0 },{ 0 },{ 1, 1 } },
- .config_map = { 4, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_SCE, },
- .reorder_map = { 0, 1, 2, 3, 4, 5 },
- },
- {
- .layout = AV_CH_LAYOUT_6POINT1,
- .num_ele = { 2, 1, 2, 0 },
- .pairing = { { 1, 0 },{ 0 },{ 1, 0 }, },
- .index = { { 0, 0 },{ 1 },{ 1, 2 } },
- .config_map = { 5, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE, TYPE_SCE },
- .reorder_map = { 0, 1, 2, 3, 4, 5, 6 },
- },
- {
- .layout = AV_CH_LAYOUT_6POINT1_BACK,
- .num_ele = { 2, 1, 2, 0 },
- .pairing = { { 1, 0 }, { 0 }, { 1, 0 }, },
- .index = { { 0, 0 }, { 1 }, { 1, 2 } },
- .config_map = { 5, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE, TYPE_SCE },
- .reorder_map = { 0, 1, 2, 3, 4, 5, 6 },
- },
- {
- .layout = AV_CH_LAYOUT_6POINT1_FRONT,
- .num_ele = { 2, 1, 2, 0 },
- .pairing = { { 1, 0 }, { 0 }, { 1, 0 }, },
- .index = { { 0, 0 }, { 1 }, { 1, 2 } },
- .config_map = { 5, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE, TYPE_SCE },
- .reorder_map = { 0, 1, 2, 3, 4, 5, 6 },
- },
- {
- .layout = AV_CH_LAYOUT_7POINT0,
- .num_ele = { 2, 1, 1, 0 },
- .pairing = { { 1, 0 }, { 1 }, { 1 }, },
- .index = { { 0, 0 }, { 1 }, { 2 }, },
- .config_map = { 4, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_CPE },
- .reorder_map = { 0, 1, 2, 3, 4, 5, 6 },
- },
- {
- .layout = AV_CH_LAYOUT_7POINT0_FRONT,
- .num_ele = { 2, 1, 1, 0 },
- .pairing = { { 1, 0 }, { 1 }, { 1 }, },
- .index = { { 0, 0 }, { 1 }, { 2 }, },
- .config_map = { 4, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_CPE },
- .reorder_map = { 0, 1, 2, 3, 4, 5, 6 },
- },
- {
- .layout = AV_CH_LAYOUT_7POINT1,
- .num_ele = { 2, 1, 2, 0 },
- .pairing = { { 1, 0 }, { 0 }, { 1, 1 }, },
- .index = { { 0, 0 }, { 1 }, { 1, 2 }, { 0 } },
- .config_map = { 5, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE, TYPE_CPE },
- .reorder_map = { 0, 1, 2, 3, 4, 5, 6, 7 },
- },
- {
- .layout = AV_CH_LAYOUT_7POINT1_WIDE,
- .num_ele = { 2, 1, 2, 0 },
- .pairing = { { 1, 0 }, { 0 },{ 1, 1 }, },
- .index = { { 0, 0 }, { 1 }, { 1, 2 }, { 0 } },
- .config_map = { 5, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE, TYPE_CPE },
- .reorder_map = { 0, 1, 2, 3, 4, 5, 6, 7 },
- },
- {
- .layout = AV_CH_LAYOUT_7POINT1_WIDE_BACK,
- .num_ele = { 2, 1, 2, 0 },
- .pairing = { { 1, 0 }, { 0 }, { 1, 1 }, },
- .index = { { 0, 0 }, { 1 }, { 1, 2 }, { 0 } },
- .config_map = { 5, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE, TYPE_CPE },
- .reorder_map = { 0, 1, 2, 3, 4, 5, 6, 7 },
- },
- {
- .layout = AV_CH_LAYOUT_OCTAGONAL,
- .num_ele = { 2, 1, 2, 0 },
- .pairing = { { 1, 0 }, { 1 }, { 1, 0 }, },
- .index = { { 0, 0 }, { 1 }, { 2, 1 } },
- .config_map = { 5, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_CPE, TYPE_SCE },
- .reorder_map = { 0, 1, 2, 3, 4, 5, 6, 7 },
- },
- { /* Meant for order 2/mixed ambisonics */
- .layout = AV_CH_LAYOUT_OCTAGONAL | AV_CH_TOP_CENTER,
- .num_ele = { 2, 2, 2, 0 },
- .pairing = { { 1, 0 }, { 1, 0 }, { 1, 0 }, },
- .index = { { 0, 0 }, { 1, 1 }, { 2, 2 } },
- .config_map = { 6, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_SCE, TYPE_CPE,
TYPE_SCE },
- .reorder_map = { 0, 1, 2, 3, 4, 5, 6, 7, 8 },
- },
- { /* Meant for order 2/mixed ambisonics */
- .layout = AV_CH_LAYOUT_6POINT0_FRONT | AV_CH_BACK_CENTER |
- AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT | AV_CH_TOP_CENTER,
- .num_ele = { 2, 2, 2, 0 },
- .pairing = { { 1, 1 }, { 1, 0 }, { 1, 0 }, },
- .index = { { 0, 1 }, { 2, 0 }, { 3, 1 } },
- .config_map = { 6, TYPE_CPE, TYPE_CPE, TYPE_CPE, TYPE_SCE, TYPE_CPE,
TYPE_SCE },
- .reorder_map = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 },
- },
- {
- .layout = AV_CH_LAYOUT_HEXADECAGONAL,
- .num_ele = { 4, 2, 4, 0 },
- .pairing = { { 1, 0, 1, 0 }, { 1, 1 }, { 1, 0, 1, 0 }, },
- .index = { { 0, 0, 1, 1 }, { 2, 3 }, { 4, 2, 5, 3 } },
- .config_map = { 10, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_SCE, TYPE_CPE,
TYPE_CPE, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_SCE },
- .reorder_map = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
},
- },
};
/**
--
2.18.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
