diff options
Diffstat (limited to 'libs/qm-dsp/dsp/signalconditioning')
| -rw-r--r-- | libs/qm-dsp/dsp/signalconditioning/DFProcess.cpp | 16 | ||||
| -rw-r--r-- | libs/qm-dsp/dsp/signalconditioning/DFProcess.h | 2 | ||||
| -rw-r--r-- | libs/qm-dsp/dsp/signalconditioning/FiltFilt.cpp | 16 | ||||
| -rw-r--r-- | libs/qm-dsp/dsp/signalconditioning/Filter.h | 2 | ||||
| -rw-r--r-- | libs/qm-dsp/dsp/signalconditioning/Framer.cpp | 8 |
5 files changed, 22 insertions, 22 deletions
diff --git a/libs/qm-dsp/dsp/signalconditioning/DFProcess.cpp b/libs/qm-dsp/dsp/signalconditioning/DFProcess.cpp index 971f5fac8e..4b93cb0e12 100644 --- a/libs/qm-dsp/dsp/signalconditioning/DFProcess.cpp +++ b/libs/qm-dsp/dsp/signalconditioning/DFProcess.cpp @@ -25,7 +25,7 @@ DFProcess::DFProcess( DFProcConfig Config ) { filtSrc = NULL; - filtDst = NULL; + filtDst = NULL; m_filtScratchIn = NULL; m_filtScratchOut = NULL; @@ -51,13 +51,13 @@ void DFProcess::initialise( DFProcConfig Config ) filtSrc = new double[ m_length ]; filtDst = new double[ m_length ]; - + //Low Pass Smoothing Filter Config m_FilterConfigParams.ord = Config.LPOrd; m_FilterConfigParams.ACoeffs = Config.LPACoeffs; m_FilterConfigParams.BCoeffs = Config.LPBCoeffs; - - m_FiltFilt = new FiltFilt( m_FilterConfigParams ); + + m_FiltFilt = new FiltFilt( m_FilterConfigParams ); } void DFProcess::deInitialise() @@ -115,7 +115,7 @@ void DFProcess::medianFilter(double *src, double *dst) { if (index >= m_length) break; - + l = 0; for( j = i; j < ( i + m_winPost + m_winPre + 1); j++) { @@ -139,7 +139,7 @@ void DFProcess::medianFilter(double *src, double *dst) l++; } - + scratch[ index++ ] = MathUtilities::median( y, l); } @@ -147,7 +147,7 @@ void DFProcess::medianFilter(double *src, double *dst) for( i = 0; i < m_length; i++ ) { val = src[ i ] - scratch[ i ];// - 0.033; - + if( m_isMedianPositive ) { if( val > 0 ) @@ -164,7 +164,7 @@ void DFProcess::medianFilter(double *src, double *dst) dst[ i ] = val; } } - + delete [] y; delete [] scratch; } diff --git a/libs/qm-dsp/dsp/signalconditioning/DFProcess.h b/libs/qm-dsp/dsp/signalconditioning/DFProcess.h index 3af80743f5..ad40f846b9 100644 --- a/libs/qm-dsp/dsp/signalconditioning/DFProcess.h +++ b/libs/qm-dsp/dsp/signalconditioning/DFProcess.h @@ -38,7 +38,7 @@ public: void process( double* src, double* dst ); - + private: void initialise( DFProcConfig Config ); void deInitialise(); diff --git a/libs/qm-dsp/dsp/signalconditioning/FiltFilt.cpp b/libs/qm-dsp/dsp/signalconditioning/FiltFilt.cpp index 5a9e2c9549..13dbda0e82 100644 --- a/libs/qm-dsp/dsp/signalconditioning/FiltFilt.cpp +++ b/libs/qm-dsp/dsp/signalconditioning/FiltFilt.cpp @@ -24,7 +24,7 @@ FiltFilt::FiltFilt( FiltFiltConfig Config ) m_filtScratchIn = NULL; m_filtScratchOut = NULL; m_ord = 0; - + initialise( Config ); } @@ -39,7 +39,7 @@ void FiltFilt::initialise( FiltFiltConfig Config ) m_filterConfig.ord = Config.ord; m_filterConfig.ACoeffs = Config.ACoeffs; m_filterConfig.BCoeffs = Config.BCoeffs; - + m_filter = new Filter( m_filterConfig ); } @@ -50,7 +50,7 @@ void FiltFilt::deInitialise() void FiltFilt::process(double *src, double *dst, unsigned int length) -{ +{ unsigned int i; if (length == 0) return; @@ -62,7 +62,7 @@ void FiltFilt::process(double *src, double *dst, unsigned int length) m_filtScratchIn = new double[ nExt ]; m_filtScratchOut = new double[ nExt ]; - + for( i = 0; i< nExt; i++ ) { m_filtScratchIn[ i ] = 0.0; @@ -89,11 +89,11 @@ void FiltFilt::process(double *src, double *dst, unsigned int length) { m_filtScratchIn[ i + nFact ] = src[ i ]; } - + //////////////////////////////// // Do 0Ph filtering m_filter->process( m_filtScratchIn, m_filtScratchOut, nExt); - + // reverse the series for FILTFILT for ( i = 0; i < nExt; i++) { @@ -102,7 +102,7 @@ void FiltFilt::process(double *src, double *dst, unsigned int length) // do FILTER again m_filter->process( m_filtScratchIn, m_filtScratchOut, nExt); - + // reverse the series back for ( i = 0; i < nExt; i++) { @@ -117,7 +117,7 @@ void FiltFilt::process(double *src, double *dst, unsigned int length) for( i = 0; i < length; i++ ) { dst[ index++ ] = m_filtScratchOut[ i + nFact ]; - } + } delete [] m_filtScratchIn; delete [] m_filtScratchOut; diff --git a/libs/qm-dsp/dsp/signalconditioning/Filter.h b/libs/qm-dsp/dsp/signalconditioning/Filter.h index 8533ed0502..b1c20d506a 100644 --- a/libs/qm-dsp/dsp/signalconditioning/Filter.h +++ b/libs/qm-dsp/dsp/signalconditioning/Filter.h @@ -35,7 +35,7 @@ public: void reset(); void process( double *src, double *dst, unsigned int length ); - + private: void initialise( FilterConfig Config ); diff --git a/libs/qm-dsp/dsp/signalconditioning/Framer.cpp b/libs/qm-dsp/dsp/signalconditioning/Framer.cpp index 80ea67f72c..7357d2417a 100644 --- a/libs/qm-dsp/dsp/signalconditioning/Framer.cpp +++ b/libs/qm-dsp/dsp/signalconditioning/Framer.cpp @@ -44,14 +44,14 @@ void Framer::configure( unsigned int frameLength, unsigned int hop ) if( m_dataFrame != NULL ) { - delete [] m_dataFrame; + delete [] m_dataFrame; m_dataFrame = NULL; } m_dataFrame = new double[ m_frameLength ]; if( m_strideFrame != NULL ) { - delete [] m_strideFrame; + delete [] m_strideFrame; m_strideFrame = NULL; } m_strideFrame = new double[ m_stepSize ]; @@ -65,7 +65,7 @@ void Framer::getFrame(double *dst) for( unsigned int u = 0; u < m_frameLength; u++) { dst[ u ] = m_srcBuffer[ m_ulSrcIndex++ ]; - } + } m_ulSrcIndex -= ( m_frameLength - m_stepSize ); } else @@ -77,7 +77,7 @@ void Framer::getFrame(double *dst) { dst[ u ] = m_srcBuffer[ m_ulSrcIndex++ ]; } - + for( unsigned int u = 0; u < zero; u++ ) { dst[ rem + u ] = 0; |