Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure NextPowerOf2 is being used correctly

Browse Source
This commit is contained in:
Chris Robinson
2018-01-11 09:53:52 -08:00
parent b11131ce0c
commit ca9e6a4f94
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/effects/chorus.c
+2 -2
View File
@@ -98,8 +98,8 @@ static ALboolean ALchorusState_deviceUpdate(ALchorusState *state, ALCdevice *Dev
const ALfloat max_delay = maxf(AL_CHORUS_MAX_DELAY, AL_FLANGER_MAX_DELAY);
ALsizei maxlen;
maxlen = fastf2i(max_delay * 2.0f * Device->Frequency) + 1;
maxlen = NextPowerOf2(maxlen);
maxlen = NextPowerOf2(fastf2i(max_delay*2.0f*Device->Frequency) + 1);
if(maxlen <= 0) return AL_FALSE;
if(maxlen != state->BufferLength)
{
Alc/effects/echo.c
+4 -3
View File
@@ -91,9 +91,10 @@ static ALboolean ALechoState_deviceUpdate(ALechoState *state, ALCdevice *Device)
// Use the next power of 2 for the buffer length, so the tap offsets can be
// wrapped using a mask instead of a modulo
maxlen = fastf2i(AL_ECHO_MAX_DELAY * Device->Frequency) + 1;
maxlen += fastf2i(AL_ECHO_MAX_LRDELAY * Device->Frequency) + 1;
maxlen = NextPowerOf2(maxlen);
maxlen = fastf2i(AL_ECHO_MAX_DELAY*Device->Frequency + 0.5f) +
fastf2i(AL_ECHO_MAX_LRDELAY*Device->Frequency + 0.5f);
maxlen = NextPowerOf2(maxlen);
if(maxlen <= 0) return AL_FALSE;
if(maxlen != state->BufferLength)
{
Alc/ringbuffer.c
+2 -3
View File
@@ -51,9 +51,8 @@ ll_ringbuffer_t *ll_ringbuffer_create(size_t sz, size_t elem_sz)
ll_ringbuffer_t *rb;
size_t power_of_two;
power_of_two = NextPowerOf2(sz);
if(power_of_two < sz)
return NULL;
power_of_two = NextPowerOf2((ALuint)sz);
if(power_of_two < sz) return NULL;
rb = al_malloc(16, sizeof(*rb) + power_of_two*elem_sz);
if(!rb) return NULL;