comparison data/fileio/CodedAudioFileReader.cpp @ 1320:983667969a82 3.0-integration

Update to reflect bqresample API change

     m_fileRate(0),
     m_cacheFileWritePtr(0),
     m_cacheFileReader(0),
     m_cacheWriteBuffer(0),
     m_cacheWriteBufferIndex(0),
-    m_cacheWriteBufferSize(65536),
+    m_cacheWriteBufferFrames(65536),
     m_resampler(0),
     m_resampleBuffer(0),
+    m_resampleBufferFrames(0),
     m_fileFrameCount(0),
     m_normalised(normalised),
     m_max(0.f),
     m_gain(1.f),
     m_trimFromStart(0),

     if (m_fileRate != m_sampleRate) {
         SVDEBUG << "CodedAudioFileReader: resampling " << m_fileRate << " -> " <<  m_sampleRate << endl;
         m_resampler = new breakfastquay::Resampler
             (breakfastquay::Resampler::FastestTolerable,
              m_channelCount,
-             m_cacheWriteBufferSize);
+             int(m_cacheWriteBufferFrames));
         double ratio = m_sampleRate / m_fileRate;
-        m_resampleBuffer = new float
-            [lrint(ceil(double(m_cacheWriteBufferSize) * m_channelCount * ratio + 1))];
-    }
-
-    m_cacheWriteBuffer = new float[m_cacheWriteBufferSize * m_channelCount];
+        m_resampleBufferFrames = int(ceil(double(m_cacheWriteBufferFrames) *
+                                          ratio + 1));
+        m_resampleBuffer = new float[m_resampleBufferFrames * m_channelCount];
+    }
+
+    m_cacheWriteBuffer = new float[m_cacheWriteBufferFrames * m_channelCount];
     m_cacheWriteBufferIndex = 0;
 
     if (m_cacheMode == CacheInTemporaryFile) {
 
         try {

 
     if (m_cacheMode == CacheInMemory) {
         m_data.clear();
     }
 
-    if (m_trimFromEnd >= (m_cacheWriteBufferSize * m_channelCount)) {
-        SVCERR << "WARNING: CodedAudioFileReader::setSamplesToTrim: Can't handle trimming more frames from end (" << m_trimFromEnd << ") than can be stored in cache-write buffer (" << (m_cacheWriteBufferSize * m_channelCount) << "), won't trim anything from the end after all";
+    if (m_trimFromEnd >= (m_cacheWriteBufferFrames * m_channelCount)) {
+        SVCERR << "WARNING: CodedAudioFileReader::setSamplesToTrim: Can't handle trimming more frames from end (" << m_trimFromEnd << ") than can be stored in cache-write buffer (" << (m_cacheWriteBufferFrames * m_channelCount) << "), won't trim anything from the end after all";
         m_trimFromEnd = 0;
     }
 
     m_initialised = true;
 }

 void
 CodedAudioFileReader::pushCacheWriteBufferMaybe(bool final)
 {
     if (final ||
         (m_cacheWriteBufferIndex ==
-         m_cacheWriteBufferSize * m_channelCount)) {
+         m_cacheWriteBufferFrames * m_channelCount)) {
 
         if (m_trimFromEnd > 0) {
         
             sv_frame_t framesToPush =
                 (m_cacheWriteBufferIndex / m_channelCount) - m_trimFromEnd;

 //    SVDEBUG << "pushBufferResampling: ratio = " << ratio << ", sz = " << sz << ", final = " << final << endl;
 
     if (sz > 0) {
 
         sv_frame_t out = m_resampler->resampleInterleaved
-            (buffer,
-             m_resampleBuffer,
+            (m_resampleBuffer,
+             m_resampleBufferFrames,
+             buffer,
              sz,
              ratio,
              false);
 
         pushBufferNonResampling(m_resampleBuffer, out);

 
         float *padding = new float[padSamples];
         for (sv_frame_t i = 0; i < padSamples; ++i) padding[i] = 0.f;
 
         sv_frame_t out = m_resampler->resampleInterleaved
-            (padding,
-             m_resampleBuffer,
+            (m_resampleBuffer,
+             m_resampleBufferFrames,
+             padding,
              padFrames,
              ratio,
              true);
 
         if (m_frameCount + out > sv_frame_t(double(m_fileFrameCount) * ratio)) {