Mercurial > hg > qm-dsp

annotate build/osx/qm-dsp.pro @ 298:255e431ae3d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Key detector: when returning key strengths, use the peak value of the three underlying chromagram correlations (from 36-bin chromagram) corresponding to each key, instead of the mean. Rationale: This is the same method as used when returning the key value, and it's nice to have the same results in both returned value and plot. The peak performed better than the sum with a simple test set of triads, so it seems reasonable to change the plot to match the key output rather than the other way around. * FFT: kiss_fftr returns only the non-conjugate bins, synthesise the rest rather than leaving them (perhaps dangerously) undefined. Fixes an uninitialised data error in chromagram that could cause garbage results from key detector. * Constant Q: remove precalculated values again, I reckon they're not proving such a good tradeoff.
author Chris Cannam <c.cannam@qmul.ac.uk>
date Fri, 05 Jun 2009 15:12:39 +0000
parents a6789852abf2
children
rev   line source
c@260 1 QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
c@260 2 TEMPLATE = lib
c@260 3 CONFIG += release warn_on staticlib x86 ppc
c@260 4 CONFIG -= qt
c@260 5 OBJECTS_DIR = tmp_obj
c@260 6 MOC_DIR = tmp_moc
c@260 7 QMAKE_CXXFLAGS_RELEASE += -O2 -g0
c@260 8
c@260 9 linux-g++:QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -O3 -march=pentium4 -msse -msse2
c@260 10
c@260 11 #DEPENDPATH += base \
c@260 12 # dsp/chromagram \
c@260 13 # dsp/keydetection \
c@260 14 # dsp/maths \
c@260 15 # dsp/onsets \
c@260 16 # dsp/phasevocoder \
c@260 17 # dsp/rateconversion \
c@260 18 # dsp/signalconditioning \
c@260 19 # dsp/tempotracking \
c@260 20 # dsp/tonal \
c@260 21 # dsp/transforms
c@260 22 INCLUDEPATH += . include
c@260 23
c@260 24 # Input
c@260 25 HEADERS += base/Pitch.h \
c@260 26 base/Window.h \
c@260 27 dsp/chromagram/Chromagram.h \
c@260 28 dsp/chromagram/ChromaProcess.h \
c@260 29 dsp/chromagram/ConstantQ.h \
c@260 30 dsp/keydetection/GetKeyMode.h \
c@260 31 dsp/mfcc/MFCC.h \
c@260 32 dsp/onsets/DetectionFunction.h \
c@260 33 dsp/onsets/PeakPicking.h \
c@260 34 dsp/phasevocoder/PhaseVocoder.h \
c@260 35 dsp/rateconversion/Decimator.h \
c@260 36 dsp/rhythm/BeatSpectrum.h \
c@260 37 dsp/segmentation/cluster_melt.h \
c@260 38 dsp/segmentation/ClusterMeltSegmenter.h \
c@260 39 dsp/segmentation/cluster_segmenter.h \
c@260 40 dsp/segmentation/SavedFeatureSegmenter.h \
c@260 41 dsp/segmentation/Segmenter.h \
c@260 42 dsp/segmentation/segment.h \
c@260 43 dsp/signalconditioning/DFProcess.h \
c@260 44 dsp/signalconditioning/Filter.h \
c@260 45 dsp/signalconditioning/FiltFilt.h \
c@260 46 dsp/signalconditioning/Framer.h \
c@260 47 dsp/tempotracking/TempoTrack.h \
c@260 48 dsp/tonal/ChangeDetectionFunction.h \
c@260 49 dsp/tonal/TCSgram.h \
c@260 50 dsp/tonal/TonalEstimator.h \
c@260 51 dsp/transforms/FFT.h \
c@260 52 hmm/hmm.h \
c@260 53 maths/Correlation.h \
c@260 54 maths/CosineDistance.h \
c@260 55 maths/Histogram.h \
c@260 56 maths/KLDivergence.h \
c@260 57 maths/MathAliases.h \
c@260 58 maths/MathUtilities.h \
c@260 59 maths/Polyfit.h \
c@260 60 maths/pca/pca.h
c@260 61 SOURCES += base/Pitch.cpp \
c@260 62 dsp/chromagram/Chromagram.cpp \
c@260 63 dsp/chromagram/ChromaProcess.cpp \
c@260 64 dsp/chromagram/ConstantQ.cpp \
c@260 65 dsp/keydetection/GetKeyMode.cpp \
c@260 66 dsp/mfcc/MFCC.cpp \
c@260 67 dsp/onsets/DetectionFunction.cpp \
c@260 68 dsp/onsets/PeakPicking.cpp \
c@260 69 dsp/phasevocoder/PhaseVocoder.cpp \
c@260 70 dsp/rateconversion/Decimator.cpp \
c@260 71 dsp/rhythm/BeatSpectrum.cpp \
c@260 72 dsp/segmentation/cluster_melt.c \
c@260 73 dsp/segmentation/ClusterMeltSegmenter.cpp \
c@260 74 dsp/segmentation/cluster_segmenter.c \
c@260 75 dsp/segmentation/SavedFeatureSegmenter.cpp \
c@260 76 dsp/segmentation/Segmenter.cpp \
c@260 77 dsp/signalconditioning/DFProcess.cpp \
c@260 78 dsp/signalconditioning/Filter.cpp \
c@260 79 dsp/signalconditioning/FiltFilt.cpp \
c@260 80 dsp/signalconditioning/Framer.cpp \
c@260 81 dsp/tempotracking/TempoTrack.cpp \
c@260 82 dsp/tonal/ChangeDetectionFunction.cpp \
c@260 83 dsp/tonal/TCSgram.cpp \
c@260 84 dsp/tonal/TonalEstimator.cpp \
c@260 85 dsp/transforms/FFT.cpp \
c@260 86 hmm/hmm.c \
c@260 87 maths/Correlation.cpp \
c@260 88 maths/CosineDistance.cpp \
c@260 89 maths/KLDivergence.cpp \
c@260 90 maths/MathUtilities.cpp \
c@260 91 maths/pca/pca.c