dsound: Pass sample count to the normfunction.

Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dsound: Pass sample count to the normfunction.
e6f8f136 · Huw Davies · Alexandre Julliard · 134b684f · e6f8f136 · e6f8f136
Commit e6f8f136 authored Mar 01, 2017 by Huw Davies Committed by Alexandre Julliard Mar 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 16 deletions

dsound_convert.c dlls/dsound/dsound_convert.c +12 -15

mixer.c dlls/dsound/mixer.c +1 -1

No files found.
--- a/dlls/dsound/dsound_convert.c
+++ b/dlls/dsound/dsound_convert.c
@@ -286,10 +286,10 @@ void mixieee32(float *src, float *dst, unsigned samples)
        *(dst++) += *(src++);
 }
-static void norm8(float *src, unsigned char *dst, unsigned len)
+static void norm8(float *src, unsigned char *dst, unsigned samples)
 {
-    TRACE("%p - %p %d\n", src, dst, len);
+    TRACE("%p - %p %d\n", src, dst, samples);
-    while (len--)
+    while (samples--)
    {
        *dst = f_to_8(*src);
        ++dst;
@@ -297,11 +297,10 @@ static void norm8(float *src, unsigned char *dst, unsigned len)
    }
 }
-static void norm16(float *src, SHORT *dst, unsigned len)
+static void norm16(float *src, SHORT *dst, unsigned samples)
 {
-    TRACE("%p - %p %d\n", src, dst, len);
+    TRACE("%p - %p %d\n", src, dst, samples);
-    len /= 2;
+    while (samples--)
-    while (len--)
    {
        *dst = f_to_16(*src);
        ++dst;
@@ -309,11 +308,10 @@ static void norm16(float *src, SHORT *dst, unsigned len)
    }
 }
-static void norm24(float *src, BYTE *dst, unsigned len)
+static void norm24(float *src, BYTE *dst, unsigned samples)
 {
-    TRACE("%p - %p %d\n", src, dst, len);
+    TRACE("%p - %p %d\n", src, dst, samples);
-    len /= 3;
+    while (samples--)
-    while (len--)
    {
        LONG t = f_to_24(*src);
        dst[0] = (t >> 8) & 0xFF;
@@ -324,11 +322,10 @@ static void norm24(float *src, BYTE *dst, unsigned len)
    }
 }
-static void norm32(float *src, INT *dst, unsigned len)
+static void norm32(float *src, INT *dst, unsigned samples)
 {
-    TRACE("%p - %p %d\n", src, dst, len);
+    TRACE("%p - %p %d\n", src, dst, samples);
-    len /= 4;
+    while (samples--)
-    while (len--)
    {
        *dst = f_to_32(*src);
        ++dst;

--- a/dlls/dsound/mixer.c
+++ b/dlls/dsound/mixer.c
@@ -716,7 +716,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device)
 			/* do the mixing */
 			DSOUND_MixToPrimary(device, (float*)device->buffer, frames, &all_stopped);
-			device->normfunction(device->buffer, buffer, frames * block);
+			device->normfunction(device->buffer, buffer, frames * device->pwfx->nChannels);
 		}
 		hr = IAudioRenderClient_ReleaseBuffer(device->render, frames, 0);