Mercurial > hg > silvet

changeset 145:450f9987f041

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update CQ implementation following inverse-CQ merge
author Chris Cannam
date Tue, 13 May 2014 14:34:04 +0100
parents 5e9ad8b2d9b1
children ea547a2557f3
files .hgsubstate Makefile.inc src/Silvet.cpp src/Silvet.h
diffstat 4 files changed, 31 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Thu May 08 18:12:14 2014 +0100
+++ b/.hgsubstate	Tue May 13 14:34:04 2014 +0100
@@ -1,3 +1,3 @@
 a2621605a8c2119bb063c59e83f4fe792a58e4ac bqvec
-4cb16296f14156f59bc6c716fb67767f53d67028 constant-q-cpp
-783fb5f0e626d9bf2b3ad53d84187dadbdb8f56e qm-dsp
+d1f9b3fd4003ce399993b4f198a9bc0b22eb2969 constant-q-cpp
+6a634a9081a816c49a64a4ac0c7e199ba05a44e3 qm-dsp
--- a/Makefile.inc	Thu May 08 18:12:14 2014 +0100
+++ b/Makefile.inc	Tue May 13 14:34:04 2014 +0100
@@ -23,8 +23,8 @@
 PLUGIN_HEADERS := $(SRC_DIR)/Silvet.h $(SRC_DIR)/EM.h
 PLUGIN_SOURCES := $(SRC_DIR)/Silvet.cpp $(SRC_DIR)/EM.cpp $(SRC_DIR)/libmain.cpp
 
-CQ_HEADERS   := $(CQ_DIR)/CQKernel.h $(CQ_DIR)/ConstantQ.h $(CQ_DIR)/CQInterpolated.h
-CQ_SOURCES   := $(CQ_DIR)/CQKernel.cpp $(CQ_DIR)/ConstantQ.cpp $(CQ_DIR)/CQInterpolated.cpp
+CQ_HEADERS   := $(CQ_DIR)/CQKernel.h $(CQ_DIR)/ConstantQ.h $(CQ_DIR)/CQSpectrogram.h
+CQ_SOURCES   := $(CQ_DIR)/CQKernel.cpp $(CQ_DIR)/ConstantQ.cpp $(CQ_DIR)/CQSpectrogram.cpp
 
 BQVEC_HEADERS	:= $(BQVEC_DIR)/Allocators.h $(BQVEC_DIR)/Restrict.h $(BQVEC_DIR)/VectorOps.h
 BQVEC_SOURCES	:= $(BQVEC_DIR)/Allocators.cpp
@@ -56,9 +56,6 @@
 # DO NOT DELETE
 
 src/Silvet.o: src/Silvet.h src/EM.h
-src/Silvet.o: constant-q-cpp/cpp-qm-dsp/CQInterpolated.h
-src/Silvet.o: constant-q-cpp/cpp-qm-dsp/ConstantQ.h
-src/Silvet.o: constant-q-cpp/cpp-qm-dsp/CQKernel.h
 src/EM.o: src/EM.h data/include/templates.h data/include/bassoon.h
 src/EM.o: data/include/cello.h data/include/clarinet.h data/include/flute.h
 src/EM.o: data/include/guitar.h data/include/horn.h data/include/oboe.h
@@ -67,14 +64,30 @@
 src/libmain.o: src/Silvet.h
 constant-q-cpp/cpp-qm-dsp/CQKernel.o: constant-q-cpp/cpp-qm-dsp/CQKernel.h
 constant-q-cpp/cpp-qm-dsp/ConstantQ.o: constant-q-cpp/cpp-qm-dsp/ConstantQ.h
+constant-q-cpp/cpp-qm-dsp/ConstantQ.o: constant-q-cpp/cpp-qm-dsp/CQBase.h
 constant-q-cpp/cpp-qm-dsp/ConstantQ.o: constant-q-cpp/cpp-qm-dsp/CQKernel.h
-constant-q-cpp/cpp-qm-dsp/CQInterpolated.o: constant-q-cpp/cpp-qm-dsp/CQInterpolated.h
-constant-q-cpp/cpp-qm-dsp/CQInterpolated.o: constant-q-cpp/cpp-qm-dsp/ConstantQ.h
-constant-q-cpp/cpp-qm-dsp/CQInterpolated.o: constant-q-cpp/cpp-qm-dsp/CQKernel.h
+constant-q-cpp/cpp-qm-dsp/CQSpectrogram.o: constant-q-cpp/cpp-qm-dsp/CQSpectrogram.h
+constant-q-cpp/cpp-qm-dsp/CQSpectrogram.o: constant-q-cpp/cpp-qm-dsp/ConstantQ.h
+constant-q-cpp/cpp-qm-dsp/CQSpectrogram.o: constant-q-cpp/cpp-qm-dsp/CQBase.h
+constant-q-cpp/cpp-qm-dsp/CQSpectrogram.o: constant-q-cpp/cpp-qm-dsp/CQKernel.h
 bqvec/src/Allocators.o: bqvec/src/Allocators.h bqvec/src/VectorOps.h
 bqvec/src/Allocators.o: bqvec/src/Restrict.h
+qm-dsp/dsp/rateconversion/Resampler.o: qm-dsp/dsp/rateconversion/Resampler.h
+qm-dsp/base/KaiserWindow.o: qm-dsp/base/KaiserWindow.h
+qm-dsp/base/SincWindow.o: qm-dsp/base/SincWindow.h
+qm-dsp/thread/Thread.o: qm-dsp/thread/Thread.h
+qm-dsp/dsp/transforms/FFT.o: qm-dsp/dsp/transforms/FFT.h
+qm-dsp/maths/MathUtilities.o: qm-dsp/maths/MathUtilities.h
+qm-dsp/maths/MathUtilities.o: qm-dsp/maths/nan-inf.h
+qm-dsp/ext/kissfft/kiss_fft.o: qm-dsp/ext/kissfft/_kiss_fft_guts.h
+qm-dsp/ext/kissfft/kiss_fft.o: qm-dsp/ext/kissfft/kiss_fft.h
+qm-dsp/ext/kissfft/tools/kiss_fftr.o: qm-dsp/ext/kissfft/tools/kiss_fftr.h
+qm-dsp/ext/kissfft/tools/kiss_fftr.o: qm-dsp/ext/kissfft/kiss_fft.h
+qm-dsp/ext/kissfft/tools/kiss_fftr.o: qm-dsp/ext/kissfft/_kiss_fft_guts.h
+constant-q-cpp/cpp-qm-dsp/ConstantQ.o: constant-q-cpp/cpp-qm-dsp/CQBase.h
 constant-q-cpp/cpp-qm-dsp/ConstantQ.o: constant-q-cpp/cpp-qm-dsp/CQKernel.h
-constant-q-cpp/cpp-qm-dsp/CQInterpolated.o: constant-q-cpp/cpp-qm-dsp/ConstantQ.h
-constant-q-cpp/cpp-qm-dsp/CQInterpolated.o: constant-q-cpp/cpp-qm-dsp/CQKernel.h
+constant-q-cpp/cpp-qm-dsp/CQSpectrogram.o: constant-q-cpp/cpp-qm-dsp/ConstantQ.h
+constant-q-cpp/cpp-qm-dsp/CQSpectrogram.o: constant-q-cpp/cpp-qm-dsp/CQBase.h
+constant-q-cpp/cpp-qm-dsp/CQSpectrogram.o: constant-q-cpp/cpp-qm-dsp/CQKernel.h
 bqvec/src/Allocators.o: bqvec/src/VectorOps.h bqvec/src/Restrict.h
 bqvec/src/VectorOps.o: bqvec/src/Restrict.h
--- a/src/Silvet.cpp	Thu May 08 18:12:14 2014 +0100
+++ b/src/Silvet.cpp	Tue May 13 14:34:04 2014 +0100
@@ -20,7 +20,7 @@
 #include "maths/MathUtilities.h"
 #include "dsp/rateconversion/Resampler.h"
 
-#include "constant-q-cpp/cpp-qm-dsp/CQInterpolated.h"
+#include "constant-q-cpp/cpp-qm-dsp/CQSpectrogram.h"
 
 #include <vector>
 
@@ -326,9 +326,9 @@
 	m_resampler = 0;
     }
 
-    m_cq = new CQInterpolated
+    m_cq = new CQSpectrogram
 	(processingSampleRate, 27.5, processingSampleRate / 3, processingBPO,
-         CQInterpolated::Linear);
+         CQSpectrogram::InterpolateLinear);
 
     for (int i = 0; i < (int)m_postFilter.size(); ++i) {
         delete m_postFilter[i];
@@ -376,7 +376,7 @@
 Silvet::FeatureSet
 Silvet::getRemainingFeatures()
 {
-    Grid cqout = m_cq->getRemainingBlocks();
+    Grid cqout = m_cq->getRemainingOutput();
     FeatureSet fs = transcribe(cqout);
 
     for (int i = 0; i < (int)cqout.size(); ++i) {
--- a/src/Silvet.h	Thu May 08 18:12:14 2014 +0100
+++ b/src/Silvet.h	Tue May 13 14:34:04 2014 +0100
@@ -30,7 +30,7 @@
 using std::map;
 
 class Resampler;
-class CQInterpolated;
+class CQSpectrogram;
 
 class Silvet : public Vamp::Plugin
 {
@@ -71,7 +71,7 @@
 
 protected:
     Resampler *m_resampler;
-    CQInterpolated *m_cq;
+    CQSpectrogram *m_cq;
 
     bool m_hqMode;