Merge from default branch

meson.build

@@ -440,11 +440,11 @@ ladspa_symbol_args = []
 lv2_symbol_args = []
 vamp_symbol_args = []
 
-if get_option('buildtype').startswith('release')
+if get_option('debug')
-  config_summary += { 'Build type': 'Release' }
+  config_summary += { 'Debug': 'Enabled' }
-  feature_defines += ['-DNO_THREAD_CHECKS', '-DNO_TIMING', '-DNDEBUG']
 else
-  config_summary += { 'Build type': 'Debug' }
+  config_summary += { 'Debug': 'Disabled' }
+  feature_defines += ['-DNO_THREAD_CHECKS', '-DNO_TIMING', '-DNDEBUG']
 endif
 
 if system == 'darwin'

otherbuilds/check.sh

@@ -29,13 +29,13 @@ else
     make -f otherbuilds/Makefile.macos
 
     echo " *** Linking against static library"
-    c++ -std=c++11 main/main.cpp lib/librubberband.a -I. -Isrc -o test_static -lsndfile -framework Accelerate
+    c++ -std=c++11 main/main.cpp lib/librubberband.a -I. -Isrc -o test_static -I/opt/homebrew/include -L/opt/homebrew/lib -lsndfile -framework Accelerate
     
     echo " *** Running build from macOS-specific Makefile"
     ./test_static -V
 
     echo " *** Building with single-file source"
-    c++ -O3 -std=c++11 main/main.cpp single/RubberBandSingle.cpp -o test_single -lsndfile -framework Accelerate
+    c++ -O3 -std=c++11 main/main.cpp single/RubberBandSingle.cpp -o test_single -I/opt/homebrew/include -L/opt/homebrew/lib -lsndfile -framework Accelerate
 
     echo " *** Running build from single-file source"
     ./test_single -V

src/common/Allocators.h

@@ -27,7 +27,8 @@
 #include "VectorOps.h"
 
 #include <new> // for std::bad_alloc
-#include <stdlib.h>
+#include <cstdlib>
+#include <cstddef> // ptrdiff_t
 
 #include <stdexcept>
 

src/common/Thread.h

@@ -215,7 +215,7 @@ public:
 class Condition
 {
 public:
-    Condition(std::string name) { }
+    Condition(std::string) { }
     ~Condition() { }
     
     void lock() { }

src/faster/R2Stretcher.cpp

@@ -993,6 +993,8 @@ R2Stretcher::study(const float *const *input, size_t samples, bool final)
         mixdown = input[0];
     }
 
+    std::vector<float> optionalFoldBuffer;
+    
     while (consumed < samples) {
 
 	size_t writable = inbuf.getWriteSpace();
@@ -1042,15 +1044,18 @@ R2Stretcher::study(const float *const *input, size_t samples, bool final)
 
                 // Note that we can't do this in-place.  Pity
 
-                float *tmp = (float *)alloca
+                // This doesn't have to be allocation-free, as we're
-                    (std::max(m_fftSize, m_aWindowSize) * sizeof(float));
+                // in offline-mode study
+
+                optionalFoldBuffer.resize(std::max(m_fftSize, m_aWindowSize));
 
                 if (m_aWindowSize > m_fftSize) {
                     m_afilter->cut(cd.accumulator);
                 }
 
-                cutShiftAndFold(tmp, m_fftSize, cd.accumulator, m_awindow);
+                cutShiftAndFold(optionalFoldBuffer.data(), m_fftSize,
-                v_copy(cd.accumulator, tmp, m_fftSize);
+                                cd.accumulator, m_awindow);
+                v_copy(cd.accumulator, optionalFoldBuffer.data(), m_fftSize);
             }
 
             m_studyFFT->forwardMagnitude(cd.accumulator, cd.fltbuf);
@@ -1058,8 +1063,6 @@ R2Stretcher::study(const float *const *input, size_t samples, bool final)
             float df = m_phaseResetAudioCurve->processFloat(cd.fltbuf, m_increment);
             m_phaseResetDf.push_back(df);
 
-//            cout << m_phaseResetDf.size() << " [" << final << "] -> " << df << " \t: ";
-
             df = m_silentAudioCurve->processFloat(cd.fltbuf, m_increment);
             bool silent = (df > 0.f);
             if (silent) {
@@ -1067,8 +1070,6 @@ R2Stretcher::study(const float *const *input, size_t samples, bool final)
             }
             m_silence.push_back(silent);
 
-//            cout << df << endl;
-
             // We have augmented the input by m_aWindowSize/2 so that
             // the first chunk is centred on the first audio sample.
             // We want to ensure that m_inputDuration contains the

src/faster/StretcherProcess.cpp

@@ -236,6 +236,9 @@ R2Stretcher::consumeChannel(size_t c,
 
         inbuf.write(cd.resamplebuf, toWrite);
         cd.inCount += samples;
+
+        m_log.log(2, "consumeChannel: wrote to inbuf from resamplebuf, inCount now", toWrite, cd.inCount);
+        
         return samples;
 
     } else {
@@ -249,6 +252,9 @@ R2Stretcher::consumeChannel(size_t c,
 
         inbuf.write(input, toWrite);
         cd.inCount += toWrite;
+
+        m_log.log(2, "consumeChannel: wrote to inbuf from input, inCount now", toWrite, cd.inCount);
+        
         return toWrite;
     }
 }
@@ -340,7 +346,7 @@ R2Stretcher::processOneChunk()
             return false;
         }
         ChannelData &cd = *m_channelData[c];
-        m_log.log(3, "read space and draining", cd.inbuf->getReadSpace(), cd.draining);
+        m_log.log(2, "read space and draining", cd.inbuf->getReadSpace(), cd.draining);
         if (!cd.draining) {
             size_t ready = cd.inbuf->getReadSpace();
             assert(ready >= m_aWindowSize || cd.inputSize >= 0);

src/test/TestStretcher.cpp

@@ -1516,4 +1516,32 @@ BOOST_AUTO_TEST_CASE(with_resets_2x_5up_realtime_faster)
     with_resets(RubberBandStretcher::OptionProcessRealTime | RubberBandStretcher::OptionEngineFaster, 2.0, 1.5);
 }
 
+BOOST_AUTO_TEST_CASE(long_blocksize_with_smoothing)
+{
+    // Test added because the smoothing option was calling alloca in a
+    // loop, which could run us out of stack. This test is best used
+    // with a small stack artificially enforced via e.g. ulimit -s 32
+    
+    int n = 10000;
+    float freq = 440.f;
+    int rate = 44100;
+    RubberBandStretcher stretcher
+        (rate, 1,
+         RubberBandStretcher::OptionEngineFaster |
+         RubberBandStretcher::OptionProcessOffline |
+         RubberBandStretcher::OptionSmoothingOn);
+    
+    vector<float> in(n);
+    for (int i = 0; i < n; ++i) {
+        in[i] = sinf(float(i) * freq * M_PI * 2.f / float(rate));
+    }
+    float *inp = in.data();
+
+    stretcher.setMaxProcessSize(n);
+    stretcher.setExpectedInputDuration(n);
+
+    stretcher.study(&inp, n, true);
+    stretcher.process(&inp, n, true);
+}
+
 BOOST_AUTO_TEST_SUITE_END()