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

Improve handling of 0hz ring modulator frequency

Browse Source
This commit is contained in:
Chris Robinson 2018-07-21 14:21:00 -07:00
parent d117a5209f
commit 6fe1ffa3bb
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Alc/effects/modulator.c
View File

@ -76,6 +76,11 @@ static inline ALfloat Square(ALsizei index)
return (ALfloat)(((index>>(WAVEFORM_FRACBITS-2))&2) - 1); return (ALfloat)(((index>>(WAVEFORM_FRACBITS-2))&2) - 1);
} }
static inline ALfloat One(ALsizei UNUSED(index))
{
return 1.0f;
}
#define DECL_TEMPLATE(func) \ #define DECL_TEMPLATE(func) \
static void Modulate##func(ALfloat *restrict dst, ALsizei index, \ static void Modulate##func(ALfloat *restrict dst, ALsizei index, \
const ALsizei step, ALsizei todo) \ const ALsizei step, ALsizei todo) \
@ -92,6 +97,7 @@ static void Modulate##func(ALfloat *restrict dst, ALsizei index, \
DECL_TEMPLATE(Sin) DECL_TEMPLATE(Sin)
DECL_TEMPLATE(Saw) DECL_TEMPLATE(Saw)
DECL_TEMPLATE(Square) DECL_TEMPLATE(Square)
DECL_TEMPLATE(One)
#undef DECL_TEMPLATE #undef DECL_TEMPLATE
@ -128,17 +134,19 @@ static ALvoid ALmodulatorState_update(ALmodulatorState *state, const ALCcontext
ALfloat f0norm; ALfloat f0norm;
ALsizei i; ALsizei i;
if(props->Modulator.Waveform == AL_RING_MODULATOR_SINUSOID) state->step = fastf2i(props->Modulator.Frequency / (ALfloat)device->Frequency *
WAVEFORM_FRACONE);
state->step = clampi(state->step, 0, WAVEFORM_FRACONE-1);
if(state->step == 0)
state->GetSamples = ModulateOne;
else if(props->Modulator.Waveform == AL_RING_MODULATOR_SINUSOID)
state->GetSamples = ModulateSin; state->GetSamples = ModulateSin;
else if(props->Modulator.Waveform == AL_RING_MODULATOR_SAWTOOTH) else if(props->Modulator.Waveform == AL_RING_MODULATOR_SAWTOOTH)
state->GetSamples = ModulateSaw; state->GetSamples = ModulateSaw;
else /*if(Slot->Params.EffectProps.Modulator.Waveform == AL_RING_MODULATOR_SQUARE)*/ else /*if(Slot->Params.EffectProps.Modulator.Waveform == AL_RING_MODULATOR_SQUARE)*/
state->GetSamples = ModulateSquare; state->GetSamples = ModulateSquare;
state->step = fastf2i(props->Modulator.Frequency / (ALfloat)device->Frequency *
WAVEFORM_FRACONE);
state->step = clampi(state->step, 1, WAVEFORM_FRACONE-1);
f0norm = props->Modulator.HighPassCutoff / (ALfloat)device->Frequency; f0norm = props->Modulator.HighPassCutoff / (ALfloat)device->Frequency;
f0norm = clampf(f0norm, 1.0f/512.0f, 0.5f); f0norm = clampf(f0norm, 1.0f/512.0f, 0.5f);
/* Bandwidth value is constant in octaves. */ /* Bandwidth value is constant in octaves. */