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