comparison audioio/PhaseVocoderTimeStretcher.cpp @ 32:e3b32dc5180b

* Make resampler quality configurable
* Fall back to linear resampling when playing very fast
* Switch off transient detection in time stretcher when playing very very fast

     m_transientCount(0),
     m_n2sum(0),
     m_mutex(new QMutex())
 {
     initialise();
-
 }
 
 PhaseVocoderTimeStretcher::~PhaseVocoderTimeStretcher()
 {
     std::cerr << "PhaseVocoderTimeStretcher::~PhaseVocoderTimeStretcher" << std::endl;

         } else if (m_ratio < 0.8) {
             m_n1 = 512;
         } else {
             m_n1 = 256;
         }
-        if (m_sharpen) {
+        if (shouldSharpen()) {
             m_wlen = 2048;
         }
         m_n2 = lrintf(m_n1 * m_ratio);
     } else {
         if (m_ratio > 2) {

             m_n2 = 384;
             m_wlen = 2048;
         } else {
             m_n2 = 256;
         }
-        if (m_sharpen) {
+        if (shouldSharpen()) {
             if (m_wlen < 2048) m_wlen = 2048;
         }
         m_n1 = lrintf(m_n2 / m_ratio);
     }
 

 
 	size_t writable = m_inbuf[0]->getWriteSpace();
 	writable = std::min(writable, samples - consumed);
 
 	if (writable == 0) {
-	    //!!! then what? I don't think this should happen, but
+#ifdef DEBUG_PHASE_VOCODER_TIME_STRETCHER
 	    std::cerr << "WARNING: PhaseVocoderTimeStretcher::putInput: writable == 0 (inbuf has " << m_inbuf[0]->getReadSpace() << " samples available for reading, space for " << m_inbuf[0]->getWriteSpace() << " more)" << std::endl;
+#endif
             if (m_inbuf[0]->getReadSpace() < m_wlen ||
                 m_outbuf[0]->getWriteSpace() < m_n2) {
-                std::cerr << "Outbuf has space for " << m_outbuf[0]->getWriteSpace() << " (n2 = " << m_n2 << "), won't be able to process" << std::endl;
+                std::cerr << "WARNING: PhaseVocoderTimeStretcher::putInput: Inbuf has " << m_inbuf[0]->getReadSpace() << ", outbuf has space for " << m_outbuf[0]->getWriteSpace() << " (n2 = " << m_n2 << ", wlen = " << m_wlen << "), won't be able to process" << std::endl;
                 break;
             }
 	} else {
 
 #ifdef DEBUG_PHASE_VOCODER_TIME_STRETCHER

 
                 analyseBlock(c, m_tempbuf);
             }
 
             bool transient = false;
-            if (m_sharpen) transient = isTransient();
+            if (shouldSharpen()) transient = isTransient();
 
             size_t n2 = m_n2;
 
             if (transient) {
                 n2 = m_n1;

 
                 int squashyCount = m_totalCount - m_transientCount;
                 
                 n2 = lrintf(idealSquashy / squashyCount);
 
+#ifdef DEBUG_PHASE_VOCODER_TIME_STRETCHER
                 if (n2 != m_n2) {
                     std::cerr << m_n2 << " -> " << n2 << std::endl;
                 }
+#endif
             }
 
             for (size_t c = 0; c < m_channels; ++c) {
 
                 synthesiseBlock(c, m_mashbuf[c],