dca: map xxch side channels to AV_CH_SIDE_LEFT/RIGHT instead of REAR.
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 8 Jul 2012 18:11:27 +0000 (20:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Jul 2012 00:33:16 +0000 (02:33 +0200)
This fixes decoding of certain 7.1 DTS-HD HRA files, as well as matches the spec better.
Table 6-22 in the DTS spec labels the two channels "Left/Right surround on side", and not rear.

Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Reviewed-by: Nick Brereton <nick@nbrereton.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dca.c

index 87112ed..41d4905 100644 (file)
@@ -136,8 +136,8 @@ static const uint32_t map_xxch_to_native[28] = {
     AV_CH_BACK_CENTER,
     AV_CH_BACK_LEFT,
     AV_CH_BACK_RIGHT,
-    AV_CH_BACK_LEFT,           /* side surround left -- dup sur rear L */
-    AV_CH_BACK_RIGHT,          /* side surround right -- dup sur rear R */
+    AV_CH_SIDE_LEFT,           /* side surround left -- dup sur side L */
+    AV_CH_SIDE_RIGHT,          /* side surround right -- dup sur side R */
     AV_CH_FRONT_LEFT_OF_CENTER,
     AV_CH_FRONT_RIGHT_OF_CENTER,
     AV_CH_TOP_FRONT_LEFT,