annotate dsp/wavelet/Wavelet.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 |
ccd2019190bf |
| rev |
line source |
|
c@285
|
1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
|
c@285
|
2
|
|
c@285
|
3 /*
|
|
c@285
|
4 QM DSP Library
|
|
c@285
|
5
|
|
c@285
|
6 Centre for Digital Music, Queen Mary, University of London.
|
|
c@285
|
7 This file copyright 2009 Thomas Wilmering.
|
|
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@285
|
14 */
|
|
c@285
|
15
|
|
c@285
|
16 #ifndef _WAVELET_H_
|
|
c@285
|
17 #define _WAVELET_H_
|
|
c@285
|
18
|
|
c@285
|
19 #include <string>
|
|
c@285
|
20 #include <vector>
|
|
c@285
|
21
|
|
c@285
|
22 class Wavelet
|
|
c@285
|
23 {
|
|
c@285
|
24 public:
|
|
c@285
|
25 enum Type {
|
|
c@285
|
26 Haar = 0,
|
|
c@285
|
27 Daubechies_2,
|
|
c@285
|
28 Daubechies_3,
|
|
c@285
|
29 Daubechies_4,
|
|
c@285
|
30 Daubechies_5,
|
|
c@285
|
31 Daubechies_6,
|
|
c@285
|
32 Daubechies_7,
|
|
c@285
|
33 Daubechies_8,
|
|
c@285
|
34 Daubechies_9,
|
|
c@285
|
35 Daubechies_10,
|
|
c@285
|
36 Daubechies_20,
|
|
c@285
|
37 Daubechies_40,
|
|
c@285
|
38 Symlet_2,
|
|
c@285
|
39 Symlet_3,
|
|
c@285
|
40 Symlet_4,
|
|
c@285
|
41 Symlet_5,
|
|
c@285
|
42 Symlet_6,
|
|
c@285
|
43 Symlet_7,
|
|
c@285
|
44 Symlet_8,
|
|
c@285
|
45 Symlet_9,
|
|
c@285
|
46 Symlet_10,
|
|
c@285
|
47 Symlet_20,
|
|
c@285
|
48 Symlet_30,
|
|
c@285
|
49 Coiflet_1,
|
|
c@285
|
50 Coiflet_2,
|
|
c@285
|
51 Coiflet_3,
|
|
c@285
|
52 Coiflet_4,
|
|
c@285
|
53 Coiflet_5,
|
|
c@285
|
54 Biorthogonal_1_3,
|
|
c@285
|
55 Biorthogonal_1_5,
|
|
c@285
|
56 Biorthogonal_2_2,
|
|
c@285
|
57 Biorthogonal_2_4,
|
|
c@285
|
58 Biorthogonal_2_6,
|
|
c@285
|
59 Biorthogonal_2_8,
|
|
c@285
|
60 Biorthogonal_3_1,
|
|
c@285
|
61 Biorthogonal_3_3,
|
|
c@285
|
62 Biorthogonal_3_5,
|
|
c@285
|
63 Biorthogonal_3_7,
|
|
c@285
|
64 Biorthogonal_3_9,
|
|
c@285
|
65 Biorthogonal_4_4,
|
|
c@285
|
66 Biorthogonal_5_5,
|
|
c@285
|
67 Biorthogonal_6_8,
|
|
c@285
|
68 Meyer,
|
|
c@285
|
69
|
|
c@285
|
70 LastType = Meyer
|
|
c@285
|
71 };
|
|
c@285
|
72
|
|
c@285
|
73 static std::string getWaveletName(Type);
|
|
c@285
|
74
|
|
c@285
|
75 static void createDecompositionFilters(Type,
|
|
c@285
|
76 std::vector<float> &lpd,
|
|
c@285
|
77 std::vector<float> &hpd);
|
|
c@285
|
78 };
|
|
c@285
|
79
|
|
c@285
|
80 #endif
|
