Mercurial > hg > qm-vamp-plugins

diff plugins/AdaptiveSpectrogram.h @ 156:93355d263f8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add decimation factor to adaptive spectrogram
author Chris Cannam <c.cannam@qmul.ac.uk>
date Thu, 30 Jan 2014 10:04:06 +0000
parents 38502a1595ff
children
line wrap: on
line diff
--- a/plugins/AdaptiveSpectrogram.h	Tue Dec 03 11:58:32 2013 +0000
+++ b/plugins/AdaptiveSpectrogram.h	Thu Jan 30 10:04:06 2014 +0000
@@ -22,9 +22,11 @@
 #include <dsp/transforms/FFT.h>
 #include <base/Window.h>
 
-#include "thread/Thread.h"
-#include "thread/AsynchronousTask.h"
-#include "thread/BlockAllocator.h"
+#include <thread/Thread.h>
+#include <thread/AsynchronousTask.h>
+#include <thread/BlockAllocator.h>
+
+class Decimator;
 
 class AdaptiveSpectrogram : public Vamp::Plugin
 {
@@ -63,6 +65,10 @@
     int m_n;
     bool m_coarse;
     bool m_threaded;
+    int m_decFactor;
+    float *m_buffer;
+    int m_buflen;
+    Decimator *m_decimator;
 
     struct Spectrogram
     {
@@ -286,7 +292,7 @@
     void assemble(const Spectrograms &, const Cutting *,
                   std::vector<std::vector<float> > &,
                   int x, int y, int w, int h) const;
-    };
+};
 
 
 #endif