diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-05-07 07:20:32 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:39 -0300 |
| commit | 494760f971a41851630d7940abe914cd1115737e (patch) | |
| tree | 33e017519b761fc8e6776fdc15b5fca627d02f68 /libavcodec/aacdectab.h | |
| parent | 2350a50bed6bd71c67947604f117a4dff73ebe35 (diff) | |
| download | ffmpeg-494760f971a41851630d7940abe914cd1115737e.tar.gz | |
aac: convert to new channel layout API
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/aacdectab.h')
| -rw-r--r-- | libavcodec/aacdectab.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h index c54a3eb943..e03026806d 100644 --- a/libavcodec/aacdectab.h +++ b/libavcodec/aacdectab.h @@ -72,6 +72,7 @@ static const uint8_t aac_channel_layout_map[16][16][3] = { /* TODO: Add 7+1 TOP configuration */ }; +#if FF_API_OLD_CHANNEL_LAYOUT static const uint64_t aac_channel_layout[16] = { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, @@ -89,5 +90,24 @@ static const uint64_t aac_channel_layout[16] = { 0, /* AV_CH_LAYOUT_7POINT1_TOP, */ }; +#endif + +static const AVChannelLayout aac_ch_layout[16] = { + AV_CHANNEL_LAYOUT_MONO, + AV_CHANNEL_LAYOUT_STEREO, + AV_CHANNEL_LAYOUT_SURROUND, + AV_CHANNEL_LAYOUT_4POINT0, + AV_CHANNEL_LAYOUT_5POINT0_BACK, + AV_CHANNEL_LAYOUT_5POINT1_BACK, + AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK, + { 0 }, + { 0 }, + { 0 }, + AV_CHANNEL_LAYOUT_6POINT1, + AV_CHANNEL_LAYOUT_7POINT1, + AV_CHANNEL_LAYOUT_22POINT2, + { 0 }, + /* AV_CHANNEL_LAYOUT_7POINT1_TOP, */ +}; #endif /* AVCODEC_AACDECTAB_H */ |