Andrew Eikum : dsound: Support downmixing quadraphonic to stereo.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1def346bab59ac447c7f9c34528fb4490b8ed69c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1def346bab59ac447c7f9c3452...

Author: Andrew Eikum <aeikum(a)codeweavers.com>
Date:   Thu May 19 09:11:16 2016 -0500

dsound: Support downmixing quadraphonic to stereo.

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/dsound/dsound_convert.c | 27 +++++++++++++++++++++++++++
 dlls/dsound/dsound_private.h |  1 +
 dlls/dsound/mixer.c          |  6 ++++++
 3 files changed, 34 insertions(+)

diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c
index 3b4d2e5..d9ed637 100644
--- a/dlls/dsound/dsound_convert.c
+++ b/dlls/dsound/dsound_convert.c
@@ -252,6 +252,33 @@ void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c
     }
 }
 
+void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value)
+{
+    /* based on pulseaudio's downmix algorithm */
+    switch(channel){
+
+    case 2: /* back left */
+        value *= 0.1f; /* (1/9) / (sum of left volumes) */
+        dsb->put_aux(dsb, pos, 0, value);
+        break;
+
+    case 0: /* front left */
+        value *= 0.9f; /* 1 / (sum of left volumes) */
+        dsb->put_aux(dsb, pos, 0, value);
+        break;
+
+    case 3: /* back right */
+        value *= 0.1f; /* (1/9) / (sum of right volumes) */
+        dsb->put_aux(dsb, pos, 1, value);
+        break;
+
+    case 1: /* front right */
+        value *= 0.9f; /* 1 / (sum of right volumes) */
+        dsb->put_aux(dsb, pos, 1, value);
+        break;
+    }
+}
+
 void mixieee32(float *src, float *dst, unsigned samples)
 {
     TRACE("%p - %p %d\n", src, dst, samples);
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index 49e98ba..63d1226 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -179,6 +179,7 @@ void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel
 void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN;
 void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN;
 void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN;
+void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN;
 
 HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd,
         IDirectSoundBuffer **buffer) DECLSPEC_HIDDEN;
diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
index 4f05ee2..309c338 100644
--- a/dlls/dsound/mixer.c
+++ b/dlls/dsound/mixer.c
@@ -179,6 +179,12 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb)
 		dsb->put = put_surround512stereo;
 		dsb->put_aux = putieee32_sum;
 	}
+	else if (ichannels == 4 && ochannels == 2)
+	{
+		dsb->mix_channels = 4;
+		dsb->put = put_quad2stereo;
+		dsb->put_aux = putieee32_sum;
+	}
 	else
 	{
 		if (ichannels > 2)