Update from personal repository.
* Added an initial "formant preservation" option when pitch shifting * Real-time pitch shifting now uses a faster method by default, with less variation in CPU usage * The code is more amenable to compiler auto-vectorization (through e.g. gcc --ftree-vectorize).
This commit is contained in:
Chris Cannam
134
Makefile.in
134
Makefile.in
@@ -1,6 +1,7 @@
|
||||
|
||||
CXX := @CXX@
|
||||
CXXFLAGS := -DFFTW_DOUBLE_ONLY @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @Vamp_CFLAGS@ -Irubberband -Isrc $(OPTFLAGS)
|
||||
CXXFLAGS := -DHAVE_FFTW3 -DFFTW_DOUBLE_ONLY -DNO_THREAD_CHECKS @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @Vamp_CFLAGS@ -Irubberband -Isrc $(OPTFLAGS)
|
||||
CFLAGS := @CFLAGS@ $(OPTFLAGS)
|
||||
LDFLAGS := @LDFLAGS@ -lpthread $(LDFLAGS)
|
||||
|
||||
LIBRARY_LIBS := @SRC_LIBS@ @FFTW_LIBS@
|
||||
@@ -29,6 +30,13 @@ INSTALL_PKGDIR := @prefix@/lib/pkgconfig
|
||||
|
||||
all: bin lib $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET)
|
||||
|
||||
static: $(STATIC_TARGET)
|
||||
dynamic: $(DYNAMIC_TARGET)
|
||||
library: $(STATIC_TARGET) $(DYNAMIC_TARGET)
|
||||
program: $(PROGRAM_TARGET)
|
||||
vamp: $(VAMP_TARGET)
|
||||
ladspa: $(LADSPA_TARGET)
|
||||
|
||||
PUBLIC_INCLUDES := \
|
||||
rubberband/TimeStretcher.h \
|
||||
rubberband/RubberBandStretcher.h
|
||||
@@ -39,6 +47,7 @@ LIBRARY_INCLUDES := \
|
||||
src/FFT.h \
|
||||
src/HighFrequencyAudioCurve.h \
|
||||
src/PercussiveAudioCurve.h \
|
||||
src/Profiler.h \
|
||||
src/Resampler.h \
|
||||
src/RingBuffer.h \
|
||||
src/Scavenger.h \
|
||||
@@ -51,19 +60,21 @@ LIBRARY_INCLUDES := \
|
||||
src/sysutils.h
|
||||
|
||||
LIBRARY_SOURCES := \
|
||||
src/RubberBandStretcher.cpp \
|
||||
src/AudioCurve.cpp \
|
||||
src/ConstantAudioCurve.cpp \
|
||||
src/FFT.cpp \
|
||||
src/HighFrequencyAudioCurve.cpp \
|
||||
src/PercussiveAudioCurve.cpp \
|
||||
src/AudioCurve.cpp \
|
||||
src/Profiler.cpp \
|
||||
src/Resampler.cpp \
|
||||
src/RubberBandStretcher.cpp \
|
||||
src/SpectralDifferenceAudioCurve.cpp \
|
||||
src/StretchCalculator.cpp \
|
||||
src/StretcherImpl.cpp \
|
||||
src/StretcherProcess.cpp \
|
||||
src/StretcherChannelData.cpp \
|
||||
src/FFT.cpp \
|
||||
src/Thread.cpp \
|
||||
src/Window.cpp \
|
||||
src/sysutils.cpp
|
||||
|
||||
PROGRAM_SOURCES := \
|
||||
@@ -84,6 +95,8 @@ LADSPA_SOURCES := \
|
||||
src/ladspa/libmain.cpp
|
||||
|
||||
LIBRARY_OBJECTS := $(LIBRARY_SOURCES:.cpp=.o)
|
||||
LIBRARY_OBJECTS := $(LIBRARY_OBJECTS:.c=.o)
|
||||
|
||||
PROGRAM_OBJECTS := $(PROGRAM_SOURCES:.cpp=.o)
|
||||
VAMP_OBJECTS := $(VAMP_SOURCES:.cpp=.o)
|
||||
LADSPA_OBJECTS := $(LADSPA_SOURCES:.cpp=.o)
|
||||
@@ -134,57 +147,94 @@ distclean: clean
|
||||
|
||||
# DO NOT DELETE
|
||||
|
||||
src/AudioCurve.o: src/AudioCurve.h
|
||||
src/AudioCurve.o: src/AudioCurve.h src/sysutils.h
|
||||
src/ConstantAudioCurve.o: src/ConstantAudioCurve.h src/AudioCurve.h
|
||||
src/FFT.o: src/FFT.h src/Thread.h
|
||||
src/ConstantAudioCurve.o: src/sysutils.h
|
||||
src/FFT.o: src/FFT.h src/sysutils.h src/Thread.h src/Profiler.h
|
||||
src/HighFrequencyAudioCurve.o: src/HighFrequencyAudioCurve.h src/AudioCurve.h
|
||||
src/HighFrequencyAudioCurve.o: src/Window.h
|
||||
src/main.o: src/sysutils.h
|
||||
src/HighFrequencyAudioCurve.o: src/sysutils.h src/Window.h
|
||||
src/main.o: rubberband/RubberBandStretcher.h rubberband/TimeStretcher.h
|
||||
src/main.o: src/sysutils.h src/Profiler.h
|
||||
src/PercussiveAudioCurve.o: src/PercussiveAudioCurve.h src/AudioCurve.h
|
||||
src/Resampler.o: src/Resampler.h
|
||||
src/RubberBandStretcher.o: src/StretcherImpl.h src/Window.h src/Thread.h
|
||||
src/RubberBandStretcher.o: src/RingBuffer.h src/Scavenger.h src/sysutils.h
|
||||
src/RubberBandStretcher.o: src/FFT.h
|
||||
src/PercussiveAudioCurve.o: src/sysutils.h
|
||||
src/Profiler.o: src/Profiler.h src/sysutils.h
|
||||
src/Resampler.o: src/Resampler.h src/sysutils.h src/Profiler.h
|
||||
src/RingBuffer.o: src/RingBuffer.h src/Scavenger.h src/Thread.h
|
||||
src/RingBuffer.o: src/sysutils.h src/Profiler.h
|
||||
src/RubberBandStretcher.o: src/StretcherImpl.h
|
||||
src/RubberBandStretcher.o: rubberband/RubberBandStretcher.h
|
||||
src/RubberBandStretcher.o: rubberband/TimeStretcher.h src/Window.h
|
||||
src/RubberBandStretcher.o: src/sysutils.h src/Thread.h src/RingBuffer.h
|
||||
src/RubberBandStretcher.o: src/Scavenger.h src/Profiler.h src/FFT.h
|
||||
src/SpectralDifferenceAudioCurve.o: src/SpectralDifferenceAudioCurve.h
|
||||
src/SpectralDifferenceAudioCurve.o: src/AudioCurve.h src/Window.h
|
||||
src/StretchCalculator.o: src/StretchCalculator.h
|
||||
src/SpectralDifferenceAudioCurve.o: src/AudioCurve.h src/sysutils.h
|
||||
src/SpectralDifferenceAudioCurve.o: src/Window.h
|
||||
src/StretchCalculator.o: src/StretchCalculator.h src/sysutils.h
|
||||
src/StretcherChannelData.o: src/StretcherChannelData.h src/StretcherImpl.h
|
||||
src/StretcherChannelData.o: src/Window.h src/Thread.h src/RingBuffer.h
|
||||
src/StretcherChannelData.o: src/Scavenger.h src/sysutils.h src/FFT.h
|
||||
src/StretcherChannelData.o: rubberband/RubberBandStretcher.h
|
||||
src/StretcherChannelData.o: rubberband/TimeStretcher.h src/Window.h
|
||||
src/StretcherChannelData.o: src/sysutils.h src/Thread.h src/RingBuffer.h
|
||||
src/StretcherChannelData.o: src/Scavenger.h src/Profiler.h src/FFT.h
|
||||
src/StretcherChannelData.o: src/Resampler.h
|
||||
src/StretcherImpl.o: src/StretcherImpl.h src/Window.h src/Thread.h
|
||||
src/StretcherImpl.o: src/RingBuffer.h src/Scavenger.h src/sysutils.h
|
||||
src/StretcherImpl.o: src/FFT.h src/PercussiveAudioCurve.h src/AudioCurve.h
|
||||
src/StretcherImpl.o: src/HighFrequencyAudioCurve.h
|
||||
src/StretcherImpl.o: src/StretcherImpl.h rubberband/RubberBandStretcher.h
|
||||
src/StretcherImpl.o: rubberband/TimeStretcher.h src/Window.h src/sysutils.h
|
||||
src/StretcherImpl.o: src/Thread.h src/RingBuffer.h src/Scavenger.h
|
||||
src/StretcherImpl.o: src/Profiler.h src/FFT.h src/PercussiveAudioCurve.h
|
||||
src/StretcherImpl.o: src/AudioCurve.h src/HighFrequencyAudioCurve.h
|
||||
src/StretcherImpl.o: src/SpectralDifferenceAudioCurve.h
|
||||
src/StretcherImpl.o: src/ConstantAudioCurve.h src/StretchCalculator.h
|
||||
src/StretcherImpl.o: src/StretcherChannelData.h src/Resampler.h
|
||||
src/StretcherProcess.o: src/StretcherImpl.h src/Window.h src/Thread.h
|
||||
src/StretcherProcess.o: src/RingBuffer.h src/Scavenger.h src/sysutils.h
|
||||
src/StretcherProcess.o: src/FFT.h src/PercussiveAudioCurve.h src/AudioCurve.h
|
||||
src/StretcherProcess.o: src/StretcherImpl.h rubberband/RubberBandStretcher.h
|
||||
src/StretcherProcess.o: rubberband/TimeStretcher.h src/Window.h
|
||||
src/StretcherProcess.o: src/sysutils.h src/Thread.h src/RingBuffer.h
|
||||
src/StretcherProcess.o: src/Scavenger.h src/Profiler.h src/FFT.h
|
||||
src/StretcherProcess.o: src/PercussiveAudioCurve.h src/AudioCurve.h
|
||||
src/StretcherProcess.o: src/HighFrequencyAudioCurve.h
|
||||
src/StretcherProcess.o: src/ConstantAudioCurve.h src/StretchCalculator.h
|
||||
src/StretcherProcess.o: src/StretcherChannelData.h src/Resampler.h
|
||||
src/sysutils.o: src/sysutils.h
|
||||
src/Thread.o: src/Thread.h
|
||||
src/ConstantAudioCurve.o: src/AudioCurve.h
|
||||
src/HighFrequencyAudioCurve.o: src/AudioCurve.h src/Window.h
|
||||
src/PercussiveAudioCurve.o: src/AudioCurve.h
|
||||
src/RingBuffer.o: src/Scavenger.h src/Thread.h src/sysutils.h
|
||||
src/Window.o: src/Window.h src/sysutils.h
|
||||
rubberband/RubberBandStretcher.o: rubberband/TimeStretcher.h
|
||||
src/AudioCurve.o: src/sysutils.h
|
||||
src/ConstantAudioCurve.o: src/AudioCurve.h src/sysutils.h
|
||||
src/FFT.o: src/sysutils.h
|
||||
src/HighFrequencyAudioCurve.o: src/AudioCurve.h src/sysutils.h src/Window.h
|
||||
src/PercussiveAudioCurve.o: src/AudioCurve.h src/sysutils.h
|
||||
src/Profiler.o: src/sysutils.h
|
||||
src/Resampler.o: src/sysutils.h
|
||||
src/RingBuffer.o: src/Scavenger.h src/Thread.h src/sysutils.h src/Profiler.h
|
||||
src/Scavenger.o: src/Thread.h src/sysutils.h
|
||||
src/SpectralDifferenceAudioCurve.o: src/AudioCurve.h src/Window.h
|
||||
src/StretcherChannelData.o: src/StretcherImpl.h src/Window.h src/Thread.h
|
||||
src/StretcherChannelData.o: src/RingBuffer.h src/Scavenger.h src/sysutils.h
|
||||
src/StretcherChannelData.o: src/FFT.h
|
||||
src/StretcherImpl.o: src/Window.h src/Thread.h src/RingBuffer.h
|
||||
src/StretcherImpl.o: src/Scavenger.h src/sysutils.h src/FFT.h
|
||||
src/vamp/libmain.o: src/vamp/RubberBandVampPlugin.h
|
||||
src/vamp/RubberBandVampPlugin.o: src/vamp/RubberBandVampPlugin.h
|
||||
src/vamp/RubberBandVampPlugin.o: src/StretchCalculator.h
|
||||
src/ladspa/libmain.o: src/ladspa/RubberBandPitchShifter.h src/RingBuffer.h
|
||||
src/ladspa/libmain.o: src/Scavenger.h src/Thread.h src/sysutils.h
|
||||
src/SpectralDifferenceAudioCurve.o: src/AudioCurve.h src/sysutils.h
|
||||
src/SpectralDifferenceAudioCurve.o: src/Window.h
|
||||
src/StretcherChannelData.o: src/StretcherImpl.h
|
||||
src/StretcherChannelData.o: rubberband/RubberBandStretcher.h
|
||||
src/StretcherChannelData.o: rubberband/TimeStretcher.h src/Window.h
|
||||
src/StretcherChannelData.o: src/sysutils.h src/Thread.h src/RingBuffer.h
|
||||
src/StretcherChannelData.o: src/Scavenger.h src/Profiler.h src/FFT.h
|
||||
src/StretcherImpl.o: rubberband/RubberBandStretcher.h
|
||||
src/StretcherImpl.o: rubberband/TimeStretcher.h src/Window.h src/sysutils.h
|
||||
src/StretcherImpl.o: src/Thread.h src/RingBuffer.h src/Scavenger.h
|
||||
src/StretcherImpl.o: src/Profiler.h src/FFT.h
|
||||
src/Window.o: src/sysutils.h
|
||||
src/ladspa/libmain.o: src/ladspa/RubberBandPitchShifter.h
|
||||
src/ladspa/libmain.o: src/RingBuffer.h src/Scavenger.h src/Thread.h
|
||||
src/ladspa/libmain.o: src/sysutils.h src/Profiler.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/ladspa/RubberBandPitchShifter.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/RingBuffer.h src/Scavenger.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/Thread.h src/sysutils.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/RingBuffer.h src/Scavenger.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/Thread.h src/sysutils.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/RingBuffer.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/Scavenger.h src/Thread.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/sysutils.h src/Profiler.h
|
||||
src/ladspa/RubberBandPitchShifter.o: rubberband/RubberBandStretcher.h
|
||||
src/ladspa/RubberBandPitchShifter.o: rubberband/TimeStretcher.h
|
||||
src/vamp/libmain.o: src/vamp/RubberBandVampPlugin.h
|
||||
src/vamp/libmain.o: rubberband/RubberBandStretcher.h
|
||||
src/vamp/libmain.o: rubberband/TimeStretcher.h
|
||||
src/vamp/RubberBandVampPlugin.o: src/vamp/RubberBandVampPlugin.h
|
||||
src/vamp/RubberBandVampPlugin.o: rubberband/RubberBandStretcher.h
|
||||
src/vamp/RubberBandVampPlugin.o: rubberband/TimeStretcher.h
|
||||
src/vamp/RubberBandVampPlugin.o: src/StretchCalculator.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/RingBuffer.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/Scavenger.h src/Thread.h
|
||||
src/ladspa/RubberBandPitchShifter.o: src/sysutils.h src/Profiler.h
|
||||
src/vamp/RubberBandVampPlugin.o: rubberband/RubberBandStretcher.h
|
||||
src/vamp/RubberBandVampPlugin.o: rubberband/TimeStretcher.h
|
||||
|
||||
Reference in New Issue
Block a user