comparison audio/AudioCallbackPlaySource.cpp @ 544:c4391f6c7484 bqresample

Start pruning other resampler logic than bqresample

     m_stretchMono(false),
     m_stretcherInputCount(0),
     m_stretcherInputs(0),
     m_stretcherInputSizes(0),
     m_fillThread(0),
-    m_converter(0)
+    m_resampler(0)
 {
     m_viewManager->setAudioPlaySource(this);
 
     connect(m_viewManager, SIGNAL(selectionChanged()),
 	    this, SLOT(selectionChanged()));

     } else {
 	if (willPlay) clearRingBuffers(true);
     }
 
     if (buffersChanged || srChanged) {
-	if (m_converter) {
-#ifdef DEBUG_AUDIO_PLAY_SOURCE
-            cerr << "AudioCallbackPlaySource::addModel: Buffers or sample rate changed, deleting existing SR converter" << endl;
-#endif
-	    src_delete(m_converter);
-	    m_converter = 0;
+	if (m_resampler) {
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+            cerr << "AudioCallbackPlaySource::addModel: Buffers or sample rate changed, deleting existing resampler" << endl;
+#endif
+            delete m_resampler;
+	    m_resampler = 0;
 	}
     }
 
     rebuildRangeLists();
 
     m_mutex.unlock();
 
-    initialiseConverter();
+    initialiseResampler();
     
     m_audioGenerator->setTargetChannelCount(getTargetChannelCount());
 
     if (!m_fillThread) {
 	m_fillThread = new FillThread(*this);

                this, SLOT(modelChangedWithin(sv_frame_t, sv_frame_t)));
 
     m_models.erase(model);
 
     if (m_models.empty()) {
-	if (m_converter) {
-#ifdef DEBUG_AUDIO_PLAY_SOURCE
-            cerr << "AudioCallbackPlaySource::removeModel: No models left, deleting SR converter" << endl;
-#endif
-	    src_delete(m_converter);
-	    m_converter = 0;
+	if (m_resampler) {
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+            cerr << "AudioCallbackPlaySource::removeModel: No models left, deleting resampler" << endl;
+#endif
+	    delete m_resampler;
+	    m_resampler = 0;
 	}
 	m_sourceSampleRate = 0;
     }
 
     sv_frame_t lastEnd = 0;

     cout << "AudioCallbackPlaySource::clearModels()" << endl;
 #endif
 
     m_models.clear();
 
-    if (m_converter) {
-#ifdef DEBUG_AUDIO_PLAY_SOURCE
-        cerr << "AudioCallbackPlaySource::clearModels: Deleting SR converter" << endl;
-#endif
-	src_delete(m_converter);
-	m_converter = 0;
+    if (m_resampler) {
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+        cerr << "AudioCallbackPlaySource::clearModels: Deleting resampler" << endl;
+#endif
+	delete m_resampler;
+	m_resampler = 0;
     }
 
     m_lastModelEndFrame = 0;
 
     m_sourceSampleRate = 0;

             cerr << "reset ring buffer for channel " << c << endl;
 #endif
             if (rb) rb->reset();
         }
     }
-    if (m_converter) src_reset(m_converter);
+    if (m_resampler) {
+        m_resampler->reset();
+    }
 
     m_mutex.unlock();
 
     m_audioGenerator->reset();
 

 AudioCallbackPlaySource::setSystemPlaybackSampleRate(int sr)
 {
     bool first = (m_targetSampleRate == 0);
 
     m_targetSampleRate = sr;
-    initialiseConverter();
+    initialiseResampler();
 
     if (first && (m_stretchRatio != 1.f)) {
         // couldn't create a stretcher before because we had no sample
         // rate: make one now
         setTimeStretch(m_stretchRatio);
     }
 }
 
 void
-AudioCallbackPlaySource::initialiseConverter()
+AudioCallbackPlaySource::initialiseResampler()
 {
     m_mutex.lock();
 
 #ifdef DEBUG_AUDIO_PLAY_SOURCE
-    cerr << "AudioCallbackPlaySource::initialiseConverter(): from "
+    cerr << "AudioCallbackPlaySource::initialiseResampler(): from "
          << getSourceSampleRate() << " to " << getTargetSampleRate() << endl;
 #endif
     
-    if (m_converter) {
-        src_delete(m_converter);
-        m_converter = 0;
+    if (m_resampler) {
+        delete m_resampler;
+        m_resampler = 0;
     }
 
     if (getSourceSampleRate() != getTargetSampleRate()) {
 
-	int err = 0;
-
-	m_converter = src_new(SRC_SINC_FASTEST, getTargetChannelCount(), &err);
-
-	if (!m_converter) {
-	    cerr << "AudioCallbackPlaySource::setModel: ERROR in creating samplerate converter: "
-                 << src_strerror(err) << endl;
-
-            m_mutex.unlock();
-
-            emit sampleRateMismatch(getSourceSampleRate(),
-                                    getTargetSampleRate(),
-                                    false);
-	} else {
-
-            m_mutex.unlock();
-
-            emit sampleRateMismatch(getSourceSampleRate(),
-                                    getTargetSampleRate(),
-                                    true);
-        }
+        m_resampler = new breakfastquay::Resampler
+            (breakfastquay::Resampler::FastestTolerable,
+             getTargetChannelCount());
+
+        m_mutex.unlock();
+
+        emit sampleRateMismatch(getSourceSampleRate(),
+                                getTargetSampleRate(),
+                                true);
     } else {
         m_mutex.unlock();
     }
 }
 

         cout << "AudioCallbackPlaySourceFillThread: no space to fill" << endl;
 #endif
         return false;
     }
 
+    // space is now the number of samples that can be written on each
+    // channel's write ringbuffer
+    
     sv_frame_t f = m_writeBufferFill;
 	
     bool readWriteEqual = (m_readBuffers == m_writeBuffers);
 
 #ifdef DEBUG_AUDIO_PLAY_SOURCE

 	bufferPtrCount = channels;
     }
 
     sv_frame_t generatorBlockSize = m_audioGenerator->getBlockSize();
 
-    if (resample && !m_converter) {
-        throw std::logic_error("Sample rates differ, but no converter available!");
-    }
-
-    if (resample && m_converter) {
+    if (resample && !m_resampler) {
+        throw std::logic_error("Sample rates differ, but no resampler available!");
+    }
+
+    if (resample && m_resampler) {
 
 	double ratio =
 	    double(getTargetSampleRate()) / double(getSourceSampleRate());
 	orig = sv_frame_t(double(orig) / ratio + 0.1);
 

 	    for (int i = 0; i < got; ++i) {
 		float sample = nonintlv[c * got + i];
 		intlv[channels * i + c] = sample;
 	    }
 	}
-		
+
+        sv_frame_t toCopy = m_resampler->resampleInterleaved
+            (intlv, srcout, got, ratio, false);
+        
 	SRC_DATA data;
 	data.data_in = intlv;
 	data.data_out = srcout;
 	data.input_frames = long(got);
 	data.output_frames = long(work);