loop: fix the crossfade seam's residual discontinuity, plus six review minors
Normalizes crossfadeWeight over crossfade-1 so the last rendered frame lands at exactly the incoming tap instead of a residual step; corrects the CLAUDE.md invariant and seam test to match. Shares lerpSource/crossfadedSource/maxCrossfade, fixes stale docs/constants, and clears crossfade on the loop-OFF gesture.
This commit is contained in:
+28
-18
@@ -810,7 +810,9 @@ static void testCrossfadeBlendsMonotonelyAcrossTheRegion() {
|
||||
CHECK(approx(sourceFrameOf(out[51]), 51.0, 1e-3));
|
||||
CHECK(approx(sourceFrameOf(out[52]), 52.0, 1e-3)); // weight 0 at the region edge
|
||||
for (int n = 52; n < 60; ++n) {
|
||||
const double w = static_cast<double>(n - 52) / 8.0;
|
||||
// Normalized over crossfade - 1 (= 7), not crossfade: weight reaches exactly 1 at
|
||||
// n == 59 (d == 7 == xf - 1), not merely approaching it.
|
||||
const double w = static_cast<double>(n - 52) / 7.0;
|
||||
const double want = static_cast<double>(n) * (1.0 - w) + static_cast<double>(n - 20) * w;
|
||||
CHECK(approx(sourceFrameOf(out[static_cast<std::size_t>(n)]), want, 1e-3));
|
||||
}
|
||||
@@ -819,25 +821,33 @@ static void testCrossfadeBlendsMonotonelyAcrossTheRegion() {
|
||||
}
|
||||
}
|
||||
|
||||
// What a longer fade actually buys, measured rather than asserted by adjective. The last
|
||||
// rendered frame before the wrap carries weight (xf-1)/xf, not 1 — the weight only reaches 1
|
||||
// AT `end`, a position no frame lands on — so a residual step of (seam step)/xf survives.
|
||||
// It shrinks in exact proportion to the fade length, which is the property that makes the
|
||||
// parameter meaningful and the seam inaudible at any musically useful setting.
|
||||
static void testSeamStepShrinksInProportionToTheFadeLength() {
|
||||
// What the crossfade actually buys, measured rather than asserted by adjective: normalizing
|
||||
// over crossfade - 1 (loop_span.h) lands the weight at exactly 1 on the last rendered frame
|
||||
// (end - 1) for every REAL crossfade length (xf >= 2), not merely approaching it — that frame
|
||||
// is the incoming tap outright, which is exactly the value the wrap hands over. The step across
|
||||
// the seam is therefore the material's own natural one-frame step (indexSample's slope is 1 raw
|
||||
// frame per frame), constant for any xf >= 2 — not a residual that merely shrinks with a longer
|
||||
// fade. The |out[60]-out[59]| metric is otherwise a trap: it conflates the natural step with any
|
||||
// leftover discontinuity, and at xf == loop length the OLD 1/xf normalization happened to score
|
||||
// 0 by this same metric — a coincidence of that one ratio, not a property of the fix. Comparing
|
||||
// against the natural step rather than "small" or "zero" closes that hole.
|
||||
static void testSeamStepMatchesTheNaturalStepForAnyCrossfade() {
|
||||
auto seamStep = [](std::int64_t xf) {
|
||||
return std::fabs(loopedFrameValue(xf, 60) - loopedFrameValue(xf, 59));
|
||||
};
|
||||
const double hard = seamStep(0);
|
||||
CHECK(approx(hard, 19.0, 1e-3)); // 59 -> 40, the whole loop length less one frame
|
||||
CHECK(approx(seamStep(4), 4.0, 1e-3));
|
||||
CHECK(approx(seamStep(8), 1.5, 1e-3));
|
||||
CHECK(approx(seamStep(16), 0.25, 1e-3));
|
||||
// Each doubling roughly halves it, and even the shortest fade tested is a quarter of the
|
||||
// hard seam.
|
||||
CHECK(seamStep(4) < hard * 0.25);
|
||||
CHECK(seamStep(8) < seamStep(4) * 0.5);
|
||||
CHECK(seamStep(16) < seamStep(8) * 0.5);
|
||||
// No crossfade: the seam is the whole loop length less one frame — the wart the fade fixes.
|
||||
CHECK(approx(seamStep(0), 19.0, 1e-3));
|
||||
// xf == 1 has no fractional region to blend — its one frame sits exactly at d == 0, caught
|
||||
// by crossfadeWeight's own d <= 0 floor before the multiply/ceiling ever runs — so it is
|
||||
// still the hard seam, not a one-frame fade.
|
||||
CHECK(approx(seamStep(1), 19.0, 1e-3));
|
||||
// Any REAL crossfade length: the step is exactly the natural one-frame step, not merely
|
||||
// small — and constant regardless of the fade length, unlike the old formula's proportional
|
||||
// shrink.
|
||||
for (std::int64_t xf : {std::int64_t{4}, std::int64_t{8}, std::int64_t{16},
|
||||
std::int64_t{20}}) {
|
||||
CHECK(approx(seamStep(xf), 1.0, 1e-3));
|
||||
}
|
||||
}
|
||||
|
||||
static void testCrossfadeLengthFollowsItsParameter() {
|
||||
@@ -2810,7 +2820,7 @@ int main() {
|
||||
testLoopReadWrapsSampleExactOverManyCycles();
|
||||
testZeroCrossfadeLeavesTheSeamHard();
|
||||
testCrossfadeBlendsMonotonelyAcrossTheRegion();
|
||||
testSeamStepShrinksInProportionToTheFadeLength();
|
||||
testSeamStepMatchesTheNaturalStepForAnyCrossfade();
|
||||
testCrossfadeLengthFollowsItsParameter();
|
||||
testCrossfadeIsSuppressedForALoopAtFrameZero();
|
||||
testNoteOffDuringLoopSustainRunsTheReleaseAndFreesTheVoice();
|
||||
|
||||
Reference in New Issue
Block a user