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

Refine the stealing algorithm

Browse source
This commit is contained in:
Paul Ferrand 2020-05-07 13:49:13 +02:00
parent 725bda2af8
commit 0c9c188e4b
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/sfizz/Synth.cpp
View file

@ -503,26 +503,33 @@ sfz::Voice* sfz::Synth::findFreeVoice() noexcept
// Find voices that can be stolen // Find voices that can be stolen
absl::c_sort(voiceViewArray, [](Voice* lhs, Voice* rhs) { absl::c_sort(voiceViewArray, [](Voice* lhs, Voice* rhs) {
return lhs->getAge() < rhs->getAge(); return lhs->getAge() > rhs->getAge();
}); });
const auto sumEnvelope = absl::c_accumulate(voiceViewArray, 0.0f, [] (float sum, const Voice* v) { const auto sumEnvelope = absl::c_accumulate(voiceViewArray, 0.0f, [] (float sum, const Voice* v) {
return sum + v->getAverageEnvelope(); return sum + v->getAverageEnvelope();
}); });
const auto threshold = sumEnvelope / static_cast<float>(voiceViewArray.size()) / 2; const auto envThreshold = sumEnvelope / static_cast<float>(voiceViewArray.size()) * 0.25f;
const auto ageThreshold = voiceViewArray.front()->getAge() * 0.5f;
Voice* returnedVoice = voiceViewArray.front(); Voice* returnedVoice = voiceViewArray.front();
for (auto & voice : voiceViewArray) { for (auto & voice : voiceViewArray) {
if (voice->getAverageEnvelope() < threshold) { if (voice->getAge() < ageThreshold) {
// std::cout << "Went too far, picking the oldest note..." << '\n';
break;
}
if (voice->getAverageEnvelope() < envThreshold) {
// std::cout << "Found a better candidate!" << '\n';
returnedVoice = voice; returnedVoice = voice;
break; break;
} }
} }
const auto killedVoices = killSisterVoices(returnedVoice); const auto killedVoices = killSisterVoices(returnedVoice);
UNUSED(killedVoices); // only in debug UNUSED(killedVoices); // only in debug
assert(killedVoices > 0); assert(killedVoices > 0);
assert(returnedVoice->isFree()); assert(returnedVoice->isFree());
std::cout << "Killed " << killedVoices << " voices"; // std::cout << "Killed " << killedVoices << " voices" << '\n';
return returnedVoice; return returnedVoice;
} }