comparison src/ConstantQ.cpp @ 178:2420733abeb6

Merge

 
     for (int i = 1; i < m_octaves; ++i) {
 
         int factor = pow(2, i);
 
-        Resampler *r = new Resampler
-            (sourceRate, sourceRate / factor, 50, 0.05);
+        Resampler *r;
+
+        if (m_inparams.decimator == CQParameters::BetterDecimator) {
+            r = new Resampler
+                (sourceRate, sourceRate / factor, 50, 0.05);
+        } else {
+            r = new Resampler
+                (sourceRate, sourceRate / factor, 25, 0.3);
+        }                
 
 #ifdef DEBUG_CQ
         cerr << "forward: octave " << i << ": resample from " << sourceRate << " to " << sourceRate / factor << endl;
 #endif
 

     RealSequence ro(m_p.fftSize, 0.0);
     RealSequence io(m_p.fftSize, 0.0);
 
     m_fft->forward(m_buffers[octave].data(), ro.data(), io.data());
 
-    RealSequence shifted;
-    shifted.insert(shifted.end(), 
-                   m_buffers[octave].begin() + m_p.fftHop,
-                   m_buffers[octave].end());
-    m_buffers[octave] = shifted;
-
-    ComplexSequence cv;
+    m_buffers[octave] = RealSequence(m_buffers[octave].begin() + m_p.fftHop,
+                                     m_buffers[octave].end());
+
+    ComplexSequence cv(m_p.fftSize);
     for (int i = 0; i < m_p.fftSize; ++i) {
-        cv.push_back(Complex(ro[i], io[i]));
+        cv[i] = Complex(ro[i], io[i]);
     }
 
     ComplexSequence cqrowvec = m_kernel->processForward(cv);
 
     // Reform into a column matrix