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

Use the selected mixer for chorus and flanger output

Browse Source
This commit is contained in:
Chris Robinson 2017-12-17 22:10:58 -08:00
parent 2346426b6e
commit 04cf832fe6
2 changed files with 22 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Alc/effects/chorus.c
View File

@ -223,15 +223,15 @@ static ALvoid ALchorusState_process(ALchorusState *state, ALsizei SamplesToDo, c
for(base = 0;base < SamplesToDo;)
{
const ALsizei todo = mini(128, SamplesToDo-base);
ALfloat temps[2][128];
ALsizei offset;
const ALsizei todo = mini(256, SamplesToDo-base);
ALfloat temps[256];
for(c = 0;c < 2;c++)
{
ALfloat *restrict sampbuf = state->SampleBuffer[c];
ALint disp_offset = state->lfo_disp*c;
ALint moddelays[128];
ALint moddelays[256];
ALsizei offset;
if(state->waveform == CWF_Triangle)
GetTriangleDelays(moddelays, (state->lfo_offset+disp_offset)%state->lfo_range,
@ -249,32 +249,18 @@ static ALvoid ALchorusState_process(ALchorusState *state, ALsizei SamplesToDo, c
ALfloat mu = (moddelays[i]&FRACTIONMASK) * (1.0f/FRACTIONONE);
sampbuf[offset&bufmask] = SamplesIn[0][base+i];
temps[c][i] = (sampbuf[(offset-delay) & bufmask]*(1.0f-mu) +
temps[i] = (sampbuf[(offset-delay) & bufmask]*(1.0f-mu) +
sampbuf[(offset-(delay+1)) & bufmask]*mu) * feedback;
sampbuf[offset&bufmask] += temps[c][i];
sampbuf[offset&bufmask] += temps[i];
offset++;
}
MixSamples(temps, NumChannels, SamplesOut, state->Gain[c], state->Gain[c],
0, base, todo);
}
state->offset = offset;
state->offset += todo;
state->lfo_offset = (state->lfo_offset+todo) % state->lfo_range;
for(c = 0;c < NumChannels;c++)
{
ALfloat gain = state->Gain[0][c];
if(fabsf(gain) > GAIN_SILENCE_THRESHOLD)
{
for(i = 0;i < todo;i++)
SamplesOut[c][i+base] += temps[0][i] * gain;
}
gain = state->Gain[1][c];
if(fabsf(gain) > GAIN_SILENCE_THRESHOLD)
{
for(i = 0;i < todo;i++)
SamplesOut[c][i+base] += temps[1][i] * gain;
}
}
base += todo;
}
}

34
Alc/effects/flanger.c
View File

@ -222,15 +222,15 @@ static ALvoid ALflangerState_process(ALflangerState *state, ALsizei SamplesToDo,
for(base = 0;base < SamplesToDo;)
{
const ALsizei todo = mini(128, SamplesToDo-base);
ALfloat temps[2][128];
ALsizei offset;
const ALsizei todo = mini(256, SamplesToDo-base);
ALfloat temps[256];
for(c = 0;c < 2;c++)
{
ALfloat *restrict sampbuf = state->SampleBuffer[c];
ALint disp_offset = state->lfo_disp*c;
ALint moddelays[128];
ALint moddelays[256];
ALsizei offset;
if(state->waveform == FWF_Triangle)
GetTriangleDelays(moddelays, (state->lfo_offset+disp_offset)%state->lfo_range,
@ -248,32 +248,18 @@ static ALvoid ALflangerState_process(ALflangerState *state, ALsizei SamplesToDo,
ALfloat mu = (moddelays[i]&FRACTIONMASK) * (1.0f/FRACTIONONE);
sampbuf[offset&bufmask] = SamplesIn[0][base+i];
temps[c][i] = (sampbuf[(offset-delay) & bufmask]*(1.0f-mu) +
temps[i] = (sampbuf[(offset-delay) & bufmask]*(1.0f-mu) +
sampbuf[(offset-(delay+1)) & bufmask]*mu) * feedback;
sampbuf[offset&bufmask] += temps[c][i];
sampbuf[offset&bufmask] += temps[i];
offset++;
}
MixSamples(temps, NumChannels, SamplesOut, state->Gain[c], state->Gain[c],
0, base, todo);
}
state->offset = offset;
state->offset += todo;
state->lfo_offset = (state->lfo_offset+todo) % state->lfo_range;
for(c = 0;c < NumChannels;c++)
{
ALfloat gain = state->Gain[0][c];
if(fabsf(gain) > GAIN_SILENCE_THRESHOLD)
{
for(i = 0;i < todo;i++)
SamplesOut[c][i+base] += temps[0][i] * gain;
}
gain = state->Gain[1][c];
if(fabsf(gain) > GAIN_SILENCE_THRESHOLD)
{
for(i = 0;i < todo;i++)
SamplesOut[c][i+base] += temps[1][i] * gain;
}
}
base += todo;
}
}