changeset 155:529f42b50d81

Add DecimatorB (Butterworth filter, arbitrary powers of two)

--- a/build/general/Makefile.inc	Mon Oct 21 17:49:10 2013 +0100
+++ b/build/general/Makefile.inc	Tue Oct 22 08:58:28 2013 +0100
@@ -20,6 +20,7 @@
            dsp/onsets/PeakPicking.h \
            dsp/phasevocoder/PhaseVocoder.h \
            dsp/rateconversion/Decimator.h \
+           dsp/rateconversion/DecimatorB.h \
            dsp/rateconversion/Resampler.h \
            dsp/rhythm/BeatSpectrum.h \
            dsp/segmentation/cluster_melt.h \
@@ -64,6 +65,7 @@
            dsp/onsets/PeakPicking.cpp \
            dsp/phasevocoder/PhaseVocoder.cpp \
            dsp/rateconversion/Decimator.cpp \
+           dsp/rateconversion/DecimatorB.cpp \
            dsp/rateconversion/Resampler.cpp \
            dsp/rhythm/BeatSpectrum.cpp \
            dsp/segmentation/cluster_melt.c \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dsp/rateconversion/DecimatorB.cpp	Tue Oct 22 08:58:28 2013 +0100
@@ -0,0 +1,160 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    QM DSP Library
+
+    Centre for Digital Music, Queen Mary, University of London.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
+*/
+
+#include "DecimatorB.h"
+
+#include "maths/MathUtilities.h"
+
+#include <iostream>
+
+using std::vector;
+
+DecimatorB::DecimatorB(int inLength, int decFactor)
+{
+    m_inputLength = 0;
+    m_outputLength = 0;
+    m_decFactor = 1;
+    m_aaBuffer = 0;
+    m_tmpBuffer = 0;
+
+    initialise(inLength, decFactor);
+}
+
+DecimatorB::~DecimatorB()
+{
+    deInitialise();
+}
+
+void DecimatorB::initialise(int inLength, int decFactor)
+{
+    m_inputLength = inLength;
+    m_decFactor = decFactor;
+    m_outputLength = m_inputLength / m_decFactor;
+
+    if (m_decFactor < 2 || !MathUtilities::isPowerOfTwo(m_decFactor)) {
+        std::cerr << "ERROR: DecimatorB::initialise: Decimation factor must be a power of 2 and at least 2 (was: " << m_decFactor << ")" << std::endl;
+        m_decFactor = 0;
+        return;
+    }
+
+    if (m_inputLength % m_decFactor != 0) {
+        std::cerr << "ERROR: DecimatorB::initialise: inLength must be a multiple of decimation factor (was: " << m_inputLength << ", factor is " << m_decFactor << ")" << std::endl;
+        m_decFactor = 0;
+        return;
+    }        
+
+    m_aaBuffer = new double[m_inputLength];
+    m_tmpBuffer = new double[m_inputLength];
+
+    // Order 6 Butterworth lowpass filter
+    // Calculated using e.g. MATLAB butter(6, 0.5, 'low')
+
+    m_b[0] = 0.029588223638661;
+    m_b[1] = 0.177529341831965;
+    m_b[2] = 0.443823354579912;
+    m_b[3] = 0.591764472773216;
+    m_b[4] = 0.443823354579912;
+    m_b[5] = 0.177529341831965;
+    m_b[6] = 0.029588223638661;
+
+    m_a[0] = 1.000000000000000;
+    m_a[1] = 0.000000000000000;
+    m_a[2] = 0.777695961855673;
+    m_a[3] = 0.000000000000000;
+    m_a[4] = 0.114199425062434;
+    m_a[5] = 0.000000000000000;
+    m_a[6] = 0.001750925956183;
+
+    for (int factor = m_decFactor; factor > 1; factor /= 2) {
+        m_o.push_back(vector<double>(6, 0.0));
+    }
+}
+
+void DecimatorB::deInitialise()
+{
+    delete [] m_aaBuffer;
+    delete [] m_tmpBuffer;
+}
+
+void DecimatorB::doAntiAlias(const double *src, double *dst, int length,
+                             int filteridx)
+{
+    vector<double> &o = m_o[filteridx];
+
+    for (int i = 0; i < length; i++) {
+
+	double input = src[i];
+	double output = input * m_b[0] + o[0];
+
+	o[0] = input * m_b[1] - output * m_a[1] + o[1];
+	o[1] = input * m_b[2] - output * m_a[2] + o[2];
+	o[2] = input * m_b[3] - output * m_a[3] + o[3];
+	o[3] = input * m_b[4] - output * m_a[4] + o[4];
+	o[4] = input * m_b[5] - output * m_a[5] + o[5];
+	o[5] = input * m_b[6] - output * m_a[6];
+
+	dst[i] = output;
+    }
+}
+
+void DecimatorB::doProcess()
+{
+    int filteridx = 0;
+    int factorDone = 1;
+    int factorRemaining = m_decFactor;
+
+    while (factorDone < m_decFactor) {
+
+        doAntiAlias(m_tmpBuffer, m_aaBuffer,
+                    m_inputLength / factorDone,
+                    filteridx);
+
+        filteridx ++;
+        factorDone *= 2;
+
+        for (int i = 0; i < m_inputLength / factorDone; ++i) {
+            m_tmpBuffer[i] = m_aaBuffer[i * 2];
+        }
+    }
+}
+
+void DecimatorB::process(const double *src, double *dst)
+{
+    if (m_decFactor == 0) return;
+
+    for (int i = 0; i < m_inputLength; ++i) {
+        m_tmpBuffer[i] = src[i];
+    }
+
+    doProcess();
+    
+    for (int i = 0; i < m_outputLength; ++i) {
+        dst[i] = m_tmpBuffer[i];
+    }
+}
+
+void DecimatorB::process(const float *src, float *dst)
+{
+    if (m_decFactor == 0) return;
+
+    for (int i = 0; i < m_inputLength; ++i) {
+        m_tmpBuffer[i] = src[i];
+    }
+
+    doProcess();
+    
+    for (int i = 0; i < m_outputLength; ++i) {
+        dst[i] = m_tmpBuffer[i];
+    }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dsp/rateconversion/DecimatorB.h	Tue Oct 22 08:58:28 2013 +0100
@@ -0,0 +1,64 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+/*
+    QM DSP Library
+
+    Centre for Digital Music, Queen Mary, University of London.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
+*/
+
+#ifndef DECIMATORB_H
+#define DECIMATORB_H
+
+#include <vector>
+
+/**
+ * DecimatorB carries out a fast downsample by a power-of-two
+ * factor. It only knows how to decimate by a factor of 2, and will
+ * use repeated decimation for higher factors. A Butterworth filter of
+ * order 6 is used for the lowpass filter.
+ */
+class DecimatorB
+{
+public:
+    void process( const double* src, double* dst );
+    void process( const float* src, float* dst );
+
+    /**
+     * Construct a DecimatorB to operate on input blocks of length
+     * inLength, with decimation factor decFactor.  inLength should be
+     * a multiple of decFactor.  Output blocks will be of length
+     * inLength / decFactor.
+     *
+     * decFactor must be a power of two.
+     */
+    DecimatorB(int inLength, int decFactor);
+    virtual ~DecimatorB();
+
+    int getFactor() const { return m_decFactor; }
+
+private:
+    void deInitialise();
+    void initialise(int inLength, int decFactor);
+    void doAntiAlias(const double* src, double* dst, int length, int filteridx);
+    void doProcess();
+
+    int m_inputLength;
+    int m_outputLength;
+    int m_decFactor;
+
+    std::vector<std::vector<double> > m_o;
+
+    double m_a[7];
+    double m_b[7];
+	
+    double *m_aaBuffer;
+    double *m_tmpBuffer;
+};
+
+#endif
+