summaryrefslogtreecommitdiff
path: root/libavcodec/mlp_parser.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2011-12-04 22:54:22 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-10 02:11:24 +0100
commitb7bf93b9233878fd3bc77e5461a977c0c97e779a (patch)
treef4f727b91aea1f946f40872e0f0e6a72a6af46ed /libavcodec/mlp_parser.c
parentc59b80c8d3e46f176172d582f27c14d772e306fc (diff)
mlp: Use correct speaker locations in TrueHD channel layout.
(cherry picked from commit d7787835ad737d4f4d8b6f17e04d981632eeaa91) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlp_parser.c')
-rw-r--r--libavcodec/mlp_parser.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c
index 0c06dbbab4..4ceea5e9e1 100644
--- a/libavcodec/mlp_parser.c
+++ b/libavcodec/mlp_parser.c
@@ -79,13 +79,13 @@ static const uint64_t thd_layout[13] = {
AV_CH_LOW_FREQUENCY, // LFE
AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRs
AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT, // LRvh
- AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRc
+ AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER, // LRc
AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT, // LRrs
AV_CH_BACK_CENTER, // Cs
- AV_CH_TOP_BACK_CENTER, // Ts
- AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRsd
- AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER, // LRw
- AV_CH_TOP_BACK_CENTER, // Cvh
+ AV_CH_TOP_CENTER, // Ts
+ AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRsd - TODO: Surround Direct
+ AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER, // LRw - TODO: Wide
+ AV_CH_TOP_FRONT_CENTER, // Cvh
AV_CH_LOW_FREQUENCY // LFE2
};