diff options
| author | Tim W <tdskywalker@gmail.com> | 2012-02-21 21:27:03 +0100 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-02-21 16:10:05 -0500 |
| commit | b38b6d56ca5a0796d9b48fdaef14c5950c3abac5 (patch) | |
| tree | 88c5db1080dbd6ed35efcb972a924c7f1bb0e493 /libavutil | |
| parent | 79c7064c5f48c974bc713471d2a0deac6bf873a3 (diff) | |
| download | ffmpeg-b38b6d56ca5a0796d9b48fdaef14c5950c3abac5.tar.gz | |
Add names for more channel layouts to the channel layout map.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/audioconvert.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c index e9f9e411aa..83f2d7c762 100644 --- a/libavutil/audioconvert.c +++ b/libavutil/audioconvert.c @@ -64,16 +64,34 @@ static const struct { } channel_layout_map[] = { { "mono", 1, AV_CH_LAYOUT_MONO }, { "stereo", 2, AV_CH_LAYOUT_STEREO }, + { "stereo", 2, AV_CH_LAYOUT_STEREO_DOWNMIX }, + { "2.1", 3, AV_CH_LAYOUT_2POINT1 }, + { "3.0", 3, AV_CH_LAYOUT_SURROUND }, + { "3.0(back)", 3, AV_CH_LAYOUT_2_1 }, + { "3.1", 4, AV_CH_LAYOUT_3POINT1 }, { "4.0", 4, AV_CH_LAYOUT_4POINT0 }, { "quad", 4, AV_CH_LAYOUT_QUAD }, + { "quad(side)", 4, AV_CH_LAYOUT_2_2 }, + { "4.1", 5, AV_CH_LAYOUT_4POINT1 }, { "5.0", 5, AV_CH_LAYOUT_5POINT0 }, { "5.0", 5, AV_CH_LAYOUT_5POINT0_BACK }, { "5.1", 6, AV_CH_LAYOUT_5POINT1 }, { "5.1", 6, AV_CH_LAYOUT_5POINT1_BACK }, { "5.1+downmix", 8, AV_CH_LAYOUT_5POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, }, + { "6.0", 6, AV_CH_LAYOUT_6POINT0 }, + { "6.0(front)", 6, AV_CH_LAYOUT_6POINT0_FRONT }, + { "hexagonal", 6, AV_CH_LAYOUT_HEXAGONAL }, + { "6.1", 7, AV_CH_LAYOUT_6POINT1 }, + { "6.1", 7, AV_CH_LAYOUT_6POINT1_BACK }, + { "6.1(front)", 7, AV_CH_LAYOUT_6POINT1_FRONT }, + { "6.1+downmix", 9, AV_CH_LAYOUT_6POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, }, + { "7.0", 7, AV_CH_LAYOUT_7POINT0 }, + { "7.0(front)", 7, AV_CH_LAYOUT_7POINT0_FRONT }, { "7.1", 8, AV_CH_LAYOUT_7POINT1 }, { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE }, + { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE_BACK }, { "7.1+downmix", 10, AV_CH_LAYOUT_7POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, }, + { "octagonal", 8, AV_CH_LAYOUT_OCTAGONAL }, { 0 } }; |