From f26be4e2b60aa3bc6259c2091e66b05171a6768e Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Fri, 29 May 2020 14:00:11 +0200 Subject: [PATCH] Relax a bit the "valid audio" check --- src/sfizz/MathHelpers.h | 4 ++-- src/sfizz/Synth.cpp | 4 ++-- src/sfizz/Voice.cpp | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/sfizz/MathHelpers.h b/src/sfizz/MathHelpers.h index 6567d5b5..2f63e3ec 100644 --- a/src/sfizz/MathHelpers.h +++ b/src/sfizz/MathHelpers.h @@ -331,10 +331,10 @@ bool hasNanInf(absl::Span span) } template -bool isValidAudio(absl::Span span) +bool isReasonableAudio(absl::Span span) { for (const auto& x : span) - if (x < -1.0f || x > 1.0f) + if (x < -10.0f || x > 10.0f) return false; return true; diff --git a/src/sfizz/Synth.cpp b/src/sfizz/Synth.cpp index b32b0132..41f72086 100644 --- a/src/sfizz/Synth.cpp +++ b/src/sfizz/Synth.cpp @@ -726,8 +726,8 @@ void sfz::Synth::renderBlock(AudioSpan buffer) noexcept ASSERT(!hasNanInf(buffer.getConstSpan(0))); ASSERT(!hasNanInf(buffer.getConstSpan(1))); - CHECK(isValidAudio(buffer.getConstSpan(0))); - CHECK(isValidAudio(buffer.getConstSpan(1))); + CHECK(isReasonableAudio(buffer.getConstSpan(0))); + CHECK(isReasonableAudio(buffer.getConstSpan(1))); } void sfz::Synth::noteOn(int delay, int noteNumber, uint8_t velocity) noexcept diff --git a/src/sfizz/Voice.cpp b/src/sfizz/Voice.cpp index d6da13ab..60f99e2c 100644 --- a/src/sfizz/Voice.cpp +++ b/src/sfizz/Voice.cpp @@ -250,8 +250,8 @@ void sfz::Voice::renderBlock(AudioSpan buffer) noexcept #if 0 ASSERT(!hasNanInf(buffer.getConstSpan(0))); ASSERT(!hasNanInf(buffer.getConstSpan(1))); - CHECK(isValidAudio(buffer.getConstSpan(0))); - CHECK(isValidAudio(buffer.getConstSpan(1))); + CHECK(isReasonableAudio(buffer.getConstSpan(0))); + CHECK(isReasonableAudio(buffer.getConstSpan(1))); #endif } @@ -529,8 +529,8 @@ void sfz::Voice::fillWithData(AudioSpan buffer) noexcept #if 0 ASSERT(!hasNanInf(buffer.getConstSpan(0))); ASSERT(!hasNanInf(buffer.getConstSpan(1))); - CHECK(isValidAudio(buffer.getConstSpan(0))); - CHECK(isValidAudio(buffer.getConstSpan(1))); + CHECK(isReasonableAudio(buffer.getConstSpan(0))); + CHECK(isReasonableAudio(buffer.getConstSpan(1))); #endif } @@ -595,8 +595,8 @@ void sfz::Voice::fillWithGenerator(AudioSpan buffer) noexcept #if 0 ASSERT(!hasNanInf(buffer.getConstSpan(0))); ASSERT(!hasNanInf(buffer.getConstSpan(1))); - CHECK(isValidAudio(buffer.getConstSpan(0))); - CHECK(isValidAudio(buffer.getConstSpan(1))); + CHECK(isReasonableAudio(buffer.getConstSpan(0))); + CHECK(isReasonableAudio(buffer.getConstSpan(1))); #endif }