annotate dsp/tonal/ChangeDetectionFunction.h @ 321:f1e6be2de9a5

A threshold (delta) is added in the peak picking parameters structure (PPickParams). It is used as an offset when computing the smoothed detection function. A constructor for the structure PPickParams is also added to set the parameters to 0 when a structure instance is created. Hence programmes using the peak picking parameter structure and which do not set the delta parameter (e.g. QM Vamp note onset detector) won't be affected by the modifications. Functions modified: - dsp/onsets/PeakPicking.cpp - dsp/onsets/PeakPicking.h - dsp/signalconditioning/DFProcess.cpp - dsp/signalconditioning/DFProcess.h
author mathieub <mathieu.barthet@eecs.qmul.ac.uk>
date Mon, 20 Jun 2011 19:01:48 +0100
parents d5014ab8b0e5
children cbe668c7d724
rev   line source
c@225 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
c@225 2
c@225 3 /*
c@225 4 QM DSP Library
c@225 5
c@225 6 Centre for Digital Music, Queen Mary, University of London.
c@225 7 This file copyright 2006 Martin Gasser.
c@309 8
c@309 9 This program is free software; you can redistribute it and/or
c@309 10 modify it under the terms of the GNU General Public License as
c@309 11 published by the Free Software Foundation; either version 2 of the
c@309 12 License, or (at your option) any later version. See the file
c@309 13 COPYING included with this distribution for more information.
c@225 14 */
c@225 15
c@225 16 #ifndef _CHANGEDETECTIONFUNCTION_
c@225 17 #define _CHANGEDETECTIONFUNCTION_
c@225 18
c@275 19 //#define DEBUG_CHANGE_DETECTION_FUNCTION 1
c@225 20
c@225 21 #include "TCSgram.h"
c@225 22
c@225 23 #include <valarray>
c@225 24 using std::valarray;
c@225 25
c@225 26 typedef valarray<double> ChangeDistance;
c@225 27
c@225 28 struct ChangeDFConfig
c@225 29 {
c@225 30 int smoothingWidth;
c@225 31 };
c@225 32
c@225 33 class ChangeDetectionFunction
c@225 34 {
c@225 35 public:
c@225 36 ChangeDetectionFunction(ChangeDFConfig);
c@225 37 ~ChangeDetectionFunction();
c@225 38 ChangeDistance process(const TCSGram& rTCSGram);
c@225 39 private:
c@225 40 void setFilterWidth(const int iWidth);
c@225 41
c@225 42 private:
c@225 43 valarray<double> m_vaGaussian;
c@225 44 double m_dFilterSigma;
c@225 45 int m_iFilterWidth;
c@225 46 };
c@225 47
c@225 48 #endif // _CHANGDETECTIONFUNCTION_