Signalsmith-Audio/basics
1
0
Fork 0
Code

Fade delays on chorus depth change

Browse Source
This commit is contained in:
Geraint 2025-07-04 23:47:19 +01:00
parent 15c904aff6
commit fd80328727
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
chorus.h
View File

@ -57,7 +57,7 @@ struct ChorusSTFX : public BaseEffect {
storage.range("detune", detune) storage.range("detune", detune)
.info("detune", "detuning depth") .info("detune", "detuning depth")
.range(1, 10, 50) .range(1, 8, 50)
.unit(" s.t.", 0); .unit(" s.t.", 0);
} }
@ -73,6 +73,7 @@ struct ChorusSTFX : public BaseEffect {
void reset() { void reset() {
delay.reset(); delay.reset();
phase = 0;
} }
template<class Io, class Config, class Block> template<class Io, class Config, class Block>
@ -80,13 +81,16 @@ struct ChorusSTFX : public BaseEffect {
Sample detuneHz = detune*0.45f/depthMs; // 0.45ms oscillation at 1Hz is about 1 semitone Sample detuneHz = detune*0.45f/depthMs; // 0.45ms oscillation at 1Hz is about 1 semitone
Sample phaseStep = detuneHz/config.sampleRate; Sample phaseStep = detuneHz/config.sampleRate;
Sample depthSamples = depthMs*0.001*config.sampleRate; bool fading = depthMs.from() != depthMs.to();
Sample depthSamples = depthMs.to()*0.001*config.sampleRate;
Sample depthSamplesFrom = depthMs.from()*0.001*config.sampleRate;
std::array<Sample, 6> multiIn, multiOut; std::array<Sample, 6> multiIn, multiOut;
std::array<Sample, 6> delaySamples; std::array<Sample, 6> delaySamples;
Sample dry = 1 - mix*mix, wet = mix*(2 - mix)/std::sqrt(Sample(6)); auto dry = block.smooth(mix, [](double m){return 1 - m*m;});
auto wet = block.smooth(mix, [](double m){return m*(2 - m)/std::sqrt(Sample(6));});
for (size_t i = 0; i < block.length; ++i) { for (size_t i = 0; i < block.length; ++i) {
for (size_t c = 0; c < 6; ++c) { for (size_t c = 0; c < 6; ++c) {
size_t inputC = c%config.inputChannels; size_t inputC = c%config.inputChannels;
@ -94,21 +98,32 @@ struct ChorusSTFX : public BaseEffect {
} }
delay.write(multiIn); delay.write(multiIn);
Complex phaseComplex = std::polar(Sample(1), phase*Sample(2*M_PI)); for (size_t oc = 0; oc < config.outputChannels; ++oc) {
phase += phaseStep; Complex phaseComplex = std::polar(Sample(1), phase*Sample(2*M_PI) + oc*Sample(2.632));
for (size_t c = 0; c < 6; ++c) {
Sample osc = (phaseComplex*oscillatorOffsets[c]).real();
delaySamples[c] = depthSamples*Sample(0.5)*(1 + osc);
}
delay.readMulti(delaySamples, multiOut);
for (size_t c = 0; c < config.outputChannels; ++c) {
Sample sum = 0;
for (size_t c = 0; c < 6; ++c) { for (size_t c = 0; c < 6; ++c) {
sum += multiOut[c]; Sample osc = (phaseComplex*oscillatorOffsets[c]).real();
delaySamples[c] = depthSamples*Sample(0.5)*(1 + osc);
} }
io.output[c][i] = multiIn[c]*dry + sum*wet; delay.readMulti(delaySamples, multiOut);
if (fading) {
// read a second set of delay times, and fade between them
std::array<Sample, 6> multiOutFrom;
for (size_t c = 0; c < 6; ++c) {
Sample osc = (phaseComplex*oscillatorOffsets[c]).real();
delaySamples[c] = depthSamplesFrom*Sample(0.5)*(1 + osc);
}
delay.readMulti(delaySamples, multiOutFrom);
for (size_t c = 0; c < 6; ++c) {
multiOut[c] = block.fade(i, multiOutFrom[c], multiOut[c]);
}
}
// Arbitrarily chosen gains, 4 positive, 2 negative
Sample sum = multiOut[0] - multiOut[1] + multiOut[2] + multiOut[3] - multiOut[4] + multiOut[5];
io.output[oc][i] = multiIn[oc]*dry.at(i) + sum*wet.at(i);
} }
phase += phaseStep;
} }
phase -= std::floor(phase); phase -= std::floor(phase);
} }