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

Fine tune the looping behavior

Browse source
This commit is contained in:
Paul Fd 2021-03-07 18:37:38 +01:00
parent 5d8eda7428
commit f1d4dfb823
1 changed files with 12 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/sfizz/Voice.cpp
View file

@ -918,9 +918,13 @@ void Voice::Impl::fillWithData(AudioSpan<float> buffer) noexcept
// calculate loop characteristics // calculate loop characteristics
const auto loop = this->loop_; const auto loop = this->loop_;
// Looping logic
const bool hasLoopSamples = static_cast<size_t>(loop.end) < source.getNumFrames(); const bool hasLoopSamples = static_cast<size_t>(loop.end) < source.getNumFrames();
const bool loopContinuous = hasLoopSamples && (region_->loopMode == LoopMode::loop_continuous); const bool loopCountReached = region_->loopCount && loop_.restarts >= *region_->loopCount;
const bool loopSustain = hasLoopSamples && (region_->loopMode == LoopMode::loop_sustain) && !released(); const bool loopContinuous = (region_->loopMode == LoopMode::loop_continuous);
const bool loopSustain = (region_->loopMode == LoopMode::loop_sustain) && !released();
const bool shouldLoop = hasLoopSamples && (loopSustain || loopContinuous) && !loopCountReached;
/* /*
loop start loop end loop start loop end
@ -942,7 +946,7 @@ void Voice::Impl::fillWithData(AudioSpan<float> buffer) noexcept
enum PartitionType { kPartitionNormal, kPartitionLoopXfade }; enum PartitionType { kPartitionNormal, kPartitionLoopXfade };
SpanHolder<absl::Span<int>> partitionBuffers[2]; SpanHolder<absl::Span<int>> partitionBuffers[2];
if (loopSustain || loopContinuous) { if (shouldLoop) {
for (auto& buf : partitionBuffers) { for (auto& buf : partitionBuffers) {
buf = resources_.bufferPool.getIndexBuffer(numSamples); buf = resources_.bufferPool.getIndexBuffer(numSamples);
if (!buf) if (!buf)
@ -986,23 +990,7 @@ void Voice::Impl::fillWithData(AudioSpan<float> buffer) noexcept
oldPartitionType = partitionType; oldPartitionType = partitionType;
}; };
if (loopContinuous) { if (shouldLoop) {
for (unsigned i = 0; i < numSamples; ++i) {
int wrappedIndex = (*indices)[i] - loop.size * blockRestarts;
if (wrappedIndex > loop.end) {
wrappedIndex -= loop.size;
blockRestarts += 1;
loop_.restarts += 1;
}
(*indices)[i] = wrappedIndex;
const bool wrapped = wrappedIndex < oldIndex;
addPartitionIfNecessary(i, wrappedIndex, wrapped);
// Release if we reached the loop count
if (wrapped && region_->loopCount && loop_.restarts >= *region_->loopCount && !released())
release(i);
}
} else if (loopSustain) {
unsigned i = 0; unsigned i = 0;
while (i < numSamples) { while (i < numSamples) {
int wrappedIndex = (*indices)[i] - loop.size * blockRestarts; int wrappedIndex = (*indices)[i] - loop.size * blockRestarts;
@ -1016,14 +1004,11 @@ void Voice::Impl::fillWithData(AudioSpan<float> buffer) noexcept
// identify the partition this index is in // identify the partition this index is in
addPartitionIfNecessary(i, wrappedIndex, wrapped); addPartitionIfNecessary(i, wrappedIndex, wrapped);
i++; i++;
// Release if we reached the loop count and break // Break if we reached the loop count
if (wrapped && region_->loopCount && loop_.restarts >= *region_->loopCount) { if (wrapped && region_->loopCount && loop_.restarts >= *region_->loopCount)
release(i - 1);
break; break;
}
} }
while (i < numSamples) { // In case we released within the block, continue as if it were a one-shot while (i < numSamples) { // In case we released within the block, continue as if it were a one-shot
@ -1035,7 +1020,7 @@ void Voice::Impl::fillWithData(AudioSpan<float> buffer) noexcept
} }
i++; i++;
} }
} else { // One shots and loop_sustain that have released or ended } else { // One shots and loops that have released (for loop sustain) or ended (with loop counts)
for (unsigned i = 0; i < numSamples; ++i) { for (unsigned i = 0; i < numSamples; ++i) {
(*indices)[i] -= sampleSize_ * blockRestarts; (*indices)[i] -= sampleSize_ * blockRestarts;
@ -1048,7 +1033,7 @@ void Voice::Impl::fillWithData(AudioSpan<float> buffer) noexcept
} }
if (!released()) if (!released())
release(i); off(i, true);
fill<int>(indices->subspan(i), sampleEnd); fill<int>(indices->subspan(i), sampleEnd);
fill<float>(coeffs->subspan(i), 1.0f); fill<float>(coeffs->subspan(i), 1.0f);