Add feature to mute mixer channels with Inf/NaN output

include/MixHelpers.h

@@ -38,12 +38,6 @@ namespace MixHelpers
 
 bool isSilent( const SampleFrame* src, int frames );
 
-bool useNaNHandler();
-
-void setNaNHandler( bool use );
-
-bool sanitize( SampleFrame* src, int frames );
-
 /*! \brief Add samples from src to dst */
 void add( SampleFrame* dst, const SampleFrame* src, int frames );
 
@@ -62,15 +56,6 @@ void addMultipliedByBuffer( SampleFrame* dst, const SampleFrame* src, float coef
 /*! \brief Add samples from src multiplied by coeffSrc and coeffSrcBuf to dst */
 void addMultipliedByBuffers( SampleFrame* dst, const SampleFrame* src, ValueBuffer * coeffSrcBuf1, ValueBuffer * coeffSrcBuf2, int frames );
 
-/*! \brief Same as addMultiplied, but sanitize output (strip out infs/nans) */
-void addSanitizedMultiplied( SampleFrame* dst, const SampleFrame* src, float coeffSrc, int frames );
-
-/*! \brief Add samples from src multiplied by coeffSrc and coeffSrcBuf to dst - sanitized version */
-void addSanitizedMultipliedByBuffer( SampleFrame* dst, const SampleFrame* src, float coeffSrc, ValueBuffer * coeffSrcBuf, int frames );
-
-/*! \brief Add samples from src multiplied by coeffSrc and coeffSrcBuf to dst - sanitized version */
-void addSanitizedMultipliedByBuffers( SampleFrame* dst, const SampleFrame* src, ValueBuffer * coeffSrcBuf1, ValueBuffer * coeffSrcBuf2, int frames );
-
 /*! \brief Add samples from src multiplied by coeffSrcLeft/coeffSrcRight to dst */
 void addMultipliedStereo( SampleFrame* dst, const SampleFrame* src, float coeffSrcLeft, float coeffSrcRight, int frames );
 

include/Mixer.h

@@ -38,13 +38,14 @@ namespace lmms
 {
 
 
+class Mixer;
 class MixerRoute;
 using MixerRouteVector = std::vector<MixerRoute*>;
 
 class MixerChannel : public ThreadableJob
 {
 	public:
-		MixerChannel( int idx, Model * _parent );
+		MixerChannel(int idx, Mixer* mixer);
 		virtual ~MixerChannel();
 
 		EffectChain m_fxChain;
@@ -82,11 +83,17 @@ class MixerChannel : public ThreadableJob
 		std::atomic_size_t m_dependenciesMet;
 		void incrementDeps();
 		void processed();
-
+		void sanitizeOutput();
+
+		bool hasInvalidOutput() { return m_hasInvalidOutput; }
+		static void setMuteInvalidOutput(bool mute);
+
 	private:
 		void doProcessing() override;
-
 		std::optional<QColor> m_color;
+		Mixer* m_mixer;
+		bool m_hasInvalidOutput = false;
+		inline static bool s_muteInvalidOutput = false;
 };
 
 class MixerRoute : public QObject
@@ -209,6 +216,11 @@ class LMMS_EXPORT Mixer : public Model, public JournallingObject
 
 	MixerRouteVector m_mixerRoutes;
 
+	void broadcastChannelInvalidOutputState(int index, bool invalid) { emit channelInvalidOutputStateChanged(index, invalid); }
+
+signals:
+	void channelInvalidOutputStateChanged(int index, bool invalid);
+
 private:
 	// the mixer channels in the mixer. index 0 is always master.
 	std::vector<MixerChannel*> m_mixerChannels;

include/MixerChannelView.h

@@ -99,6 +99,7 @@ namespace lmms::gui
         void removeUnusedChannels();
         void moveChannelLeft();
         void moveChannelRight();
+        void updateInvalidOutputState(int index, bool invalid);
 
     private:
         bool confirmRemoval(int index);

include/SetupDialog.h

@@ -178,7 +178,7 @@ private slots:
 	QComboBox * m_audioInterfaces;
 	AswMap m_audioIfaceSetupWidgets;
 	trMap m_audioIfaceNames;
-	bool m_NaNHandler;
+	bool m_muteInvalidOutput;
 	int m_bufferSize;
 	QSlider * m_bufferSizeSlider;
 	QLabel * m_bufferSizeLbl;

src/core/EffectChain.cpp

@@ -30,7 +30,6 @@
 #include "EffectChain.h"
 #include "Effect.h"
 #include "DummyEffect.h"
-#include "MixHelpers.h"
 
 namespace lmms
 {
@@ -191,15 +190,12 @@ bool EffectChain::processAudioBuffer( SampleFrame* _buf, const fpp_t _frames, bo
 		return false;
 	}
 
-	MixHelpers::sanitize( _buf, _frames );
-
 	bool moreEffects = false;
 	for (const auto& effect : m_effects)
 	{
 		if (hasInputNoise || effect->isRunning())
 		{
 			moreEffects |= effect->processAudioBuffer(_buf, _frames);
-			MixHelpers::sanitize(_buf, _frames);
 		}
 	}
 

src/core/MixHelpers.cpp

@@ -24,21 +24,12 @@
 
 #include "MixHelpers.h"
 
-#ifdef LMMS_DEBUG
-#include <cstdio>
-#endif
-
 #include <cmath>
 #include <QtGlobal>
 
 #include "ValueBuffer.h"
 #include "SampleFrame.h"
 
-
-
-static bool s_NaNHandler;
-
-
 namespace lmms::MixHelpers
 {
 
@@ -80,51 +71,6 @@ bool isSilent( const SampleFrame* src, int frames )
 	return true;
 }
 
-bool useNaNHandler()
-{
-	return s_NaNHandler;
-}
-
-void setNaNHandler( bool use )
-{
-	s_NaNHandler = use;
-}
-
-/*! \brief Function for sanitizing a buffer of infs/nans - returns true if those are found */
-bool sanitize( SampleFrame* src, int frames )
-{
-	if( !useNaNHandler() )
-	{
-		return false;
-	}
-
-	for (int f = 0; f < frames; ++f)
-	{
-		auto& currentFrame = src[f];
-
-		if (currentFrame.containsInf() || currentFrame.containsNaN())
-		{
-			#ifdef LMMS_DEBUG
-					// TODO don't use printf here
-					printf("Bad data, clearing buffer. frame: ");
-					printf("%d: value %f, %f\n", f, currentFrame.left(), currentFrame.right());
-			#endif
-
-			// Clear the whole buffer if a problem is found
-			zeroSampleFrames(src, frames);
-
-			return true;
-		}
-		else
-		{
-			currentFrame.clamp(sample_t(-1000.0), sample_t(1000.0));
-		}
-	};
-
-	return false;
-}
-
-
 struct AddOp
 {
 	void operator()( SampleFrame& dst, const SampleFrame& src ) const
@@ -205,70 +151,6 @@ void addMultipliedByBuffers( SampleFrame* dst, const SampleFrame* src, ValueBuff
 
 }
 
-void addSanitizedMultipliedByBuffer( SampleFrame* dst, const SampleFrame* src, float coeffSrc, ValueBuffer * coeffSrcBuf, int frames )
-{
-	if ( !useNaNHandler() )
-	{
-		addMultipliedByBuffer( dst, src, coeffSrc, coeffSrcBuf,
-								frames );
-		return;
-	}
-
-	for( int f = 0; f < frames; ++f )
-	{
-		dst[f][0] += ( std::isinf( src[f][0] ) || std::isnan( src[f][0] ) ) ? 0.0f : src[f][0] * coeffSrc * coeffSrcBuf->values()[f];
-		dst[f][1] += ( std::isinf( src[f][1] ) || std::isnan( src[f][1] ) ) ? 0.0f : src[f][1] * coeffSrc * coeffSrcBuf->values()[f];
-	}
-}
-
-void addSanitizedMultipliedByBuffers( SampleFrame* dst, const SampleFrame* src, ValueBuffer * coeffSrcBuf1, ValueBuffer * coeffSrcBuf2, int frames )
-{
-	if ( !useNaNHandler() )
-	{
-		addMultipliedByBuffers( dst, src, coeffSrcBuf1, coeffSrcBuf2,
-								frames );
-		return;
-	}
-
-	for( int f = 0; f < frames; ++f )
-	{
-		dst[f][0] += ( std::isinf( src[f][0] ) || std::isnan( src[f][0] ) )
-			? 0.0f
-			: src[f][0] * coeffSrcBuf1->values()[f] * coeffSrcBuf2->values()[f];
-		dst[f][1] += ( std::isinf( src[f][1] ) || std::isnan( src[f][1] ) )
-			? 0.0f
-			: src[f][1] * coeffSrcBuf1->values()[f] * coeffSrcBuf2->values()[f];
-	}
-
-}
-
-
-struct AddSanitizedMultipliedOp
-{
-	AddSanitizedMultipliedOp( float coeff ) : m_coeff( coeff ) { }
-
-	void operator()( SampleFrame& dst, const SampleFrame& src ) const
-	{
-		dst[0] += ( std::isinf( src[0] ) || std::isnan( src[0] ) ) ? 0.0f : src[0] * m_coeff;
-		dst[1] += ( std::isinf( src[1] ) || std::isnan( src[1] ) ) ? 0.0f : src[1] * m_coeff;
-	}
-
-	const float m_coeff;
-};
-
-void addSanitizedMultiplied( SampleFrame* dst, const SampleFrame* src, float coeffSrc, int frames )
-{
-	if ( !useNaNHandler() )
-	{
-		addMultiplied( dst, src, coeffSrc, frames );
-		return;
-	}
-
-	run<>( dst, src, frames, AddSanitizedMultipliedOp(coeffSrc) );
-}
-
-
-
 struct AddMultipliedStereoOp
 {
 	AddMultipliedStereoOp( float coeffLeft, float coeffRight )