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

Use rounding instead of truncating for a more natural behavior of the quantization at the edges of the relevant range

Browse source
This commit is contained in:
Paul Ferrand 2019-12-13 14:13:46 +01:00
parent d60a851fc0
commit e04bf7e9b8
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/sfizz/EventEnvelopes.cpp
View file

@ -136,9 +136,8 @@ void LinearEnvelope<Type>::getQuantizedBlock(absl::Span<Type> output, Type quant
ASSERT(quantizationStep != 0.0); ASSERT(quantizationStep != 0.0);
int index { 0 }; int index { 0 };
const auto halfStep = quantizationStep / 2; auto quantize = [quantizationStep](Type value) -> Type {
auto quantize = [quantizationStep, halfStep](Type value) -> Type { return std::round(value / quantizationStep) * quantizationStep;
return static_cast<int>((value + halfStep) / quantizationStep) * quantizationStep;
}; };
const auto outputSize = static_cast<int>(output.size()); const auto outputSize = static_cast<int>(output.size());
@ -227,7 +226,7 @@ void MultiplicativeEnvelope<Type>::getQuantizedBlock(absl::Span<Type> output, Ty
// log q log q // log q log q
// and log(b)\log(q) is between 0 and 1. // and log(b)\log(q) is between 0 and 1.
auto quantize = [logStep](Type value) -> Type { auto quantize = [logStep](Type value) -> Type {
return std::exp(logStep * static_cast<int>(std::log(value)/logStep)); return std::exp(logStep * std::round(std::log(value)/logStep));
}; };
const auto outputSize = static_cast<int>(output.size()); const auto outputSize = static_cast<int>(output.size());