[xiph-commits] r17215 - in trunk/oggdsf/src/lib/codecs: flac/filters/dsfNativeFLACSource vorbis/filters/dsfVorbisDecoder

[cristianadam at svn.xiph.org]

Author: cristianadam
Date: 2010-05-15 02:22:49 -0700 (Sat, 15 May 2010)
New Revision: 17215

Modified:
   trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourcePin.cpp
   trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.cpp
Log:
Bugfix for Ticket #1657 - FLAC 7.1 wrong mapped channels


Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourcePin.cpp	2010-05-14 22:58:14 UTC (rev 17214)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfNativeFLACSource/NativeFLACSourcePin.cpp	2010-05-15 09:22:49 UTC (rev 17215)
@@ -1,6 +1,6 @@
 //===========================================================================
 //Copyright (C) 2003, 2004 Zentaro Kavanagh
-//Copyright (C) 2008, 2009 Cristian Adam
+//Copyright (C) 2008, 2010 Cristian Adam
 //
 //Redistribution and use in source and binary forms, with or without
 //modification, are permitted provided that the following conditions
@@ -185,7 +185,7 @@
             formatEx->dwChannelMask = KSAUDIO_SPEAKER_5POINT1;
             break;
         case 8:
-            formatEx->dwChannelMask = KSAUDIO_SPEAKER_7POINT1;
+            formatEx->dwChannelMask = KSAUDIO_SPEAKER_7POINT1_SURROUND;
             break;
         default:
             formatEx->dwChannelMask = 0;

Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.cpp	2010-05-14 22:58:14 UTC (rev 17214)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.cpp	2010-05-15 09:22:49 UTC (rev 17215)
@@ -1,5 +1,6 @@
 //===========================================================================
 //Copyright (C) 2003-2006 Zentaro Kavanagh
+//Copyright (2) 2009-2010 Cristian Adam
 //
 //Redistribution and use in source and binary forms, with or without
 //modification, are permitted provided that the following conditions
@@ -137,7 +138,7 @@
             formatEx->dwChannelMask = KSAUDIO_SPEAKER_5POINT1;
             break;
         case 8:
-            formatEx->dwChannelMask = KSAUDIO_SPEAKER_7POINT1;
+            formatEx->dwChannelMask = KSAUDIO_SPEAKER_7POINT1_SURROUND;
             break;
         default:
             formatEx->dwChannelMask = 0;