cannam@0
|
1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
cannam@0
|
2
|
cannam@0
|
3 /*
|
cannam@0
|
4 Vamp feature extraction plugins using Paul Brossier's Aubio library.
|
cannam@0
|
5
|
cannam@0
|
6 Centre for Digital Music, Queen Mary, University of London.
|
cannam@20
|
7 This file copyright 2006-2008 Chris Cannam and QMUL.
|
cannam@0
|
8
|
cannam@0
|
9 This program is free software; you can redistribute it and/or
|
cannam@0
|
10 modify it under the terms of the GNU General Public License as
|
cannam@0
|
11 published by the Free Software Foundation; either version 2 of the
|
cannam@0
|
12 License, or (at your option) any later version. See the file
|
cannam@0
|
13 COPYING included with this distribution for more information.
|
cannam@0
|
14
|
cannam@0
|
15 */
|
cannam@0
|
16
|
piem@2
|
17 #include <math.h>
|
cannam@0
|
18 #include "Notes.h"
|
cannam@0
|
19
|
cannam@28
|
20 #include <algorithm>
|
cannam@28
|
21
|
cannam@0
|
22 using std::string;
|
cannam@0
|
23 using std::vector;
|
cannam@0
|
24 using std::cerr;
|
cannam@0
|
25 using std::endl;
|
cannam@0
|
26
|
cannam@31
|
27 Notes::Notes(float inputSampleRate) :
|
cannam@0
|
28 Plugin(inputSampleRate),
|
cannam@0
|
29 m_ibuf(0),
|
cannam@0
|
30 m_onset(0),
|
cannam@34
|
31 m_pitch(0),
|
cannam@0
|
32 m_onsetdet(0),
|
cannam@30
|
33 m_onsettype(OnsetComplex),
|
cannam@0
|
34 m_pitchdet(0),
|
cannam@30
|
35 m_pitchtype(PitchYinFFT),
|
cannam@0
|
36 m_threshold(0.3),
|
cannam@34
|
37 m_silence(-70),
|
cannam@34
|
38 m_minioi(4),
|
cannam@7
|
39 m_median(6),
|
piem@9
|
40 m_minpitch(27),
|
cannam@7
|
41 m_maxpitch(95),
|
cannam@7
|
42 m_wrapRange(false),
|
cannam@7
|
43 m_avoidLeaps(false),
|
cannam@7
|
44 m_prevPitch(-1)
|
cannam@0
|
45 {
|
cannam@0
|
46 }
|
cannam@0
|
47
|
cannam@0
|
48 Notes::~Notes()
|
cannam@0
|
49 {
|
cannam@30
|
50 if (m_onsetdet) del_aubio_onset(m_onsetdet);
|
cannam@30
|
51 if (m_pitchdet) del_aubio_pitch(m_pitchdet);
|
cannam@0
|
52 if (m_ibuf) del_fvec(m_ibuf);
|
cannam@0
|
53 if (m_onset) del_fvec(m_onset);
|
cannam@34
|
54 if (m_pitch) del_fvec(m_pitch);
|
cannam@0
|
55 }
|
cannam@0
|
56
|
cannam@0
|
57 string
|
cannam@13
|
58 Notes::getIdentifier() const
|
cannam@0
|
59 {
|
cannam@0
|
60 return "aubionotes";
|
cannam@0
|
61 }
|
cannam@0
|
62
|
cannam@0
|
63 string
|
cannam@13
|
64 Notes::getName() const
|
cannam@13
|
65 {
|
cannam@13
|
66 return "Aubio Note Tracker";
|
cannam@13
|
67 }
|
cannam@13
|
68
|
cannam@13
|
69 string
|
cannam@0
|
70 Notes::getDescription() const
|
cannam@0
|
71 {
|
cannam@13
|
72 return "Estimate note onset positions, pitches and durations";
|
cannam@0
|
73 }
|
cannam@0
|
74
|
cannam@0
|
75 string
|
cannam@0
|
76 Notes::getMaker() const
|
cannam@0
|
77 {
|
cannam@0
|
78 return "Paul Brossier (plugin by Chris Cannam)";
|
cannam@0
|
79 }
|
cannam@0
|
80
|
cannam@0
|
81 int
|
cannam@0
|
82 Notes::getPluginVersion() const
|
cannam@0
|
83 {
|
cannam@31
|
84 return 4;
|
cannam@0
|
85 }
|
cannam@0
|
86
|
cannam@0
|
87 string
|
cannam@0
|
88 Notes::getCopyright() const
|
cannam@0
|
89 {
|
cannam@0
|
90 return "GPL";
|
cannam@0
|
91 }
|
cannam@0
|
92
|
cannam@0
|
93 bool
|
cannam@0
|
94 Notes::initialise(size_t channels, size_t stepSize, size_t blockSize)
|
cannam@0
|
95 {
|
cannam@32
|
96 if (channels != 1) {
|
cannam@32
|
97 std::cerr << "Notes::initialise: channels must be 1" << std::endl;
|
cannam@32
|
98 return false;
|
cannam@32
|
99 }
|
cannam@32
|
100
|
cannam@0
|
101 m_stepSize = stepSize;
|
cannam@0
|
102 m_blockSize = blockSize;
|
cannam@0
|
103
|
cannam@32
|
104 m_ibuf = new_fvec(stepSize);
|
cannam@32
|
105 m_onset = new_fvec(1);
|
cannam@34
|
106 m_pitch = new_fvec(1);
|
cannam@0
|
107
|
cannam@34
|
108 m_onsetdet = new_aubio_onset
|
cannam@34
|
109 (const_cast<char *>(getAubioNameForOnsetType(m_onsettype)),
|
cannam@34
|
110 blockSize,
|
cannam@34
|
111 stepSize,
|
cannam@34
|
112 lrintf(m_inputSampleRate));
|
cannam@34
|
113
|
cannam@34
|
114 aubio_onset_set_threshold(m_onsetdet, m_threshold);
|
cannam@34
|
115 aubio_onset_set_silence(m_onsetdet, m_silence);
|
cannam@34
|
116 aubio_onset_set_minioi(m_onsetdet, m_minioi);
|
cannam@0
|
117
|
cannam@34
|
118 m_pitchdet = new_aubio_pitch
|
cannam@34
|
119 (const_cast<char *>(getAubioNameForPitchType(m_pitchtype)),
|
cannam@34
|
120 blockSize,
|
cannam@34
|
121 stepSize,
|
cannam@34
|
122 lrintf(m_inputSampleRate));
|
cannam@34
|
123
|
cannam@35
|
124 aubio_pitch_set_unit(m_pitchdet, const_cast<char *>("freq"));
|
cannam@0
|
125
|
cannam@0
|
126 m_count = 0;
|
piem@5
|
127 m_delay = Vamp::RealTime::frame2RealTime((4 + m_median) * m_stepSize,
|
piem@5
|
128 lrintf(m_inputSampleRate));
|
cannam@0
|
129 m_currentOnset = Vamp::RealTime::zeroTime;
|
cannam@0
|
130 m_haveCurrent = false;
|
cannam@7
|
131 m_prevPitch = -1;
|
cannam@0
|
132
|
cannam@0
|
133 return true;
|
cannam@0
|
134 }
|
cannam@0
|
135
|
cannam@0
|
136 void
|
cannam@0
|
137 Notes::reset()
|
cannam@0
|
138 {
|
cannam@0
|
139 }
|
cannam@0
|
140
|
cannam@0
|
141 size_t
|
cannam@0
|
142 Notes::getPreferredStepSize() const
|
cannam@0
|
143 {
|
piem@2
|
144 return 512;
|
cannam@0
|
145 }
|
cannam@0
|
146
|
cannam@0
|
147 size_t
|
cannam@0
|
148 Notes::getPreferredBlockSize() const
|
cannam@0
|
149 {
|
cannam@4
|
150 return 4 * getPreferredStepSize();
|
cannam@0
|
151 }
|
cannam@0
|
152
|
cannam@0
|
153 Notes::ParameterList
|
cannam@0
|
154 Notes::getParameterDescriptors() const
|
cannam@0
|
155 {
|
cannam@0
|
156 ParameterList list;
|
cannam@0
|
157
|
cannam@0
|
158 ParameterDescriptor desc;
|
cannam@13
|
159 desc.identifier = "onsettype";
|
cannam@13
|
160 desc.name = "Onset Detection Function Type";
|
cannam@0
|
161 desc.minValue = 0;
|
cannam@34
|
162 desc.maxValue = 7;
|
cannam@34
|
163 desc.defaultValue = (int)OnsetComplex;
|
cannam@0
|
164 desc.isQuantized = true;
|
cannam@0
|
165 desc.quantizeStep = 1;
|
cannam@0
|
166 desc.valueNames.push_back("Energy Based");
|
cannam@0
|
167 desc.valueNames.push_back("Spectral Difference");
|
cannam@0
|
168 desc.valueNames.push_back("High-Frequency Content");
|
cannam@0
|
169 desc.valueNames.push_back("Complex Domain");
|
cannam@0
|
170 desc.valueNames.push_back("Phase Deviation");
|
cannam@0
|
171 desc.valueNames.push_back("Kullback-Liebler");
|
cannam@0
|
172 desc.valueNames.push_back("Modified Kullback-Liebler");
|
cannam@34
|
173 desc.valueNames.push_back("Spectral Flux");
|
cannam@0
|
174 list.push_back(desc);
|
cannam@0
|
175
|
cannam@0
|
176 desc = ParameterDescriptor();
|
cannam@13
|
177 desc.identifier = "pitchtype";
|
cannam@13
|
178 desc.name = "Pitch Detection Function Type";
|
cannam@0
|
179 desc.minValue = 0;
|
cannam@0
|
180 desc.maxValue = 4;
|
cannam@34
|
181 desc.defaultValue = (int)PitchYinFFT;
|
cannam@0
|
182 desc.isQuantized = true;
|
cannam@0
|
183 desc.quantizeStep = 1;
|
cannam@0
|
184 desc.valueNames.push_back("YIN Frequency Estimator");
|
cannam@0
|
185 desc.valueNames.push_back("Spectral Comb");
|
cannam@0
|
186 desc.valueNames.push_back("Schmitt");
|
cannam@0
|
187 desc.valueNames.push_back("Fast Harmonic Comb");
|
cannam@0
|
188 desc.valueNames.push_back("YIN with FFT");
|
cannam@0
|
189 list.push_back(desc);
|
cannam@0
|
190
|
cannam@0
|
191 desc = ParameterDescriptor();
|
cannam@13
|
192 desc.identifier = "minpitch";
|
cannam@13
|
193 desc.name = "Minimum Pitch";
|
cannam@7
|
194 desc.minValue = 0;
|
cannam@7
|
195 desc.maxValue = 127;
|
cannam@35
|
196 desc.defaultValue = 27;
|
cannam@7
|
197 desc.unit = "MIDI units";
|
cannam@7
|
198 desc.isQuantized = true;
|
cannam@7
|
199 desc.quantizeStep = 1;
|
cannam@7
|
200 list.push_back(desc);
|
cannam@7
|
201
|
cannam@7
|
202 desc = ParameterDescriptor();
|
cannam@13
|
203 desc.identifier = "maxpitch";
|
cannam@13
|
204 desc.name = "Maximum Pitch";
|
cannam@7
|
205 desc.minValue = 0;
|
cannam@7
|
206 desc.maxValue = 127;
|
cannam@7
|
207 desc.defaultValue = 95;
|
cannam@7
|
208 desc.unit = "MIDI units";
|
cannam@7
|
209 desc.isQuantized = true;
|
cannam@7
|
210 desc.quantizeStep = 1;
|
cannam@7
|
211 list.push_back(desc);
|
cannam@7
|
212
|
cannam@7
|
213 desc = ParameterDescriptor();
|
cannam@13
|
214 desc.identifier = "wraprange";
|
cannam@13
|
215 desc.name = "Fold Higher or Lower Notes into Range";
|
cannam@7
|
216 desc.minValue = 0;
|
cannam@7
|
217 desc.maxValue = 1;
|
cannam@7
|
218 desc.defaultValue = 0;
|
cannam@7
|
219 desc.isQuantized = true;
|
cannam@7
|
220 desc.quantizeStep = 1;
|
cannam@7
|
221 list.push_back(desc);
|
cannam@7
|
222
|
cannam@7
|
223 desc = ParameterDescriptor();
|
cannam@13
|
224 desc.identifier = "avoidleaps";
|
cannam@13
|
225 desc.name = "Avoid Multi-Octave Jumps";
|
cannam@7
|
226 desc.minValue = 0;
|
cannam@7
|
227 desc.maxValue = 1;
|
cannam@7
|
228 desc.defaultValue = 0;
|
cannam@7
|
229 desc.isQuantized = true;
|
cannam@7
|
230 desc.quantizeStep = 1;
|
cannam@7
|
231 list.push_back(desc);
|
cannam@7
|
232
|
cannam@7
|
233 desc = ParameterDescriptor();
|
cannam@13
|
234 desc.identifier = "peakpickthreshold";
|
cannam@13
|
235 desc.name = "Peak Picker Threshold";
|
cannam@0
|
236 desc.minValue = 0;
|
cannam@0
|
237 desc.maxValue = 1;
|
cannam@0
|
238 desc.defaultValue = 0.3;
|
cannam@0
|
239 desc.isQuantized = false;
|
cannam@0
|
240 list.push_back(desc);
|
cannam@0
|
241
|
cannam@0
|
242 desc = ParameterDescriptor();
|
cannam@13
|
243 desc.identifier = "silencethreshold";
|
cannam@13
|
244 desc.name = "Silence Threshold";
|
cannam@0
|
245 desc.minValue = -120;
|
cannam@0
|
246 desc.maxValue = 0;
|
cannam@34
|
247 desc.defaultValue = -70;
|
cannam@0
|
248 desc.unit = "dB";
|
cannam@0
|
249 desc.isQuantized = false;
|
cannam@0
|
250 list.push_back(desc);
|
cannam@0
|
251
|
cannam@34
|
252 desc = ParameterDescriptor();
|
cannam@34
|
253 desc.identifier = "minioi";
|
cannam@34
|
254 desc.name = "Minimum Inter-Onset Interval";
|
cannam@34
|
255 desc.minValue = 0;
|
cannam@34
|
256 desc.maxValue = 40;
|
cannam@34
|
257 desc.defaultValue = 4;
|
cannam@34
|
258 desc.unit = "ms";
|
cannam@34
|
259 desc.isQuantized = true;
|
cannam@34
|
260 desc.quantizeStep = 1;
|
cannam@34
|
261 list.push_back(desc);
|
cannam@34
|
262
|
cannam@0
|
263 return list;
|
cannam@0
|
264 }
|
cannam@0
|
265
|
cannam@0
|
266 float
|
cannam@0
|
267 Notes::getParameter(std::string param) const
|
cannam@0
|
268 {
|
cannam@0
|
269 if (param == "onsettype") {
|
cannam@0
|
270 return m_onsettype;
|
cannam@0
|
271 } else if (param == "pitchtype") {
|
cannam@0
|
272 return m_pitchtype;
|
cannam@0
|
273 } else if (param == "peakpickthreshold") {
|
cannam@0
|
274 return m_threshold;
|
cannam@0
|
275 } else if (param == "silencethreshold") {
|
cannam@0
|
276 return m_silence;
|
cannam@7
|
277 } else if (param == "minpitch") {
|
cannam@7
|
278 return m_minpitch;
|
cannam@7
|
279 } else if (param == "maxpitch") {
|
cannam@7
|
280 return m_maxpitch;
|
cannam@7
|
281 } else if (param == "wraprange") {
|
cannam@7
|
282 return m_wrapRange ? 1.0 : 0.0;
|
cannam@7
|
283 } else if (param == "avoidleaps") {
|
cannam@7
|
284 return m_avoidLeaps ? 1.0 : 0.0;
|
cannam@34
|
285 } else if (param == "minioi") {
|
cannam@34
|
286 return m_minioi;
|
cannam@0
|
287 } else {
|
cannam@0
|
288 return 0.0;
|
cannam@0
|
289 }
|
cannam@0
|
290 }
|
cannam@0
|
291
|
cannam@0
|
292 void
|
cannam@0
|
293 Notes::setParameter(std::string param, float value)
|
cannam@0
|
294 {
|
cannam@0
|
295 if (param == "onsettype") {
|
cannam@0
|
296 switch (lrintf(value)) {
|
cannam@34
|
297 case 0: m_onsettype = OnsetEnergy; break;
|
cannam@34
|
298 case 1: m_onsettype = OnsetSpecDiff; break;
|
cannam@34
|
299 case 2: m_onsettype = OnsetHFC; break;
|
cannam@34
|
300 case 3: m_onsettype = OnsetComplex; break;
|
cannam@34
|
301 case 4: m_onsettype = OnsetPhase; break;
|
cannam@34
|
302 case 5: m_onsettype = OnsetKL; break;
|
cannam@34
|
303 case 6: m_onsettype = OnsetMKL; break;
|
cannam@34
|
304 case 7: m_onsettype = OnsetSpecFlux; break;
|
cannam@0
|
305 }
|
cannam@0
|
306 } else if (param == "pitchtype") {
|
cannam@0
|
307 switch (lrintf(value)) {
|
cannam@34
|
308 case 0: m_pitchtype = PitchYin; break;
|
cannam@34
|
309 case 1: m_pitchtype = PitchMComb; break;
|
cannam@34
|
310 case 2: m_pitchtype = PitchSchmitt; break;
|
cannam@34
|
311 case 3: m_pitchtype = PitchFComb; break;
|
cannam@34
|
312 case 4: m_pitchtype = PitchYinFFT; break;
|
cannam@0
|
313 }
|
cannam@0
|
314 } else if (param == "peakpickthreshold") {
|
cannam@0
|
315 m_threshold = value;
|
cannam@0
|
316 } else if (param == "silencethreshold") {
|
cannam@0
|
317 m_silence = value;
|
cannam@7
|
318 } else if (param == "minpitch") {
|
cannam@7
|
319 m_minpitch = lrintf(value);
|
cannam@7
|
320 } else if (param == "maxpitch") {
|
cannam@7
|
321 m_maxpitch = lrintf(value);
|
cannam@7
|
322 } else if (param == "wraprange") {
|
cannam@7
|
323 m_wrapRange = (value > 0.5);
|
cannam@7
|
324 } else if (param == "avoidleaps") {
|
cannam@7
|
325 m_avoidLeaps = (value > 0.5);
|
cannam@34
|
326 } else if (param == "minioi") {
|
cannam@34
|
327 m_minioi = value;
|
cannam@0
|
328 }
|
cannam@0
|
329 }
|
cannam@0
|
330
|
cannam@0
|
331 Notes::OutputList
|
cannam@0
|
332 Notes::getOutputDescriptors() const
|
cannam@0
|
333 {
|
cannam@0
|
334 OutputList list;
|
cannam@0
|
335
|
cannam@0
|
336 OutputDescriptor d;
|
cannam@13
|
337 d.identifier = "notes";
|
cannam@13
|
338 d.name = "Notes";
|
cannam@0
|
339 d.unit = "Hz";
|
cannam@0
|
340 d.hasFixedBinCount = true;
|
cannam@20
|
341
|
cannam@31
|
342 d.binCount = 2;
|
cannam@31
|
343 d.binNames.push_back("Frequency");
|
cannam@31
|
344 d.binNames.push_back("Velocity");
|
cannam@31
|
345 d.hasDuration = true;
|
cannam@20
|
346
|
cannam@0
|
347 d.hasKnownExtents = false;
|
cannam@0
|
348 d.isQuantized = false;
|
cannam@0
|
349 d.sampleType = OutputDescriptor::VariableSampleRate;
|
cannam@0
|
350 d.sampleRate = 0;
|
cannam@0
|
351 list.push_back(d);
|
cannam@0
|
352
|
cannam@0
|
353 return list;
|
cannam@0
|
354 }
|
cannam@0
|
355
|
cannam@0
|
356 Notes::FeatureSet
|
cannam@12
|
357 Notes::process(const float *const *inputBuffers, Vamp::RealTime timestamp)
|
cannam@0
|
358 {
|
cannam@0
|
359 for (size_t i = 0; i < m_stepSize; ++i) {
|
cannam@34
|
360 fvec_write_sample(m_ibuf, inputBuffers[0][i], i);
|
cannam@0
|
361 }
|
cannam@0
|
362
|
cannam@34
|
363 aubio_onset_do(m_onsetdet, m_ibuf, m_onset);
|
cannam@34
|
364 aubio_pitch_do(m_pitchdet, m_ibuf, m_pitch);
|
cannam@0
|
365
|
cannam@34
|
366 bool isonset = m_onset->data[0];
|
cannam@34
|
367 float frequency = m_pitch->data[0];
|
cannam@0
|
368
|
cannam@0
|
369 m_notebuf.push_back(frequency);
|
cannam@0
|
370 if (m_notebuf.size() > m_median) m_notebuf.pop_front();
|
cannam@0
|
371
|
cannam@0
|
372 float level = aubio_level_detection(m_ibuf, m_silence);
|
cannam@0
|
373
|
cannam@0
|
374 FeatureSet returnFeatures;
|
cannam@0
|
375
|
cannam@0
|
376 if (isonset) {
|
cannam@0
|
377 if (level == 1.) {
|
cannam@0
|
378 isonset = false;
|
cannam@0
|
379 m_count = 0;
|
cannam@0
|
380 if (m_haveCurrent) pushNote(returnFeatures, timestamp);
|
cannam@0
|
381 } else {
|
cannam@0
|
382 m_count = 1;
|
cannam@0
|
383 }
|
cannam@0
|
384 } else {
|
cannam@0
|
385 if (m_count > 0) ++m_count;
|
cannam@0
|
386 if (m_count == m_median) {
|
cannam@0
|
387 if (m_haveCurrent) pushNote(returnFeatures, timestamp);
|
cannam@0
|
388 m_currentOnset = timestamp;
|
cannam@0
|
389 m_currentLevel = level;
|
cannam@0
|
390 m_haveCurrent = true;
|
cannam@0
|
391 }
|
cannam@0
|
392 }
|
cannam@0
|
393
|
cannam@0
|
394 m_lastTimeStamp = timestamp;
|
cannam@0
|
395 return returnFeatures;
|
cannam@0
|
396 }
|
cannam@0
|
397
|
cannam@0
|
398 Notes::FeatureSet
|
cannam@0
|
399 Notes::getRemainingFeatures()
|
cannam@0
|
400 {
|
cannam@0
|
401 FeatureSet returnFeatures;
|
cannam@0
|
402 if (m_haveCurrent) pushNote(returnFeatures, m_lastTimeStamp);
|
cannam@0
|
403 return returnFeatures;
|
cannam@0
|
404 }
|
cannam@0
|
405
|
cannam@0
|
406 void
|
cannam@0
|
407 Notes::pushNote(FeatureSet &fs, const Vamp::RealTime &offTime)
|
cannam@0
|
408 {
|
cannam@0
|
409 std::deque<float> toSort = m_notebuf;
|
cannam@0
|
410 std::sort(toSort.begin(), toSort.end());
|
cannam@0
|
411 float median = toSort[toSort.size()/2];
|
cannam@0
|
412 if (median < 45.0) return;
|
cannam@0
|
413
|
cannam@7
|
414 float freq = median;
|
cannam@15
|
415 int midiPitch = (int)floor(aubio_freqtomidi(freq) + 0.5);
|
cannam@7
|
416
|
cannam@7
|
417 if (m_avoidLeaps) {
|
cannam@7
|
418 if (m_prevPitch >= 0) {
|
cannam@7
|
419 while (midiPitch < m_prevPitch - 12) {
|
cannam@7
|
420 midiPitch += 12;
|
cannam@7
|
421 freq *= 2;
|
cannam@7
|
422 }
|
cannam@7
|
423 while (midiPitch > m_prevPitch + 12) {
|
cannam@7
|
424 midiPitch -= 12;
|
cannam@7
|
425 freq /= 2;
|
cannam@7
|
426 }
|
cannam@7
|
427 }
|
cannam@7
|
428 }
|
cannam@7
|
429
|
cannam@7
|
430 while (midiPitch < m_minpitch) {
|
cannam@7
|
431 if (!m_wrapRange) return;
|
cannam@7
|
432 midiPitch += 12;
|
cannam@7
|
433 freq *= 2;
|
cannam@7
|
434 }
|
cannam@7
|
435
|
cannam@7
|
436 while (midiPitch > m_maxpitch) {
|
cannam@7
|
437 if (!m_wrapRange) return;
|
cannam@7
|
438 midiPitch -= 12;
|
cannam@7
|
439 freq /= 2;
|
cannam@7
|
440 }
|
cannam@7
|
441
|
cannam@7
|
442 m_prevPitch = midiPitch;
|
cannam@7
|
443
|
cannam@0
|
444 Feature feature;
|
cannam@0
|
445 feature.hasTimestamp = true;
|
piem@5
|
446 if (m_currentOnset < m_delay) m_currentOnset = m_delay;
|
piem@5
|
447 feature.timestamp = m_currentOnset - m_delay;
|
cannam@7
|
448 feature.values.push_back(freq);
|
cannam@20
|
449
|
cannam@31
|
450 feature.values.push_back
|
cannam@31
|
451 (Vamp::RealTime::realTime2Frame
|
cannam@31
|
452 (offTime, lrintf(m_inputSampleRate)) -
|
cannam@31
|
453 Vamp::RealTime::realTime2Frame
|
cannam@31
|
454 (m_currentOnset, lrintf(m_inputSampleRate)));
|
cannam@31
|
455 feature.hasDuration = false;
|
cannam@20
|
456
|
cannam@0
|
457 feature.values.push_back(m_currentLevel);
|
cannam@0
|
458 fs[0].push_back(feature);
|
cannam@0
|
459 }
|
cannam@0
|
460
|