Further build updates

otherbuilds/Android.mk

@@ -11,52 +11,39 @@ RUBBERBAND_JNI_FILES := \
 	$(RUBBERBAND_SRC_PATH)/jni/RubberBandStretcherJNI.cpp
 
 RUBBERBAND_SRC_FILES := \
-        $(RUBBERBAND_SRC_PATH)/base/Profiler.cpp \
-        $(RUBBERBAND_SRC_PATH)/system/Thread.cpp \
-        $(RUBBERBAND_SRC_PATH)/system/Allocators.cpp \
-        $(RUBBERBAND_SRC_PATH)/system/sysutils.cpp \
-        $(RUBBERBAND_SRC_PATH)/system/VectorOpsComplex.cpp \
-        $(RUBBERBAND_SRC_PATH)/StretcherChannelData.cpp \
-        $(RUBBERBAND_SRC_PATH)/dsp/AudioCurveCalculator.cpp \
-        $(RUBBERBAND_SRC_PATH)/dsp/FFT.cpp \
-        $(RUBBERBAND_SRC_PATH)/dsp/Resampler.cpp \
-        $(RUBBERBAND_SRC_PATH)/audiocurves/SilentAudioCurve.cpp \
-        $(RUBBERBAND_SRC_PATH)/audiocurves/CompoundAudioCurve.cpp \
-        $(RUBBERBAND_SRC_PATH)/audiocurves/HighFrequencyAudioCurve.cpp \
-        $(RUBBERBAND_SRC_PATH)/audiocurves/SpectralDifferenceAudioCurve.cpp \
-        $(RUBBERBAND_SRC_PATH)/audiocurves/ConstantAudioCurve.cpp \
-        $(RUBBERBAND_SRC_PATH)/audiocurves/PercussiveAudioCurve.cpp \
-        $(RUBBERBAND_SRC_PATH)/StretcherImpl.cpp \
-        $(RUBBERBAND_SRC_PATH)/StretcherProcess.cpp \
-        $(RUBBERBAND_SRC_PATH)/StretchCalculator.cpp \
-        $(RUBBERBAND_SRC_PATH)/RubberBandStretcher.cpp \
 	$(RUBBERBAND_SRC_PATH)/rubberband-c.cpp \
-        $(RUBBERBAND_SRC_PATH)/speex/resample.c
+	$(RUBBERBAND_SRC_PATH)/RubberBandStretcher.cpp \
+	$(RUBBERBAND_SRC_PATH)/faster/AudioCurveCalculator.cpp \
+	$(RUBBERBAND_SRC_PATH)/faster/CompoundAudioCurve.cpp \
+	$(RUBBERBAND_SRC_PATH)/faster/HighFrequencyAudioCurve.cpp \
+	$(RUBBERBAND_SRC_PATH)/faster/SilentAudioCurve.cpp \
+	$(RUBBERBAND_SRC_PATH)/faster/PercussiveAudioCurve.cpp \
+	$(RUBBERBAND_SRC_PATH)/faster/StretcherChannelData.cpp \
+	$(RUBBERBAND_SRC_PATH)/faster/StretcherImpl.cpp \
+	$(RUBBERBAND_SRC_PATH)/faster/StretcherProcess.cpp \
+	$(RUBBERBAND_SRC_PATH)/common/BQResampler.cpp \
+	$(RUBBERBAND_SRC_PATH)/common/Profiler.cpp \
+	$(RUBBERBAND_SRC_PATH)/common/Resampler.cpp \
+	$(RUBBERBAND_SRC_PATH)/common/FFT.cpp \
+	$(RUBBERBAND_SRC_PATH)/common/Allocators.cpp \
+	$(RUBBERBAND_SRC_PATH)/common/StretchCalculator.cpp \
+	$(RUBBERBAND_SRC_PATH)/common/sysutils.cpp \
+	$(RUBBERBAND_SRC_PATH)/common/Thread.cpp \
+	$(RUBBERBAND_SRC_PATH)/finer/R3StretcherImpl.cpp 
 
 LOCAL_SRC_FILES += \
 	$(RUBBERBAND_JNI_FILES) \
         $(RUBBERBAND_SRC_FILES)
 
-LOCAL_SRC_FILES += \
-	$(RUBBERBAND_SRC_PATH)/kissfft/kiss_fft.c \
-	$(RUBBERBAND_SRC_PATH)/kissfft/kiss_fftr.c
-
 LOCAL_CFLAGS_DEBUG := \
 	-g \
-	-mfloat-abi=softfp \
 	-DWANT_TIMING \
 	-DFFT_MEASUREMENT
 
 LOCAL_CFLAGS_RELEASE := \
 	-O3 \
-	-mfpu=neon \
-	-mfloat-abi=softfp \
 	-ffast-math \
 	-ftree-vectorize \
-	-freciprocal-math \
-	-fsingle-precision-constant \
-	-D__ARM_ARCH_7__ \
-	-DUSE_POMMIER_MATHFUN \
 	-DNO_TIMING \
 	-DNO_TIMING_COMPLETE_NOOP
 
@@ -64,9 +51,8 @@ LOCAL_CFLAGS := \
 	-Wall \
 	-I$(RUBBERBAND_PATH) \
 	-I$(RUBBERBAND_SRC_PATH) \
-	-DUSE_SPEEX \
+	-DUSE_BQRESAMPLER \
-	-DUSE_KISSFFT \
+	-DUSE_BUILTIN_FFT \
-	-DPROCESS_SAMPLE_TYPE=float \
 	-DLACK_POSIX_MEMALIGN \
 	-DUSE_OWN_ALIGNED_MALLOC \
 	-DLACK_SINCOS \

otherbuilds/Makefile.ios

@@ -47,6 +47,7 @@ LIBRARY_SOURCES := \
 	src/faster/StretcherChannelData.cpp \
 	src/faster/StretcherImpl.cpp \
 	src/faster/StretcherProcess.cpp \
+	src/common/BQResampler.cpp \
 	src/common/Profiler.cpp \
 	src/common/Resampler.cpp \
 	src/common/FFT.cpp \

otherbuilds/Makefile.linux

@@ -36,6 +36,7 @@ LIBRARY_SOURCES := \
 	src/faster/StretcherChannelData.cpp \
 	src/faster/StretcherImpl.cpp \
 	src/faster/StretcherProcess.cpp \
+	src/common/BQResampler.cpp \
 	src/common/Profiler.cpp \
 	src/common/Resampler.cpp \
 	src/common/FFT.cpp \

otherbuilds/Makefile.macos

@@ -36,6 +36,7 @@ LIBRARY_SOURCES := \
 	src/faster/StretcherChannelData.cpp \
 	src/faster/StretcherImpl.cpp \
 	src/faster/StretcherProcess.cpp \
+	src/common/BQResampler.cpp \
 	src/common/Profiler.cpp \
 	src/common/Resampler.cpp \
 	src/common/FFT.cpp \

otherbuilds/Makefile.macos-universal

@@ -36,6 +36,7 @@ LIBRARY_SOURCES := \
 	src/faster/StretcherChannelData.cpp \
 	src/faster/StretcherImpl.cpp \
 	src/faster/StretcherProcess.cpp \
+	src/common/BQResampler.cpp \
 	src/common/Profiler.cpp \
 	src/common/Resampler.cpp \
 	src/common/FFT.cpp \

otherbuilds/check.sh

@@ -5,17 +5,17 @@ if [ ! -d /Applications ]; then
     # Assumed to be Linux
 
     echo " *** Building static library using Linux-specific Makefile"
-#    make -f otherbuilds/Makefile.linux clean
+    make -f otherbuilds/Makefile.linux clean
     make -f otherbuilds/Makefile.linux
     
     echo " *** Linking against static library"
-    g++ main/main.cpp lib/librubberband.a -I. -Isrc -o test -lsndfile -lsamplerate -lpthread
+    g++ main/main.cpp lib/librubberband.a -I. -Isrc -o test -lsndfile -lpthread
     
     echo " *** Running build from Linux-specific Makefile"
     ./test -V
     
     echo " *** Building with single-file source"
-    g++ main/main.cpp single/RubberBandSingle.cpp -o test_single -lsndfile
+    g++ -O3 main/main.cpp single/RubberBandSingle.cpp -o test_single -lsndfile
     
     echo " *** Running build from single-file source"
     ./test_single -V
@@ -29,13 +29,13 @@ else
     make -f otherbuilds/Makefile.macos
 
     echo " *** Linking against static library"
-    c++ main/main.cpp lib/librubberband.a -I. -Isrc -o test -lsndfile -lsamplerate -framework Accelerate
+    c++ main/main.cpp lib/librubberband.a -I. -Isrc -o test -lsndfile -framework Accelerate
     
     echo " *** Running build from macOS-specific Makefile"
     ./test -V
 
     echo " *** Building with single-file source"
-c++ main/main.cpp single/RubberBandSingle.cpp -o test_single -lsndfile -framework Accelerate
+    c++ -O3 main/main.cpp single/RubberBandSingle.cpp -o test_single -lsndfile -framework Accelerate
 
     echo " *** Running build from single-file source"
     ./test_single -V