[FFmpeg-cvslog] dca: map xxch side channels to AV_CH_SIDE_LEFT/RIGHT instead of REAR.

Hendrik Leppkes git at videolan.org
Thu Jul 12 02:46:45 CEST 2012


ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Jul  8 20:11:27 2012 +0200| [65219c3851825041456b06fd7d0b70b5f98c8e04] | committer: Michael Niedermayer

dca: map xxch side channels to AV_CH_SIDE_LEFT/RIGHT instead of REAR.

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 at southpole.se>
Reviewed-by: Nick Brereton <nick at nbrereton.net>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=65219c3851825041456b06fd7d0b70b5f98c8e04
---

 libavcodec/dca.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 87112ed..41d4905 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -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,



More information about the ffmpeg-cvslog mailing list