comparison audioio/AudioCallbackPlaySource.cpp @ 31:37af203dbd15

* Buffer size fixes in the time stretcher, to avoid running out of input data
  for large or small ratios

 	PhaseVocoderTimeStretcher *newStretcher = new PhaseVocoderTimeStretcher
 	    (getTargetSampleRate(),
              channels,
              factor,
              sharpen,
-             lrintf(getTargetBlockSize() / factor));
+             getTargetBlockSize());
 
 	m_timeStretcher = newStretcher;
 
     } else {
 	m_timeStretcher = 0;

 
     size_t channels = getTargetChannelCount();
     bool mix = (channels > 1 && ts->getChannelCount() == 1);
 
     size_t available;
+
+    int warned = 0;
+
+    
+
+    //!!!
+    // We want output blocks of e.g. 1024 (probably fixed, certainly
+    // bounded).  We can provide input blocks of any size (unbounded)
+    // at the timestretcher's request.  The input block for a given
+    // output is approx output / ratio, but we can't predict it
+    // exactly, for an adaptive timestretcher.  The stretcher will
+    // need some additional buffer space.
+
+
+
 
     while ((available = ts->getAvailableOutputSamples()) < count) {
 
         size_t reqd = lrintf((count - available) / ratio);
         reqd = std::max(reqd, ts->getRequiredInputSamples());

         }
 
         if (got == 0) break;
 
         if (ts->getAvailableOutputSamples() == available) {
-            std::cerr << "WARNING: AudioCallbackPlaySource::getSamples: Added " << got << " samples to time stretcher, created no new available output samples" << std::endl;
-            break;
+            std::cerr << "WARNING: AudioCallbackPlaySource::getSamples: Added " << got << " samples to time stretcher, created no new available output samples (warned = " << warned << ")" << std::endl;
+            if (++warned == 5) break;
         }
     }
 
     ts->getOutput(buffer, count);