aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aacdectab.h
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2022-10-26 20:25:51 -0300
committerJames Almer <jamrial@gmail.com>2022-11-03 19:39:52 -0300
commitcf653aabb5b32ce2538365e32ea9db51592169c3 (patch)
tree25db66f63ad308ce5a2fe65f316f8531ba5a5d26 /libavcodec/aacdectab.h
parentc79b16306f6c612cb5ef970b2745564082bb8d16 (diff)
downloadffmpeg-cf653aabb5b32ce2538365e32ea9db51592169c3.tar.gz
avcodec/aacdec: add support for channel configuration 14
It corresponds to the 7.1(top) layout. Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/aacdectab.h')
-rw-r--r--libavcodec/aacdectab.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h
index 327efbcde0..0e5e47da64 100644
--- a/libavcodec/aacdectab.h
+++ b/libavcodec/aacdectab.h
@@ -68,8 +68,8 @@ static const uint8_t aac_channel_layout_map[16][16][3] = {
{ TYPE_SCE, 5, AAC_CHANNEL_FRONT }, // SCE6 = BtFC,
{ TYPE_CPE, 7, AAC_CHANNEL_FRONT }, // CPE8 = BtFL and BtFR
},
+ { { 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, 2, AAC_CHANNEL_FRONT }, },
{ { 0, } },
- /* TODO: Add 7+1 TOP configuration */
};
#if FF_API_OLD_CHANNEL_LAYOUT
@@ -84,8 +84,8 @@ static const uint64_t aac_channel_layout[] = {
AV_CH_LAYOUT_6POINT1_BACK,
AV_CH_LAYOUT_7POINT1,
AV_CH_LAYOUT_22POINT2,
+ AV_CH_LAYOUT_7POINT1_TOP_BACK,
0,
- /* AV_CH_LAYOUT_7POINT1_TOP, */
};
#endif
@@ -100,8 +100,8 @@ static const AVChannelLayout aac_ch_layout[] = {
AV_CHANNEL_LAYOUT_6POINT1_BACK,
AV_CHANNEL_LAYOUT_7POINT1,
AV_CHANNEL_LAYOUT_22POINT2,
+ AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK,
{ 0 },
- /* AV_CHANNEL_LAYOUT_7POINT1_TOP, */
};
#endif /* AVCODEC_AACDECTAB_H */