marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
oldstable
Huw Davies 2017-03-01 16:01:00 +00:00 committed by Alexandre Julliard
parent 134b684fd9
commit e6f8f136fa
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/dsound/dsound_convert.c
View File

@ -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);
while (len--)
TRACE("%p - %p %d\n", src, dst, samples);
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);
len /= 2;
while (len--)
TRACE("%p - %p %d\n", src, dst, samples);
while (samples--)
{
*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);
len /= 3;
while (len--)
TRACE("%p - %p %d\n", src, dst, samples);
while (samples--)
{
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);
len /= 4;
while (len--)
TRACE("%p - %p %d\n", src, dst, samples);
while (samples--)
{
*dst = f_to_32(*src);
++dst;

2
dlls/dsound/mixer.c
View File

@ -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);