diff options
author | Jan Ekström <jeebjp@gmail.com> | 2020-06-11 22:08:30 +0300 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2020-08-04 00:17:56 +0300 |
commit | 34de0abbe71fa90e874ff902200e5c6c466ba2f6 (patch) | |
tree | 3067ef5a7906b516d8cdd3f3a662a7a6d6851c21 /libavutil/channel_layout.c | |
parent | 4ad868497f2b5b10bff934f46f1b590c28e999de (diff) |
avutil/channel_layout: add 22.2 layout
Requires some extraneous top side and bottom front channels to be
defined.
According to STD-B59v2, the defined channel layout is:
- FL
- FR
- FC
- LFE1
- BL
- BR
- FLc
- FRc
- BC
- LFE2
- SiL
- SiR
- TpFL
- TpFR
- TpFC
- TpC
- TpBL
- TpBR
- TpSiL
- TpSiR
- TpBC
- BtFC
- BtFL
- BtFR
Diffstat (limited to 'libavutil/channel_layout.c')
-rw-r--r-- | libavutil/channel_layout.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index 3bd5ee29b7..ac773a9e63 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -62,6 +62,11 @@ static const struct channel_name channel_names[] = { [33] = { "SDL", "surround direct left" }, [34] = { "SDR", "surround direct right" }, [35] = { "LFE2", "low frequency 2" }, + [36] = { "TSL", "top side left" }, + [37] = { "TSR", "top side right" }, + [38] = { "BFC", "bottom front center" }, + [39] = { "BFL", "bottom front left" }, + [40] = { "BFR", "bottom front right" }, }; static const char *get_channel_name(int channel_id) @@ -104,6 +109,7 @@ static const struct { { "octagonal", 8, AV_CH_LAYOUT_OCTAGONAL }, { "hexadecagonal", 16, AV_CH_LAYOUT_HEXADECAGONAL }, { "downmix", 2, AV_CH_LAYOUT_STEREO_DOWNMIX, }, + { "22.2", 24, AV_CH_LAYOUT_22POINT2, }, }; static uint64_t get_channel_layout_single(const char *name, int name_len) |