sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #460 from jpcima/flex-eg-release-fix

Browse source 
Flex eg release fix
This commit is contained in:
JP Cimalando 2020-09-28 23:02:04 +02:00 • committed by GitHub
commit dd39b306b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 86 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/sfizz/FlexEnvelope.cpp
View file

@ -141,12 +141,24 @@ void FlexEnvelope::Impl::process(absl::Span<float> out)
} }
// Perform stage transitions // Perform stage transitions
const bool isReleased = isReleased_; if (isReleased_) {
while ((!stageSustained_ && currentTime_ >= stageTime_) || // on release, fast forward past the sustain stage
(stageSustained_ && isReleased)) { const unsigned sustainStage = desc.sustain;
// If stage is of zero duration, immediate transition to level while (currentStageNumber_ <= sustainStage) {
if (!stageSustained_ && stageTime_ == 0) if (!advanceToNextStage()) {
out.remove_prefix(frameIndex);
fill(out, 0.0f);
return;
}
}
}
while (!stageSustained_ && currentTime_ >= stageTime_) {
// advance through completed timed stages
ASSERT(isReleased_ || !stageSustained_);
if (stageTime_ == 0) {
// if stage is of zero duration, immediate transition to level
currentLevel_ = stageTargetLevel_; currentLevel_ = stageTargetLevel_;
}
if (!advanceToNextStage()) { if (!advanceToNextStage()) {
out.remove_prefix(frameIndex); out.remove_prefix(frameIndex);
fill(out, 0.0f); fill(out, 0.0f);

69
tests/FlexEGT.cpp
View file

@ -288,3 +288,72 @@ TEST_CASE("[FlexEG] Zero delay transitions")
// Note(jpc): 0.9 is because EG pre-increments the time counter, slope is // Note(jpc): 0.9 is because EG pre-increments the time counter, slope is
// 1 frame off into the future // 1 frame off into the future
} }
TEST_CASE("[FlexEG] Early release")
{
for (int i = 0; i < 3; ++i) {
sfz::Synth synth;
synth.loadSfzString(fs::current_path(), R"(
<region> sample=*sine
eg1_ampeg=1
eg1_time1=1.0 eg1_level1=1.0
eg1_time2=1.0 eg1_level2=1.0 eg1_sustain=2
eg1_time3=1.0 eg1_level3=0.0
)");
sfz::FlexEnvelope envelope;
REQUIRE(synth.getNumRegions() == 1);
REQUIRE(synth.getRegionView(0)->flexEGs.size() == 1);
envelope.configure(&synth.getRegionView(0)->flexEGs[0]);
envelope.setSampleRate(100);
envelope.start(0);
switch (i) {
case 0:
// A normal release: up 1s, sustain 1s, down 1s
envelope.release(200);
break;
case 1:
// A fast release: up 1s, down 1s
envelope.release(100);
break;
case 2:
// A faster release: up 0.5s, down 0.5s
envelope.release(50);
break;
}
std::array<float, 400> output;
envelope.process(absl::MakeSpan(output));
// Theoretical output at 0.5s interval
const std::array<float, 7> ref0 {{ 0.0, 0.5, 1.0, 1.0, 1.0, 0.5, 0.0 }};
const std::array<float, 5> ref1 {{ 0.0, 0.5, 1.0, 0.5, 0.0 }};
const std::array<float, 3> ref2 {{ 0.0, 0.5, 0.25 }};
const float m = 0.015f;
switch (i) {
case 0:
REQUIRE(output[ 0] == Approx(ref0[0]).margin(m));
REQUIRE(output[ 50] == Approx(ref0[1]).margin(m));
REQUIRE(output[100] == Approx(ref0[2]).margin(m));
REQUIRE(output[150] == Approx(ref0[3]).margin(m));
REQUIRE(output[200] == Approx(ref0[4]).margin(m));
REQUIRE(output[250] == Approx(ref0[5]).margin(m));
REQUIRE(output[300] == Approx(ref0[6]).margin(m));
break;
case 1:
REQUIRE(output[ 0] == Approx(ref1[0]).margin(m));
REQUIRE(output[ 50] == Approx(ref1[1]).margin(m));
REQUIRE(output[100] == Approx(ref1[2]).margin(m));
REQUIRE(output[150] == Approx(ref1[3]).margin(m));
REQUIRE(output[200] == Approx(ref1[4]).margin(m));
break;
case 2:
REQUIRE(output[ 0] == Approx(ref2[0]).margin(m));
REQUIRE(output[ 50] == Approx(ref2[1]).margin(m));
REQUIRE(output[100] == Approx(ref2[2]).margin(m));
break;
}
}
}