-
Notifications
You must be signed in to change notification settings - Fork 0
Fix reverse-read timing and add small-buffer safeguard in AccidentalReverse mode #82
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -713,19 +713,35 @@ float OrbitDelayCore::processChannelFast(float input, | |||||||||
| const float maxGuardBySize = 0.25f * delaySize; | ||||||||||
| const float guardSamples = clampf(kOrbitReadGuardMinSamples, 1.0f, maxGuardBySize); | ||||||||||
| if (readMode_ == ReadMode::AccidentalReverse) { | ||||||||||
| float reverseDelaySamples = params.tempoDelaySamples + spread + lfoSamples; | ||||||||||
| // Effective reverse delay follows the smoothed tempo delay plus the same | ||||||||||
| // channel-dependent offsets used by the forward path. | ||||||||||
| float reverseDelaySamples = params.tempoDelaySamples + params.offsetSamples + spread + lfoSamples; | ||||||||||
| reverseDelaySamples = clampf(reverseDelaySamples, guardSamples, fmaxf(delaySize - guardSamples, guardSamples)); | ||||||||||
| float& reverseCounter = (&delay == &delayL_) ? reverseCounterL_ : reverseCounterR_; | ||||||||||
| float& reverseWindowSize = (&delay == &delayL_) ? reverseWindowSizeL_ : reverseWindowSizeR_; | ||||||||||
| const float readPos = wrapPosFloat(writePos - reverseDelaySamples + reverseCounter, delaySize, invDelaySize); | ||||||||||
| const float distanceBackward = wrapPosFloat(writePos - readPos, delaySize, invDelaySize); | ||||||||||
| if (distanceBackward < guardSamples || distanceBackward > (delaySize - guardSamples)) { | ||||||||||
|
|
||||||||||
| // Safe fallback: insufficient usable region between the two guard bands | ||||||||||
| // for the minimum reverse window size. | ||||||||||
| constexpr float kMinReverseWindowSamples = 8.0f; | ||||||||||
| if (delaySize < kMinReverseWindowSamples + 2.0f * guardSamples) { | ||||||||||
| reverseCounter = 0.0f; | ||||||||||
| reverseWindowSize = 0.0f; | ||||||||||
| reverseDelaySamples = guardSamples; | ||||||||||
| wet = 0.0f; | ||||||||||
| baseReadPos = wrapPosFloat(writePos - guardSamples, delaySize, invDelaySize); | ||||||||||
| } else { | ||||||||||
| const float readPos = wrapPosFloat(writePos - reverseDelaySamples + reverseCounter, delaySize, invDelaySize); | ||||||||||
| const float distanceBackward = wrapPosFloat(writePos - readPos, delaySize, invDelaySize); | ||||||||||
| if (distanceBackward < guardSamples || distanceBackward > (delaySize - guardSamples)) { | ||||||||||
| reverseCounter = 0.0f; | ||||||||||
| reverseWindowSize = 0.0f; | ||||||||||
| reverseDelaySamples = guardSamples; | ||||||||||
| } | ||||||||||
| // Window size is explicitly derived in readReverseWindowed() from this | ||||||||||
| // effective smoothed delay value. | ||||||||||
| wet = readReverseWindowed(delay, reverseDelaySamples, writePos, delaySize, invDelaySize, reverseCounter, reverseWindowSize); | ||||||||||
| baseReadPos = wrapPosFloat(writePos - reverseDelaySamples + reverseCounter, delaySize, invDelaySize); | ||||||||||
|
Comment on lines
+742
to
+743
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In the reverse-read path,
Suggested change
|
||||||||||
| } | ||||||||||
| wet = readReverseWindowed(delay, reverseDelaySamples, writePos, delaySize, invDelaySize, reverseCounter, reverseWindowSize); | ||||||||||
| baseReadPos = wrapPosFloat(writePos - reverseDelaySamples + reverseCounter, delaySize, invDelaySize); | ||||||||||
| } else { | ||||||||||
| const float orbitDelaySamples = params.tempoDelaySamples * params.orbit; | ||||||||||
| const float modulatedDelaySamples = orbitDelaySamples + params.offsetSamples + spread + lfoSamples; | ||||||||||
|
|
||||||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The assignment
reverseDelaySamples = guardSamples;is a dead store becausereverseDelaySamplesis a local variable that is not used anywhere else in this fallback branch. Removing it simplifies the code.