comparison FIRFilter.cpp @ 15:203551cbad47

* FIRFilter now has three output options - take all output elements, first lengthOfInput outputs, or take first lengthOfInput output after group delay

         m_pFftInput[i] = m_pFftCoefficients[i] = m_pFftReal1[i] = m_pFftImag1[i] = m_pFftReal2[i] = m_pFftImag2[i] = m_pFftFilteredReal[i] = m_pFftFilteredImag[i] = m_pFftOutputReal[i] = m_pFftOutputImag[i] = 0.0;
     }
 }
 
 void
-FIRFilter::process(const float* pInput, const float* pCoefficients, float* pOutput)
+FIRFilter::process(const float* pInput, const float* pCoefficients, float* pOutput, OutputTypeArgument outputType)
 {
+    
     //Copy to same length FFT buffers
     for(unsigned int i = 0; i < m_lengthFIRFFT; i++){
         m_pFftInput[i] = i < m_lengthInput ? pInput[i] : 0.0;
         m_pFftCoefficients[i] = i < m_numberOfCoefficients ? pCoefficients[i] : 0.0;
     }

     }
     
     FFT::inverse(m_lengthFIRFFT, m_pFftFilteredReal, m_pFftFilteredImag, m_pFftOutputReal, m_pFftOutputImag);
     
     //copy to output
-    int offset = ceil(m_numberOfCoefficients/2);
-    //int offset = 0;
-    for (unsigned int i = 0; i < m_lengthInput; i++){
+    int offset = 0;
+    unsigned int outputLength = m_lengthInput;
+    if (outputType == all) outputLength = m_lengthFIRFFT;
+    else if (outputType == middle) offset = floor((float)m_numberOfCoefficients/2);
+    else if (outputType != first) cerr << "FIRFilter::process(params) - " << outputType << " is not a valid argument. outputType is set to first." << endl;
+    
+    for (unsigned int i = 0; i < outputLength; i++){
         pOutput[i] = m_pFftOutputReal[i + offset];
     }
 }
 
 //remove memory allocations