Merge from branch bqresample

src/StretcherChannelData.h

@@ -27,8 +27,7 @@
 #include "StretcherImpl.h"
 
 #include <set>
-
-//#define EXPERIMENT 1
+#include <atomic>
 
 namespace RubberBand
 {
@@ -124,11 +123,11 @@ public:
 
     size_t chunkCount;
     size_t inCount;
-    long inputSize; // set only after known (when data ended); -1 previously
+    std::atomic<int64_t> inputSize; // set only after known (when data ended); -1 previously
     size_t outCount;
 
-    bool draining;
-    bool outputComplete;
+    std::atomic<bool> draining;
+    std::atomic<bool> outputComplete;
 
     FFT *fft;
     std::map<size_t, FFT *> ffts;

src/StretcherImpl.cpp

@@ -674,8 +674,16 @@ RubberBandStretcher::Impl::configure()
 
             Resampler::Parameters params;
             params.quality = Resampler::FastestTolerable;
-            params.dynamism = Resampler::RatioOftenChanging;
-            params.ratioChange = Resampler::SmoothRatioChange;
+
+            if (m_realtime) {
+                params.dynamism = Resampler::RatioOftenChanging;
+                params.ratioChange = Resampler::SmoothRatioChange;
+            } else {
+                // ratio can't be changed in offline mode
+                params.dynamism = Resampler::RatioMostlyFixed;
+                params.ratioChange = Resampler::SuddenRatioChange;
+            }
+            
             params.maxBufferSize = 4096 * 16;
             params.debugLevel = m_debugLevel;
             

src/base/RingBuffer.h

@@ -33,6 +33,8 @@
 
 #include <iostream>
 
+#include <atomic>
+
 namespace RubberBand {
 
 /**
@@ -174,11 +176,11 @@ public:
     int zero(int n);
 
 protected:
-    T *const R__ m_buffer;
-    int          m_writer;
-    int          m_reader;
-    const int    m_size;
-    bool         m_mlocked;
+    T *const R__      m_buffer;
+    std::atomic<int>  m_writer;
+    std::atomic<int>  m_reader;
+    const int         m_size;
+    bool              m_mlocked;
 
     int readSpaceFor(int w, int r) const {
         int space;
@@ -243,7 +245,8 @@ RingBuffer<T> *
 RingBuffer<T>::resized(int newSize) const
 {
     RingBuffer<T> *newBuffer = new RingBuffer<T>(newSize);
-
+    
+    MBARRIER();
     int w = m_writer;
     int r = m_reader;
 
@@ -273,7 +276,8 @@ RingBuffer<T>::reset()
     std::cerr << "RingBuffer<T>[" << this << "]::reset" << std::endl;
 #endif
 
-    m_reader = m_writer;
+    int r = m_reader;
+    m_writer = r;
 }
 
 template <typename T>
@@ -302,7 +306,6 @@ RingBuffer<T>::read(S *const R__ destination, int n)
     if (n > available) {
 	std::cerr << "WARNING: RingBuffer::read: " << n << " requested, only "
                   << available << " available" << std::endl;
-//!!!        v_zero(destination + available, n - available);
 	n = available;
     }
     if (n == 0) return n;
@@ -320,7 +323,6 @@ RingBuffer<T>::read(S *const R__ destination, int n)
     r += n;
     while (r >= m_size) r -= m_size;
 
-    MBARRIER();
     m_reader = r;
 
     return n;
@@ -355,7 +357,6 @@ RingBuffer<T>::readAdding(S *const R__ destination, int n)
     r += n;
     while (r >= m_size) r -= m_size;
 
-    MBARRIER();
     m_reader = r;
 
     return n;
@@ -377,7 +378,6 @@ RingBuffer<T>::readOne()
     T value = m_buffer[r];
     if (++r == m_size) r = 0;
 
-    MBARRIER();
     m_reader = r;
 
     return value;
@@ -447,7 +447,6 @@ RingBuffer<T>::skip(int n)
     r += n;
     while (r >= m_size) r -= m_size;
 
-    // No memory barrier required, because we didn't read any data
     m_reader = r;
 
     return n;

src/dsp/BQResampler.cpp

@@ -581,15 +581,17 @@ BQResampler::reconstruct_one(state *s) const
     int phase_length = pr.length;
     double result = 0.0;
 
+    int dot_length = min(phase_length, int(s->buffer.size()) - s->left);
+
     if (m_dynamism == RatioMostlyFixed) {
         int phase_start = pr.start_index;
         if (m_channels == 1) {
             result = v_multiply_and_sum
                 (s->phase_sorted_filter.data() + phase_start,
                  s->buffer.data() + s->left,
-                 phase_length);
+                 dot_length);
         } else {
-            for (int i = 0; i < phase_length; ++i) {
+            for (int i = 0; i < dot_length; ++i) {
                 result +=
                     s->phase_sorted_filter[phase_start + i] *
                     s->buffer[s->left + i * m_channels + s->current_channel];
@@ -597,7 +599,7 @@ BQResampler::reconstruct_one(state *s) const
         }
     } else {
         double m = double(m_proto_length - 1) / double(s->filter_length - 1);
-        for (int i = 0; i < phase_length; ++i) {
+        for (int i = 0; i < dot_length; ++i) {
             double sample =
                 s->buffer[s->left + i * m_channels + s->current_channel];
             int filter_index = i * s->parameters.numerator + s->current_phase;