comparison audioio/AudioCallbackPlaySource.cpp @ 12:ee967635c728

* Some work on making the time stretcher squash as well as stretch

 
 #include <iostream>
 #include <cassert>
 
 //#define DEBUG_AUDIO_PLAY_SOURCE 1
-//#define DEBUG_AUDIO_PLAY_SOURCE_PLAYING 1
+#define DEBUG_AUDIO_PLAY_SOURCE_PLAYING 1
 
 //const size_t AudioCallbackPlaySource::m_ringBufferSize = 102400;
 const size_t AudioCallbackPlaySource::m_ringBufferSize = 131071;
 
 AudioCallbackPlaySource::AudioCallbackPlaySource(ViewManager *manager) :

 {
     return m_sourceSampleRate;
 }
 
 AudioCallbackPlaySource::TimeStretcherData::TimeStretcherData(size_t channels,
-							      size_t factor,
+							      float factor,
 							      size_t blockSize) :
     m_factor(factor),
     m_blockSize(blockSize)
 {
 //    std::cerr << "TimeStretcherData::TimeStretcherData(" << channels << ", " << factor << ", " << blockSize << ")" << std::endl;

     for (size_t ch = 0; ch < channels; ++ch) {
 	m_stretcher[ch] = StretcherBuffer
 	    //!!! We really need to measure performance and work out
 	    //what sort of quality level to use -- or at least to
 	    //allow the user to configure it
-	    (new IntegerTimeStretcher(factor, blockSize, 128),
-	     new float[blockSize * factor]);
+	    (new IntegerTimeStretcher(factor, blockSize, 1024),
+	     new float[lrintf(blockSize * factor)]);
     }
     m_stretchInputBuffer = new float[blockSize];
 }
 
 AudioCallbackPlaySource::TimeStretcherData::~TimeStretcherData()

 				   getOutputBuffer(channel),
 				   m_blockSize);
 }
 
 void
-AudioCallbackPlaySource::setSlowdownFactor(size_t factor)
+AudioCallbackPlaySource::setSlowdownFactor(float factor)
 {
     // Avoid locks -- create, assign, mark old one for scavenging
     // later (as a call to getSourceSamples may still be using it)
 
     TimeStretcherData *existingStretcher = m_timeStretcher;
 
     if (existingStretcher && existingStretcher->getFactor() == factor) {
 	return;
     }
 
-    if (factor > 1) {
+    if (factor != 1) {
 	TimeStretcherData *newStretcher = new TimeStretcherData
-	    (getTargetChannelCount(), factor, getTargetBlockSize());
+	    (getTargetChannelCount(), factor,
+             factor > 1 ? getTargetBlockSize() : getTargetBlockSize() / factor);
 	m_slowdownCounter = 0;
 	m_timeStretcher = newStretcher;
     } else {
 	m_timeStretcher = 0;
     }

 
         m_condition.wakeAll();
 	return got;
     }
 
+/*!!!
     if (m_slowdownCounter == 0) {
 
 	size_t got = 0;
 	float *ib = timeStretcher->getInputBuffer();
 

 
 		size_t request = count;
 		if (ch > 0) request = got; // see above
 		got = rb->read(buffer[ch], request);
 
-#ifdef DEBUG_AUDIO_PLAY_SOURCE
+#ifdef DEBUG_AUDIO_PLAY_SOURCE_PLAYING
 		std::cout << "AudioCallbackPlaySource::getSamples: got " << got << " samples on channel " << ch << ", running time stretcher" << std::endl;
 #endif
 
 		for (size_t i = 0; i < count; ++i) {
 		    ib[i] = buffer[ch][i];

 
     for (size_t ch = 0; ch < getTargetChannelCount(); ++ch) {
 
 	float *ob = timeStretcher->getOutputBuffer(ch);
 
-#ifdef DEBUG_AUDIO_PLAY_SOURCE
+#ifdef DEBUG_AUDIO_PLAY_SOURCE_PLAYING
 	std::cerr << "AudioCallbackPlaySource::getSamples: Copying from (" << (m_slowdownCounter * count) << "," << count << ") to buffer" << std::endl;
 #endif
 
 	for (size_t i = 0; i < count; ++i) {
 	    buffer[ch][i] = ob[m_slowdownCounter * count + i];
 	}
     }
+*/
+
+    for (size_t ch = 0; ch < getTargetChannelCount(); ++ch) {
+
+        RingBuffer<float> *rb = getReadRingBuffer(ch);
+
+        if (rb) {
+
+            float ratio = timeStretcher->getStretcher(ch)->getRatio();
+            size_t request = lrintf(count / ratio);
+//            if (ch > 0) request = got; // see above
+
+            float *ib = new float[request]; //!!!
+
+            size_t got = rb->read(ib, request);
+
+#ifdef DEBUG_AUDIO_PLAY_SOURCE_PLAYING
+            std::cout << "AudioCallbackPlaySource::getSamples: got " << got << " samples on channel " << ch << " (count=" << count << ", ratio=" << timeStretcher->getStretcher(ch)->getRatio() << ", got*ratio=" << got * ratio << "), running time stretcher" << std::endl;
+#endif
+
+            timeStretcher->getStretcher(ch)->process(ib, buffer[ch], request);
+            
+            delete[] ib;
+
+//            for (size_t i = 0; i < count; ++i) {
+//                ib[i] = buffer[ch][i];
+//            }
+	    
+//            timeStretcher->run(ch);
+
+            
+
+        }
+    }
+
+    
 
 //!!!    if (m_slowdownCounter == 0) m_condition.wakeAll();
-    m_slowdownCounter = (m_slowdownCounter + 1) % timeStretcher->getFactor();
+//    m_slowdownCounter = (m_slowdownCounter + 1) % timeStretcher->getFactor();
     return count;
 }
 
 // Called from fill thread, m_playing true, mutex held
 bool