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

Corrected bugs in the oversampler

Browse source
This commit is contained in:
Paul Ferrand 2019-12-23 00:07:10 +01:00
parent d6136b6bf9
commit 0784f8ddcd
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/sfizz/Oversampler.cpp
View file

@ -102,7 +102,7 @@ void sfz::Oversampler::stream(const sfz::AudioBuffer<float>& input, sfz::AudioBu
case Oversampling::x2: case Oversampling::x2:
for (auto& upsampler: upsampler2x) for (auto& upsampler: upsampler2x)
upsampler.set_coefs(coeffsStage2x.data()); upsampler.set_coefs(coeffsStage2x.data());
[[fallthrough]]; break;
case Oversampling::x1: case Oversampling::x1:
for (int i = 0; i < numChannels; ++i) for (int i = 0; i < numChannels; ++i)
copy<float>(input.getConstSpan(i), output.getSpan(i)); copy<float>(input.getConstSpan(i), output.getSpan(i));
@ -123,16 +123,22 @@ void sfz::Oversampler::stream(const sfz::AudioBuffer<float>& input, sfz::AudioBu
const auto thisChunkSize = std::min(chunkSize, numFrames - inputFrameCounter); const auto thisChunkSize = std::min(chunkSize, numFrames - inputFrameCounter);
const auto outputChunkSize { thisChunkSize * static_cast<int>(factor) }; const auto outputChunkSize { thisChunkSize * static_cast<int>(factor) };
for (int chanIdx = 0; chanIdx < numChannels; chanIdx++) { for (int chanIdx = 0; chanIdx < numChannels; chanIdx++) {
const auto inputChunk = input.getSpan(chanIdx).subspan(inputFrameCounter, chunkSize); const auto inputChunk = input.getSpan(chanIdx).subspan(inputFrameCounter, thisChunkSize);
const auto outputChunk = output.getSpan(chanIdx).subspan(outputFrameCounter, outputChunkSize); const auto outputChunk = output.getSpan(chanIdx).subspan(outputFrameCounter, outputChunkSize);
upsampler2x[chanIdx].process_block(span1.data(), inputChunk.data(), thisChunkSize); if (factor == Oversampling::x2) {
upsampler2x[chanIdx].process_block(outputChunk.data(), inputChunk.data(), thisChunkSize);
continue;
}
if (factor == Oversampling::x4) { if (factor == Oversampling::x4) {
upsampler2x[chanIdx].process_block(span1.data(), inputChunk.data(), thisChunkSize);
upsampler4x[chanIdx].process_block(outputChunk.data(), span1.data(), thisChunkSize * 2); upsampler4x[chanIdx].process_block(outputChunk.data(), span1.data(), thisChunkSize * 2);
continue;
} }
else if (factor == Oversampling::x8) { else if (factor == Oversampling::x8) {
upsampler2x[chanIdx].process_block(span1.data(), inputChunk.data(), thisChunkSize);
upsampler4x[chanIdx].process_block(span2.data(), span1.data(), thisChunkSize * 2); upsampler4x[chanIdx].process_block(span2.data(), span1.data(), thisChunkSize * 2);
upsampler8x[chanIdx].process_block(outputChunk.data(), span1.data(), thisChunkSize * 4); upsampler8x[chanIdx].process_block(outputChunk.data(), span2.data(), thisChunkSize * 4);
continue;
} }
} }
inputFrameCounter += thisChunkSize; inputFrameCounter += thisChunkSize;