Thread: [OMPT-svn-commit] SF.net SVN: modplug:[4275] trunk/OpenMPT (Page 52)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4275
          http://sourceforge.net/p/modplug/code/4275
Author:   saga-games
Date:     2014-09-11 19:01:03 +0000 (Thu, 11 Sep 2014)
Log Message:
-----------
[New] Added auto-suspend functionality to plugin code: If a plugin only outputs silence after a few seconds of processing, it is temporarily suspended. This feature is currently not usable from the GUI yet, it is always disabled.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Vstplug.cpp
    trunk/OpenMPT/mptrack/Vstplug.h
    trunk/OpenMPT/soundlib/Fastmix.cpp
    trunk/OpenMPT/soundlib/plugins/PlugInterface.h

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================

--- trunk/OpenMPT/mptrack/Vstplug.cpp	2014-09-09 19:36:34 UTC (rev 4274)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	2014-09-11 19:01:03 UTC (rev 4275)
@@ -1209,6 +1209,7 @@
 			if ((fValue >= 0.0f) && (fValue <= 1.0f))
 				m_Effect.setParameter(&m_Effect, nIndex, fValue);
 		}
+		ResetSilence();
 	} catch (...)
 	{
 		ReportPlugException(mpt::String::PrintW(L"Exception in SetParameter(%1, %2)!", nIndex, fValue));
@@ -1348,6 +1349,7 @@
 		try
 		{
 			m_Effect.dispatcher(&m_Effect, effProcessEvents, 0, 0, &vstEvents, 0);
+			ResetSilence();
 		} catch (...)
 		{
 			ReportPlugException(mpt::String::PrintW(L"Exception in ProcessVSTEvents(numEvents:%1)!",
@@ -1358,14 +1360,16 @@
 
 
 // Receive events from plugin and send them to the next plugin in the chain.
-void CVstPlugin::ReceiveVSTEvents(const VstEvents *events) const
-//--------------------------------------------------------------
+void CVstPlugin::ReceiveVSTEvents(const VstEvents *events)
+//--------------------------------------------------------
 {
 	if(m_pMixStruct == nullptr)
 	{
 		return;
 	}
 
+	ResetSilence();
+
 	// I think we should only route events to plugins that are explicitely specified as output plugins of the current plugin.
 	// This should probably use GetOutputPlugList here if we ever get to support multiple output plugins.
 	PLUGINDEX receiver = m_pMixStruct->GetOutputPlugin();
@@ -1698,6 +1702,7 @@
 		Log("Sending Midi %02X.%02X.%02X\n", event.midiData[0]&0xff, event.midiData[1]&0xff, event.midiData[2]&0xff);
 	#endif
 
+	ResetSilence();
 	return vstEvents.Enqueue(reinterpret_cast<VstEvent *>(&event), insertAtFront);
 }
 
@@ -1715,6 +1720,7 @@
 	event.sysexDump = const_cast<char *>(message);	// We will make our own copy in VstEventQueue::Enqueue
 	event.resvd2 = 0;
 
+	ResetSilence();
 	return vstEvents.Enqueue(reinterpret_cast<VstEvent *>(&event));
 }
 

Modified: trunk/OpenMPT/mptrack/Vstplug.h
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.h	2014-09-09 19:36:34 UTC (rev 4274)
+++ trunk/OpenMPT/mptrack/Vstplug.h	2014-09-11 19:01:03 UTC (rev 4275)
@@ -82,7 +82,7 @@
 
 	// Check whether a plugin can be hosted inside OpenMPT or requires bridging
 	uint8 GetDllBits(bool fromCache = true) const;
-	bool IsNative(bool fromCache = true) const { return GetDllBits(fromCache) == sizeof(void *) * 8; }
+	bool IsNative(bool fromCache = true) const { return GetDllBits(fromCache) == sizeof(void *) * CHAR_BIT; }
 
 	void WriteToCache() const;
 
@@ -93,7 +93,7 @@
 			| (category << 1)
 			| (useBridge ? 0x100 : 0)
 			| (shareBridgeInstance ? 0x200 : 0)
-			| (dllBits / 8) << 10;
+			| ((dllBits / 8) << 10);
 	}
 
 	void DecodeCacheFlags(uint32 flags)
@@ -214,6 +214,9 @@
 	bool ProgramsAreChunks() const { return (m_Effect.flags & effFlagsProgramChunks) != 0; }
 	bool GetParams(float* param, VstInt32 min, VstInt32 max);
 	bool RandomizeParams(PlugParamIndex minParam = 0, PlugParamIndex maxParam = 0);
+	// If true, the plugin produces an output even if silence is being fed into it.
+	bool ShouldProcessSilence() { return m_Effect.numInputs == 0 || ((m_Effect.flags & effFlagsNoSoundInStop) == 0 && Dispatch(effGetTailSize, 0, 0, nullptr, 0.0f) != 1); }
+	void ResetSilence() { m_MixState.ResetSilence(); }
 #ifdef MODPLUG_TRACKER
 	forceinline CModDoc *GetModDoc();
 	forceinline const CModDoc *GetModDoc() const;
@@ -304,7 +307,7 @@
 
 	// Process incoming and outgoing VST events.
 	void ProcessVSTEvents();
-	void ReceiveVSTEvents(const VstEvents *events) const;
+	void ReceiveVSTEvents(const VstEvents *events);
 
 	void ProcessMixOps(float *pOutL, float *pOutR, float *leftPlugOutput, float *rightPlugOutput, size_t nSamples);
 
@@ -323,6 +326,8 @@
 	void SetParameter(PlugParamIndex, PlugParamValue) {}
 	VstInt32 GetUID() const { return 0; }
 	VstInt32 GetVersion() const { return 0; }
+	bool ShouldProcessSilence() { return false; }
+	void ResetSilence() { }
 
 	bool CanAutomateParameter(PlugParamIndex) { return false; }
 

Modified: trunk/OpenMPT/soundlib/Fastmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Fastmix.cpp	2014-09-09 19:36:34 UTC (rev 4274)
+++ trunk/OpenMPT/soundlib/Fastmix.cpp	2014-09-11 19:01:03 UTC (rev 4275)
@@ -98,6 +98,7 @@
 	BuildMixFuncTable(FIRFilterInterpolation),	// FIR SRC
 };
 
+
 #undef BuildMixFuncTableRamp
 #undef BuildMixFuncTableFilter
 #undef BuildMixFuncTable
@@ -489,6 +490,11 @@
 		// Restore sample pointer in case it got changed through loop wrap-around
 		chn.pCurrentSample = samplePointer;
 		nchmixed += naddmix;
+	
+		if(naddmix && nMixPlugin > 0 && nMixPlugin <= MAX_MIXPLUGINS && m_MixPlugins[nMixPlugin - 1].pMixState)
+		{
+			m_MixPlugins[nMixPlugin - 1].pMixState->ResetSilence();
+		}
 	}
 	m_nMixStat = std::max<CHANNELINDEX>(m_nMixStat, nchmixed);
 }
@@ -497,10 +503,14 @@
 void CSoundFile::ProcessPlugins(UINT nCount)
 //------------------------------------------
 {
+	// If any sample channels are active or any plugin has some input, possibly suspended master plugins need to be woken up.
+	bool masterHasInput = (m_nMixStat > 0);
+
 #ifdef MPT_INTMIXER
 	const float IntToFloat = m_PlayConfig.getIntToFloat();
 	const float FloatToInt = m_PlayConfig.getFloatToInt();
 #endif // MPT_INTMIXER
+
 	// Setup float inputs
 	for(PLUGINDEX plug = 0; plug < MAX_MIXPLUGINS; plug++)
 	{
@@ -545,6 +555,11 @@
 				memset(pState->pOutBufferR, 0, nCount * sizeof(pState->pOutBufferR[0]));
 			}
 			pState->dwFlags &= ~SNDMIXPLUGINSTATE::psfMixReady;
+			
+			if(!plugin.IsMasterEffect() && !(pState->dwFlags & SNDMIXPLUGINSTATE::psfSilenceBypass))
+			{
+				masterHasInput = true;
+			}
 		}
 	}
 	// Convert mix buffer
@@ -565,6 +580,25 @@
 			&& plugin.pMixState->pOutBufferL != nullptr
 			&& plugin.pMixState->pOutBufferR != nullptr)
 		{
+			if(!plugin.IsMasterEffect() && !plugin.pMixPlugin->ShouldProcessSilence() && !(plugin.pMixState->dwFlags & SNDMIXPLUGINSTATE::psfHasInput))
+			{
+				// If plugin has no inputs and isn't a master plugin, we shouldn't let it process silence if possible.
+				// I have yet to encounter a plugin which actually sets this flag.
+				bool hasInput = false;
+				for(PLUGINDEX inPlug = 0; inPlug < plug; inPlug++)
+				{
+					if(m_MixPlugins[inPlug].GetOutputPlugin() == plug)
+					{
+						hasInput = true;
+						break;
+					}
+				}
+				if(!hasInput)
+				{
+					continue;
+				}
+			}
+
 			bool isMasterMix = false;
 			if (pMixL == plugin.pMixState->pOutBufferL)
 			{
@@ -581,9 +615,11 @@
 			{
 				PLUGINDEX nOutput = plugin.GetOutputPlugin();
 				if(nOutput > plug && nOutput != PLUGINDEX_INVALID
-					&& m_MixPlugins[nOutput].pMixState != nullptr)
+					&& m_MixPlugins[nOutput].pMixState != nullptr
+					&& m_MixPlugins[nOutput].pMixPlugin != nullptr)
 				{
 					SNDMIXPLUGINSTATE *pOutState = m_MixPlugins[nOutput].pMixState;
+					if(!(pState->dwFlags & SNDMIXPLUGINSTATE::psfSilenceBypass)) m_MixPlugins[nOutput].pMixPlugin->ResetSilence();
 
 					if(pOutState->pOutBufferL != nullptr && pOutState->pOutBufferR != nullptr)
 					{
@@ -621,9 +657,24 @@
 				}
 				pMixL = pOutL;
 				pMixR = pOutR;
+
+				if(masterHasInput)
+				{
+					// Samples or plugins are being rendered, so turn off auto-bypass for this master effect.
+					if(plugin.pMixPlugin != nullptr) plugin.pMixPlugin->ResetSilence();
+					SNDMIXPLUGIN *chain = &plugin;
+					while(chain->GetOutputPlugin() != PLUGINDEX_INVALID)
+					{
+						chain = &m_MixPlugins[chain->GetOutputPlugin()];
+						if(chain->pMixPlugin)
+						{
+							chain->pMixPlugin->ResetSilence();
+						}
+					}
+				}
 			}
 
-			if (plugin.IsBypassed())
+			if(plugin.IsBypassed() || (plugin.IsAutoSuspendable() && (pState->dwFlags & SNDMIXPLUGINSTATE::psfSilenceBypass)))
 			{
 				const float * const pInL = pState->pOutBufferL;
 				const float * const pInR = pState->pOutBufferR;
@@ -635,7 +686,30 @@
 			} else
 			{
 				pObject->Process(pOutL, pOutR, nCount);
+
+				pState->inputSilenceCount += nCount;
+				if(plugin.IsAutoSuspendable() && pState->inputSilenceCount >= m_MixerSettings.gdwMixingFreq * 4)
+				{
+					bool isSilent = true;
+					for(uint32_t i = 0; i < nCount; i++)
+					{
+						if(pOutL[i] > FLT_EPSILON || pOutL[i] < -FLT_EPSILON
+							|| pOutR[i] > FLT_EPSILON || pOutR[i] < -FLT_EPSILON)
+						{
+							isSilent = false;
+							break;
+						}
+					}
+					if(isSilent)
+					{
+						pState->dwFlags |= SNDMIXPLUGINSTATE::psfSilenceBypass;
+					} else
+					{
+						pState->inputSilenceCount = 0;
+					}
+				}
 			}
+			pState->dwFlags &= ~SNDMIXPLUGINSTATE::psfHasInput;
 		}
 	}
 #ifdef MPT_INTMIXER

Modified: trunk/OpenMPT/soundlib/plugins/PlugInterface.h
===================================================================
--- trunk/OpenMPT/soundlib/plugins/PlugInterface.h	2014-09-09 19:36:34 UTC (rev 4274)
+++ trunk/OpenMPT/soundlib/plugins/PlugInterface.h	2014-09-11 19:01:03 UTC (rev 4275)
@@ -70,6 +70,8 @@
 	virtual bool isInstrument() = 0;
 	virtual bool CanRecieveMidiEvents() = 0;
 	virtual void SetDryRatio(UINT param) = 0;
+	virtual bool ShouldProcessSilence() = 0;
+	virtual void ResetSilence() = 0;
 	virtual void SetEditorPos(int32 x, int32 y) = 0;
 	virtual void GetEditorPos(int32 &x, int32 &y) const = 0;
 
@@ -91,13 +93,25 @@
 	enum PluginStateFlags
 	{
 		psfMixReady = 0x01,				// Set when cleared
+		psfHasInput = 0x02,				// Set when plugin has non-silent input
+		psfSilenceBypass = 0x04,		// Bypass because of silence detection
 	};
 
 	mixsample_t *pMixBuffer;			// Stereo effect send buffer
 	float *pOutBufferL;					// Temp storage for int -> float conversion
 	float *pOutBufferR;
 	uint32 dwFlags;						// PluginStateFlags
-	mixsample_t nVolDecayL, nVolDecayR;	// Buffer click removal
+	uint32 inputSilenceCount;			// How much silence has been processed? (for plugin auto-turnoff)
+	mixsample_t nVolDecayL, nVolDecayR;	// Buffer click removal - I think these are *always* 0.
+
+	SNDMIXPLUGINSTATE() { memset(this, 0, sizeof(*this)); }
+
+	void ResetSilence()
+	{
+		dwFlags |= psfHasInput;
+		dwFlags &= ~psfSilenceBypass;
+		inputSilenceCount = 0;
+	}
 };
 
 
@@ -114,6 +128,7 @@
 		irBypass		= 0x02,		// Bypass effect
 		irWetMix		= 0x04,		// Wet Mix (dry added)
 		irExpandMix		= 0x08,		// [0%,100%] -> [-200%,200%]
+		irAutoSuspend	= 0x10,		// Plugin will automatically suspend on silence
 	};
 
 	VstInt32 dwPluginId1;			// Plugin type (kEffectMagic, kDmoMagic, kBuzzMagic)
@@ -184,6 +199,8 @@
 		{ return (Info.routingFlags & SNDMIXPLUGININFO::irExpandMix) != 0; }
 	bool IsBypassed() const
 		{ return (Info.routingFlags & SNDMIXPLUGININFO::irBypass) != 0; }
+	bool IsAutoSuspendable() const
+		{ return (Info.routingFlags & SNDMIXPLUGININFO::irAutoSuspend) != 0; }
 
 	// Input routing setters
 	void SetGain(uint8 gain)
@@ -198,6 +215,8 @@
 		{ if(expanded) Info.routingFlags |= SNDMIXPLUGININFO::irExpandMix; else Info.routingFlags &= ~SNDMIXPLUGININFO::irExpandMix; }
 	void SetBypass(bool bypass = true)
 		{ if(pMixPlugin != nullptr) pMixPlugin->Bypass(bypass); else Info.SetBypass(bypass); }
+	void SetAutoSuspend(bool suspend = true)
+		{ if(suspend) Info.routingFlags |= SNDMIXPLUGININFO::irAutoSuspend; else Info.routingFlags &= ~SNDMIXPLUGININFO::irAutoSuspend; }
 
 	// Output routing getters
 	bool IsOutputToMaster() const

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [OMPT-svn-commit] SF.net SVN: modplug:[4275] trunk/OpenMPT (Page 52)

A music tracker software for Windows.

modplug-svn-commit