Moving ITAHDFTSpectra and some useful methods for sampleframe and -buffer.

CMakeLists.txt

@@ -69,6 +69,7 @@ set( ITABaseHeader
 	"include/ITAFade.h"
 	"include/ITAFastMath.h"
 	"include/ITAFileSystemUtils.h"
+	"include/ITAHDFTSpectra.h"
 	"include/ITAHDFTSpectrum.h"
 	"include/ITAFunctors.h"
 	"include/ITALog.h"
@@ -99,6 +100,7 @@ set( ITABaseSources
 	"src/ITAException.cpp"
 	"src/ITAFade.cpp"
 	"src/ITAFileSystemUtils.cpp"
+	"src/ITAHDFTSpectra.cpp"
 	"src/ITAHDFTSpectrum.cpp"
 	"src/ITALog.cpp"
 	"src/ITANumericUtils.cpp"

include/ITAHDFTSpectra.h

+/*
+ * ----------------------------------------------------------------
+ *
+ *		ITA core libs
+ *		(c) Copyright Institute of Technical Acoustics (ITA)
+ *		RWTH Aachen University, Germany, 2015-2017
+ *
+ * ----------------------------------------------------------------
+ *				    ____  __________  _______
+ *				   //  / //__   ___/ //  _   |
+ *				  //  /    //  /    //  /_|  |
+ *				 //  /    //  /    //  ___   |
+ *				//__/    //__/    //__/   |__|
+ *
+ * ----------------------------------------------------------------
+ *
+ */
+
+#ifndef INCLUDE_WATCHER_ITA_HDFT_SPECTRA
+#define INCLUDE_WATCHER_ITA_HDFT_SPECTRA
+
+// ITA includes
+#include <ITABaseDefinitions.h>
+#include <ITAException.h>
+
+// STL includes
+#include <vector>
+
+class ITAHDFTSpectrum;
+
+//! Multi-channel half-sided discrete fourier spectra
+/**
+  *
+  * This class describes DFT spectrum data with variable number channels
+  * and provides functionality for manipulation and math operations.
+  *
+  * This class extends the \ITAHDFTSpectrum for multi-channel applications.
+  *
+  */
+class ITA_BASE_API ITAHDFTSpectra
+{
+public:
+
+	//! Constructor that initializes the
+	ITAHDFTSpectra( const double dSampleRate, const int iNumChannels, const int iDFTSize, const bool bZeroInit=true );
+
+	//! Constructor that uses a non-empty HDFTSpectrum vector
+	ITAHDFTSpectra( const std::vector< ITAHDFTSpectrum* >& vpSpectrumVec );
+
+	//! Standard destructor
+	~ITAHDFTSpectra();
+
+	//! Return number of channels
+	/**
+	  * \return Number of spectra / dimension of filter
+	  */
+	int GetNumChannels() const;
+
+	//! Return DFT size
+	/**
+	  * \return Number of coeffs + 1 for DC value
+	  */
+	int GetDFTSize() const;
+
+	//! Return sampling rate
+	double GetSampleRate() const;
+
+	//! Adds the given spectra channel-wise
+	void add( const ITAHDFTSpectra* );
+
+	//! Subtracts the given spectra channel-wise
+	void sub( const ITAHDFTSpectra* );
+
+	//! Multiplies the given spectra channel-wise
+	void mul( const ITAHDFTSpectra* );
+
+	//! Multiplies the conjugate of the given spectra without data copy channel-wise
+	void mul_conj( const ITAHDFTSpectra* );
+
+	//! Multiplies a scalar
+	void mul_scalar( double );
+
+	//! Divides the given spectra channel-wise
+	void div( const ITAHDFTSpectra* );
+
+	//! Set unity (all coefficiants real one)
+	void SetUnity();
+
+	//! Set unity (all coefficiants real one)
+	void SetZero();
+
+	//! Copy from another Spectra
+	void CopyFrom(const ITAHDFTSpectra* otherSpectra);
+
+	//! Subscript operator gives direct access to spectrum channel
+	const ITAHDFTSpectrum* operator[]( const int ) const;
+	ITAHDFTSpectrum* operator[]( const int );
+
+private:
+	//! Standard constructor
+	ITAHDFTSpectra();
+
+	std::vector< ITAHDFTSpectrum* > m_vpSpectra; //! DFT spectra
+};
+
+#endif // INCLUDE_WATCHER_ITA_HDFT_SPECTRA

include/ITASampleBuffer.h

@@ -301,6 +301,9 @@ public:
 	//! Negieren (Multiplikation mit -1 bzw. Phasendrehungum 180)
 	void Negate();
 
+	//! Normalize data
+	void Normalize();
+
 	//! Read/Write Indizierungsoperator
 	float& operator[]( int iSample );
 

include/ITASampleFrame.h

@@ -114,7 +114,11 @@ public:
      * \param iLength	Lnge [Anzahl Samples]
 	 * \param bZeroinit	Samples mit Nullen initialisieren?
 	 */
-	void init( int iChannels, int iLength, bool bZeroinit);
+	void Init( int iChannels, int iLength, bool bZeroinit );
+	inline void init( int iChannels, int iLength, bool bZeroinit )
+	{
+		return Init( iChannels, iLength, bZeroinit );
+	}
 
 	void Load( const std::string& sFilePath );
 	void Load( const std::string& sFilePath, double& dSampleRate );
@@ -294,7 +298,11 @@ public:
 	 *
 	 * \return Overall peak value that has been used for normalization (can be negative)
 	 */
-	float normalize();
+	float Normalize();
+	inline float normalize()
+	{
+		return Normalize();
+	};
 
 	//! Read/Write Indizierungsoperator fr Zugriff auf Kanaldaten
 	ITASampleBuffer& operator[](int iChannel);

src/ITAHDFTSpectra.cpp

+#include <ITAHDFTSpectra.h>
+
+#include <ITAAudiofileWriter.h>
+#include <ITAFilesystemUtils.h>
+#include <ITAHDFTSpectrum.h>
+#include <ITASampleFrame.h>
+#include <ITAStringUtils.h>
+
+ITAHDFTSpectra::ITAHDFTSpectra( const double dSampleRate, const int iNumChannels, const int iDFTSize, const bool bZeroInit/*=true*/ )
+{
+	if( iNumChannels < 1 )
+		ITA_EXCEPT1( INVALID_PARAMETER, "At least one DFT channel must be used" );
+	if( iDFTSize < 1 )
+		ITA_EXCEPT1( INVALID_PARAMETER, "Invalid DFT size" );
+
+	for( int i=0; i<iNumChannels; i++ )
+		m_vpSpectra.push_back( new ITAHDFTSpectrum( dSampleRate, iDFTSize, bZeroInit ) );
+}
+
+ITAHDFTSpectra::ITAHDFTSpectra( const std::vector< ITAHDFTSpectrum* >& vpSpectrumVec )
+{
+	if( vpSpectrumVec.size() == 0 )
+		ITA_EXCEPT1( INVALID_PARAMETER, "At least one DFT channel must be used" );
+
+	for( size_t i=0; i<vpSpectrumVec.size(); i++ )
+	{
+		const ITAHDFTSpectrum* pSpectrum( vpSpectrumVec[i] );
+		if( pSpectrum->getDFTSize() <= 0 )
+			ITA_EXCEPT1( INVALID_PARAMETER, "Invalid DFT size in spectrum number " + IntToString( int(i) ) );
+
+		if( pSpectrum->getSamplerate() <= 0 )
+			ITA_EXCEPT1( INVALID_PARAMETER, "Invalid sampling rate in spectrum number " + IntToString( int(i) ) );
+
+		m_vpSpectra.push_back( new ITAHDFTSpectrum( pSpectrum ) ); // copy
+	}
+}
+
+ITAHDFTSpectra::~ITAHDFTSpectra()
+{
+	for( size_t i=0; i<m_vpSpectra.size(); i++ )
+		delete m_vpSpectra[i];
+}
+
+void ITAHDFTSpectra::CopyFrom(const ITAHDFTSpectra *otherSpectra)
+{
+	int iNumChannels=otherSpectra->GetNumChannels();
+	
+	m_vpSpectra.clear();
+	
+	for( int i=0; i<iNumChannels; i++ )
+	{
+        //ITAHDFTSpectrum* tempSpectrum = new ITAHDFTSpectrum(double(otherSpectra->GetSampleRate()),int(otherSpectra->GetDFTSize()));
+        ITAHDFTSpectrum* tempSpectrum = new ITAHDFTSpectrum((*otherSpectra)[i]);
+        //tempSpectrum->copyFrom((*otherSpectra)[i]);
+		m_vpSpectra.push_back(tempSpectrum);
+	}
+}
+
+void ITAHDFTSpectra::SetUnity()
+{
+	for( size_t i=0; i<m_vpSpectra.size(); i++ )
+	{
+		ITAHDFTSpectrum* pSpectrum( m_vpSpectra[i] );
+		pSpectrum->SetUnity();
+	}
+}
+
+void ITAHDFTSpectra::SetZero()
+{
+	for( size_t i=0; i<m_vpSpectra.size(); i++ )
+	{
+		ITAHDFTSpectrum* pSpectrum( m_vpSpectra[i] );
+		pSpectrum->mul( 0.0f );
+	}
+}
+
+int ITAHDFTSpectra::GetNumChannels() const
+{
+	return int( m_vpSpectra.size() );
+}
+
+int ITAHDFTSpectra::GetDFTSize() const
+{
+	return m_vpSpectra[0]->getDFTSize();
+}
+
+double ITAHDFTSpectra::GetSampleRate() const
+{
+	return m_vpSpectra[0]->getSamplerate();
+}
+
+void ITAHDFTSpectra::add( const ITAHDFTSpectra* pSource )
+{
+	if( GetNumChannels() != pSource->GetNumChannels() )
+		ITA_EXCEPT1( INVALID_PARAMETER, "Channel number mismatch" );
+
+	for( int i=0; i<GetNumChannels(); i++ )
+	{
+		ITAHDFTSpectrum* pSpectrum( m_vpSpectra[i] );
+		const ITAHDFTSpectrum* pSourceSpectrum( (*pSource)[i] );
+		pSpectrum->add( pSourceSpectrum );
+	}
+
+	return;
+}
+
+void ITAHDFTSpectra::sub( const ITAHDFTSpectra* pSource )
+{
+	if( GetNumChannels() != pSource->GetNumChannels() )
+		ITA_EXCEPT1( INVALID_PARAMETER, "Channel number mismatch" );
+
+	for( int i=0; i<GetNumChannels(); i++ )
+	{
+		ITAHDFTSpectrum* pSpectrum( m_vpSpectra[i] );
+		const ITAHDFTSpectrum* pSourceSpectrum( (*pSource)[i] );
+		pSpectrum->sub( pSourceSpectrum );
+	}
+
+	return;
+}
+
+void ITAHDFTSpectra::mul( const ITAHDFTSpectra* pSource )
+{
+	if( GetNumChannels() != pSource->GetNumChannels() )
+		ITA_EXCEPT1( INVALID_PARAMETER, "Channel number mismatch" );
+
+	for( int i=0; i<GetNumChannels(); i++ )
+	{
+		ITAHDFTSpectrum* pSpectrum( m_vpSpectra[i] );
+		const ITAHDFTSpectrum* pSourceSpectrum( (*pSource)[i] );
+		pSpectrum->mul( pSourceSpectrum );
+	}
+
+	return;
+}
+
+void ITAHDFTSpectra::mul_conj( const ITAHDFTSpectra* pSource )
+{
+	if( GetNumChannels() != pSource->GetNumChannels() )
+		ITA_EXCEPT1( INVALID_PARAMETER, "Channel number mismatch" );
+
+	for( int i=0; i<GetNumChannels(); i++ )
+	{
+		ITAHDFTSpectrum* pSpectrum( m_vpSpectra[i] );
+		const ITAHDFTSpectrum* pSourceSpectrum( (*pSource)[i] );
+		pSpectrum->mul( pSourceSpectrum );
+	}
+
+	return;
+}
+
+void ITAHDFTSpectra::mul_scalar( double )
+{
+	ITA_EXCEPT0( NOT_IMPLEMENTED );
+}
+
+void ITAHDFTSpectra::div( const ITAHDFTSpectra* pSource )
+{
+	if( GetNumChannels() != pSource->GetNumChannels() )
+		ITA_EXCEPT1( INVALID_PARAMETER, "Channel number mismatch" );
+
+	for( int i=0; i<GetNumChannels(); i++ )
+	{
+		ITAHDFTSpectrum* pSpectrum( m_vpSpectra[i] );
+		const ITAHDFTSpectrum* pSourceSpectrum( (*pSource)[i] );
+		pSpectrum->div( pSourceSpectrum );
+	}
+
+	return;
+}
+
+const ITAHDFTSpectrum* ITAHDFTSpectra::operator[]( const int iIdx ) const
+{
+	return m_vpSpectra[iIdx];
+}
+ITAHDFTSpectrum* ITAHDFTSpectra::operator[]( const int iIdx )
+{
+	return m_vpSpectra[iIdx];
+}

src/ITASampleBuffer.cpp

@@ -562,7 +562,13 @@ float ITASampleBuffer::FindPeak( int* piPeakIndex )
 
 void ITASampleBuffer::Negate()
 {
-	mul_scalar( -1 );
+	mul_scalar( -1.0f );
+}
+
+
+void ITASampleBuffer::Normalize()
+{
+	mul_scalar( FindPeak() );
 }
 
 float& ITASampleBuffer::operator[]( int iSample )