c@89
|
1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
c@89
|
2
|
c@89
|
3 /*
|
c@89
|
4 QM Vamp Plugin Set
|
c@89
|
5
|
c@89
|
6 Centre for Digital Music, Queen Mary, University of London.
|
c@135
|
7
|
c@135
|
8 This program is free software; you can redistribute it and/or
|
c@135
|
9 modify it under the terms of the GNU General Public License as
|
c@135
|
10 published by the Free Software Foundation; either version 2 of the
|
c@135
|
11 License, or (at your option) any later version. See the file
|
c@135
|
12 COPYING included with this distribution for more information.
|
c@89
|
13 */
|
c@89
|
14
|
c@89
|
15 #include "BarBeatTrack.h"
|
c@89
|
16
|
c@89
|
17 #include <dsp/onsets/DetectionFunction.h>
|
c@89
|
18 #include <dsp/onsets/PeakPicking.h>
|
c@89
|
19 #include <dsp/tempotracking/TempoTrackV2.h>
|
c@89
|
20 #include <dsp/tempotracking/DownBeat.h>
|
c@89
|
21 #include <maths/MathUtilities.h>
|
c@89
|
22
|
c@89
|
23 using std::string;
|
c@89
|
24 using std::vector;
|
c@89
|
25 using std::cerr;
|
c@89
|
26 using std::endl;
|
c@89
|
27
|
c@89
|
28 float BarBeatTracker::m_stepSecs = 0.01161; // 512 samples at 44100
|
c@89
|
29
|
c@89
|
30 class BarBeatTrackerData
|
c@89
|
31 {
|
c@89
|
32 public:
|
c@89
|
33 BarBeatTrackerData(float rate, const DFConfig &config) : dfConfig(config) {
|
luis@144
|
34 df = new DetectionFunction(config);
|
c@89
|
35 // decimation factor aims at resampling to c. 3KHz; must be power of 2
|
c@89
|
36 int factor = MathUtilities::nextPowerOfTwo(rate / 3000);
|
c@95
|
37 // std::cerr << "BarBeatTrackerData: factor = " << factor << std::endl;
|
c@89
|
38 downBeat = new DownBeat(rate, factor, config.stepSize);
|
c@89
|
39 }
|
c@89
|
40 ~BarBeatTrackerData() {
|
luis@144
|
41 delete df;
|
c@89
|
42 delete downBeat;
|
c@89
|
43 }
|
c@89
|
44 void reset() {
|
luis@144
|
45 delete df;
|
luis@144
|
46 df = new DetectionFunction(dfConfig);
|
luis@144
|
47 dfOutput.clear();
|
c@89
|
48 downBeat->resetAudioBuffer();
|
c@89
|
49 origin = Vamp::RealTime::zeroTime;
|
c@89
|
50 }
|
c@89
|
51
|
c@89
|
52 DFConfig dfConfig;
|
c@89
|
53 DetectionFunction *df;
|
c@89
|
54 DownBeat *downBeat;
|
c@89
|
55 vector<double> dfOutput;
|
c@89
|
56 Vamp::RealTime origin;
|
c@89
|
57 };
|
luis@144
|
58
|
c@89
|
59
|
c@89
|
60 BarBeatTracker::BarBeatTracker(float inputSampleRate) :
|
c@89
|
61 Vamp::Plugin(inputSampleRate),
|
c@89
|
62 m_d(0),
|
luis@144
|
63 m_bpb(4),
|
luis@144
|
64 m_alpha(0.9), // changes are as per the BeatTrack.cpp
|
luis@144
|
65 m_tightness(4.), // changes are as per the BeatTrack.cpp
|
luis@144
|
66 m_inputtempo(120.), // changes are as per the BeatTrack.cpp
|
luis@144
|
67 m_constraintempo(false) // changes are as per the BeatTrack.cpp
|
c@89
|
68 {
|
c@89
|
69 }
|
c@89
|
70
|
c@89
|
71 BarBeatTracker::~BarBeatTracker()
|
c@89
|
72 {
|
c@89
|
73 delete m_d;
|
c@89
|
74 }
|
c@89
|
75
|
c@89
|
76 string
|
c@89
|
77 BarBeatTracker::getIdentifier() const
|
c@89
|
78 {
|
c@89
|
79 return "qm-barbeattracker";
|
c@89
|
80 }
|
c@89
|
81
|
c@89
|
82 string
|
c@89
|
83 BarBeatTracker::getName() const
|
c@89
|
84 {
|
c@89
|
85 return "Bar and Beat Tracker";
|
c@89
|
86 }
|
c@89
|
87
|
c@89
|
88 string
|
c@89
|
89 BarBeatTracker::getDescription() const
|
c@89
|
90 {
|
c@89
|
91 return "Estimate bar and beat locations";
|
c@89
|
92 }
|
c@89
|
93
|
c@89
|
94 string
|
c@89
|
95 BarBeatTracker::getMaker() const
|
c@89
|
96 {
|
c@89
|
97 return "Queen Mary, University of London";
|
c@89
|
98 }
|
c@89
|
99
|
c@89
|
100 int
|
c@89
|
101 BarBeatTracker::getPluginVersion() const
|
c@89
|
102 {
|
c@145
|
103 return 3;
|
c@89
|
104 }
|
c@89
|
105
|
c@89
|
106 string
|
c@89
|
107 BarBeatTracker::getCopyright() const
|
c@89
|
108 {
|
c@149
|
109 return "Plugin by Matthew Davies, Christian Landone and Chris Cannam. Copyright (c) 2006-2013 QMUL - All Rights Reserved";
|
c@89
|
110 }
|
c@89
|
111
|
c@89
|
112 BarBeatTracker::ParameterList
|
c@89
|
113 BarBeatTracker::getParameterDescriptors() const
|
c@89
|
114 {
|
c@89
|
115 ParameterList list;
|
c@89
|
116
|
c@89
|
117 ParameterDescriptor desc;
|
c@89
|
118
|
c@89
|
119 desc.identifier = "bpb";
|
c@89
|
120 desc.name = "Beats per Bar";
|
c@89
|
121 desc.description = "The number of beats in each bar";
|
c@89
|
122 desc.minValue = 2;
|
c@89
|
123 desc.maxValue = 16;
|
c@89
|
124 desc.defaultValue = 4;
|
c@89
|
125 desc.isQuantized = true;
|
c@89
|
126 desc.quantizeStep = 1;
|
c@89
|
127 list.push_back(desc);
|
c@89
|
128
|
luis@144
|
129 // changes are as per the BeatTrack.cpp
|
luis@144
|
130 //Alpha Parameter of Beat Tracker
|
luis@144
|
131 desc.identifier = "alpha";
|
luis@144
|
132 desc.name = "Alpha";
|
luis@144
|
133 desc.description = "Inertia - Flexibility Trade Off";
|
luis@144
|
134 desc.minValue = 0.1;
|
luis@144
|
135 desc.maxValue = 0.99;
|
luis@144
|
136 desc.defaultValue = 0.90;
|
luis@144
|
137 desc.unit = "";
|
luis@144
|
138 desc.isQuantized = false;
|
luis@144
|
139 list.push_back(desc);
|
luis@144
|
140
|
c@148
|
141 // We aren't exposing tightness as a parameter, it's fixed at 4
|
luis@144
|
142
|
luis@144
|
143 // changes are as per the BeatTrack.cpp
|
luis@144
|
144 //User input tempo
|
luis@144
|
145 desc.identifier = "inputtempo";
|
c@148
|
146 desc.name = "Tempo Hint";
|
c@151
|
147 desc.description = "User-defined tempo on which to centre the tempo preference function";
|
luis@144
|
148 desc.minValue = 50;
|
luis@144
|
149 desc.maxValue = 250;
|
luis@144
|
150 desc.defaultValue = 120;
|
luis@144
|
151 desc.unit = "BPM";
|
luis@144
|
152 desc.isQuantized = true;
|
luis@144
|
153 list.push_back(desc);
|
luis@144
|
154
|
luis@144
|
155 // changes are as per the BeatTrack.cpp
|
luis@144
|
156 desc.identifier = "constraintempo";
|
luis@144
|
157 desc.name = "Constrain Tempo";
|
c@148
|
158 desc.description = "Constrain more tightly around the tempo hint, using a Gaussian weighting instead of Rayleigh";
|
luis@144
|
159 desc.minValue = 0;
|
luis@144
|
160 desc.maxValue = 1;
|
luis@144
|
161 desc.defaultValue = 0;
|
luis@144
|
162 desc.isQuantized = true;
|
luis@144
|
163 desc.quantizeStep = 1;
|
luis@144
|
164 desc.unit = "";
|
luis@144
|
165 desc.valueNames.clear();
|
luis@144
|
166 list.push_back(desc);
|
luis@144
|
167
|
luis@144
|
168
|
c@89
|
169 return list;
|
c@89
|
170 }
|
c@89
|
171
|
c@89
|
172 float
|
c@89
|
173 BarBeatTracker::getParameter(std::string name) const
|
c@89
|
174 {
|
luis@144
|
175 if (name == "bpb") {
|
luis@144
|
176 return m_bpb;
|
luis@144
|
177 } else if (name == "alpha") {
|
luis@144
|
178 return m_alpha;
|
luis@144
|
179 } else if (name == "inputtempo") {
|
luis@144
|
180 return m_inputtempo;
|
luis@144
|
181 } else if (name == "constraintempo") {
|
luis@144
|
182 return m_constraintempo ? 1.0 : 0.0;
|
luis@144
|
183 }
|
c@89
|
184 return 0.0;
|
c@89
|
185 }
|
c@89
|
186
|
c@89
|
187 void
|
c@89
|
188 BarBeatTracker::setParameter(std::string name, float value)
|
c@89
|
189 {
|
luis@144
|
190 if (name == "bpb") {
|
luis@144
|
191 m_bpb = lrintf(value);
|
luis@144
|
192 } else if (name == "alpha") {
|
luis@144
|
193 m_alpha = value;
|
luis@144
|
194 } else if (name == "inputtempo") {
|
luis@144
|
195 m_inputtempo = value;
|
luis@144
|
196 } else if (name == "constraintempo") {
|
luis@144
|
197 m_constraintempo = (value > 0.5);
|
luis@144
|
198 }
|
c@89
|
199 }
|
c@89
|
200
|
c@89
|
201 bool
|
c@89
|
202 BarBeatTracker::initialise(size_t channels, size_t stepSize, size_t blockSize)
|
c@89
|
203 {
|
c@89
|
204 if (m_d) {
|
luis@144
|
205 delete m_d;
|
luis@144
|
206 m_d = 0;
|
c@89
|
207 }
|
c@89
|
208
|
c@89
|
209 if (channels < getMinChannelCount() ||
|
luis@144
|
210 channels > getMaxChannelCount()) {
|
c@89
|
211 std::cerr << "BarBeatTracker::initialise: Unsupported channel count: "
|
c@89
|
212 << channels << std::endl;
|
c@89
|
213 return false;
|
c@89
|
214 }
|
c@89
|
215
|
c@89
|
216 if (stepSize != getPreferredStepSize()) {
|
c@89
|
217 std::cerr << "ERROR: BarBeatTracker::initialise: Unsupported step size for this sample rate: "
|
c@89
|
218 << stepSize << " (wanted " << (getPreferredStepSize()) << ")" << std::endl;
|
c@89
|
219 return false;
|
c@89
|
220 }
|
c@89
|
221
|
c@89
|
222 if (blockSize != getPreferredBlockSize()) {
|
c@89
|
223 std::cerr << "WARNING: BarBeatTracker::initialise: Sub-optimal block size for this sample rate: "
|
c@89
|
224 << blockSize << " (wanted " << getPreferredBlockSize() << ")" << std::endl;
|
c@89
|
225 // return false;
|
c@89
|
226 }
|
c@89
|
227
|
c@89
|
228 DFConfig dfConfig;
|
c@89
|
229 dfConfig.DFType = DF_COMPLEXSD;
|
c@89
|
230 dfConfig.stepSize = stepSize;
|
c@89
|
231 dfConfig.frameLength = blockSize;
|
c@89
|
232 dfConfig.dbRise = 3;
|
c@89
|
233 dfConfig.adaptiveWhitening = false;
|
c@89
|
234 dfConfig.whiteningRelaxCoeff = -1;
|
c@89
|
235 dfConfig.whiteningFloor = -1;
|
luis@144
|
236
|
c@89
|
237 m_d = new BarBeatTrackerData(m_inputSampleRate, dfConfig);
|
c@89
|
238 m_d->downBeat->setBeatsPerBar(m_bpb);
|
c@89
|
239 return true;
|
c@89
|
240 }
|
c@89
|
241
|
c@89
|
242 void
|
c@89
|
243 BarBeatTracker::reset()
|
c@89
|
244 {
|
c@89
|
245 if (m_d) m_d->reset();
|
c@89
|
246 }
|
c@89
|
247
|
c@89
|
248 size_t
|
c@89
|
249 BarBeatTracker::getPreferredStepSize() const
|
c@89
|
250 {
|
c@89
|
251 size_t step = size_t(m_inputSampleRate * m_stepSecs + 0.0001);
|
c@95
|
252 if (step < 1) step = 1;
|
c@89
|
253 // std::cerr << "BarBeatTracker::getPreferredStepSize: input sample rate is " << m_inputSampleRate << ", step size is " << step << std::endl;
|
c@89
|
254 return step;
|
c@89
|
255 }
|
c@89
|
256
|
c@89
|
257 size_t
|
c@89
|
258 BarBeatTracker::getPreferredBlockSize() const
|
c@89
|
259 {
|
c@89
|
260 size_t theoretical = getPreferredStepSize() * 2;
|
c@89
|
261
|
c@89
|
262 // I think this is not necessarily going to be a power of two, and
|
c@89
|
263 // the host might have a problem with that, but I'm not sure we
|
c@89
|
264 // can do much about it here
|
c@89
|
265 return theoretical;
|
c@89
|
266 }
|
c@89
|
267
|
c@89
|
268 BarBeatTracker::OutputList
|
c@89
|
269 BarBeatTracker::getOutputDescriptors() const
|
c@89
|
270 {
|
c@89
|
271 OutputList list;
|
c@89
|
272
|
c@89
|
273 OutputDescriptor beat;
|
c@89
|
274 beat.identifier = "beats";
|
c@89
|
275 beat.name = "Beats";
|
c@89
|
276 beat.description = "Beat locations labelled with metrical position";
|
c@89
|
277 beat.unit = "";
|
c@89
|
278 beat.hasFixedBinCount = true;
|
c@89
|
279 beat.binCount = 0;
|
c@89
|
280 beat.sampleType = OutputDescriptor::VariableSampleRate;
|
c@89
|
281 beat.sampleRate = 1.0 / m_stepSecs;
|
c@89
|
282
|
c@89
|
283 OutputDescriptor bars;
|
c@89
|
284 bars.identifier = "bars";
|
c@89
|
285 bars.name = "Bars";
|
c@89
|
286 bars.description = "Bar locations";
|
c@89
|
287 bars.unit = "";
|
c@89
|
288 bars.hasFixedBinCount = true;
|
c@89
|
289 bars.binCount = 0;
|
c@89
|
290 bars.sampleType = OutputDescriptor::VariableSampleRate;
|
c@89
|
291 bars.sampleRate = 1.0 / m_stepSecs;
|
c@89
|
292
|
c@89
|
293 OutputDescriptor beatcounts;
|
c@89
|
294 beatcounts.identifier = "beatcounts";
|
c@89
|
295 beatcounts.name = "Beat Count";
|
c@89
|
296 beatcounts.description = "Beat counter function";
|
c@89
|
297 beatcounts.unit = "";
|
c@89
|
298 beatcounts.hasFixedBinCount = true;
|
c@89
|
299 beatcounts.binCount = 1;
|
c@89
|
300 beatcounts.sampleType = OutputDescriptor::VariableSampleRate;
|
c@89
|
301 beatcounts.sampleRate = 1.0 / m_stepSecs;
|
c@89
|
302
|
c@90
|
303 OutputDescriptor beatsd;
|
c@90
|
304 beatsd.identifier = "beatsd";
|
c@90
|
305 beatsd.name = "Beat Spectral Difference";
|
c@90
|
306 beatsd.description = "Beat spectral difference function used for bar-line detection";
|
c@90
|
307 beatsd.unit = "";
|
c@90
|
308 beatsd.hasFixedBinCount = true;
|
c@90
|
309 beatsd.binCount = 1;
|
c@90
|
310 beatsd.sampleType = OutputDescriptor::VariableSampleRate;
|
c@90
|
311 beatsd.sampleRate = 1.0 / m_stepSecs;
|
c@90
|
312
|
c@89
|
313 list.push_back(beat);
|
c@89
|
314 list.push_back(bars);
|
c@89
|
315 list.push_back(beatcounts);
|
c@90
|
316 list.push_back(beatsd);
|
c@89
|
317
|
c@89
|
318 return list;
|
c@89
|
319 }
|
c@89
|
320
|
c@89
|
321 BarBeatTracker::FeatureSet
|
c@89
|
322 BarBeatTracker::process(const float *const *inputBuffers,
|
c@89
|
323 Vamp::RealTime timestamp)
|
c@89
|
324 {
|
c@89
|
325 if (!m_d) {
|
luis@144
|
326 cerr << "ERROR: BarBeatTracker::process: "
|
luis@144
|
327 << "BarBeatTracker has not been initialised"
|
luis@144
|
328 << endl;
|
luis@144
|
329 return FeatureSet();
|
c@89
|
330 }
|
c@89
|
331
|
c@89
|
332 // We use time domain input, because DownBeat requires it -- so we
|
c@89
|
333 // use the time-domain version of DetectionFunction::process which
|
c@89
|
334 // does its own FFT. It requires doubles as input, so we need to
|
c@89
|
335 // make a temporary copy
|
c@89
|
336
|
c@89
|
337 // We only support a single input channel
|
c@89
|
338
|
c@89
|
339 const int fl = m_d->dfConfig.frameLength;
|
c@190
|
340 double *dfinput = new double[fl];
|
c@89
|
341
|
c@190
|
342 for (int i = 0; i < fl; ++i) dfinput[i] = inputBuffers[0][i];
|
c@153
|
343 double output = m_d->df->processTimeDomain(dfinput);
|
c@89
|
344
|
c@190
|
345 delete[] dfinput;
|
c@190
|
346
|
c@89
|
347 if (m_d->dfOutput.empty()) m_d->origin = timestamp;
|
c@89
|
348
|
c@93
|
349 // std::cerr << "df[" << m_d->dfOutput.size() << "] is " << output << std::endl;
|
c@89
|
350 m_d->dfOutput.push_back(output);
|
c@89
|
351
|
c@89
|
352 // Downsample and store the incoming audio block.
|
c@89
|
353 // We have an overlap on the incoming audio stream (step size is
|
c@89
|
354 // half block size) -- this function is configured to take only a
|
c@89
|
355 // step size's worth, so effectively ignoring the overlap. Note
|
c@89
|
356 // however that this means we omit the last blocksize - stepsize
|
c@89
|
357 // samples completely for the purposes of barline detection
|
c@89
|
358 // (hopefully not a problem)
|
c@89
|
359 m_d->downBeat->pushAudioBlock(inputBuffers[0]);
|
c@89
|
360
|
c@89
|
361 return FeatureSet();
|
c@89
|
362 }
|
c@89
|
363
|
c@89
|
364 BarBeatTracker::FeatureSet
|
c@89
|
365 BarBeatTracker::getRemainingFeatures()
|
c@89
|
366 {
|
c@89
|
367 if (!m_d) {
|
luis@144
|
368 cerr << "ERROR: BarBeatTracker::getRemainingFeatures: "
|
luis@144
|
369 << "BarBeatTracker has not been initialised"
|
luis@144
|
370 << endl;
|
luis@144
|
371 return FeatureSet();
|
c@89
|
372 }
|
c@89
|
373
|
c@89
|
374 return barBeatTrack();
|
c@89
|
375 }
|
c@89
|
376
|
c@89
|
377 BarBeatTracker::FeatureSet
|
c@89
|
378 BarBeatTracker::barBeatTrack()
|
c@89
|
379 {
|
c@89
|
380 vector<double> df;
|
c@89
|
381 vector<double> beatPeriod;
|
c@89
|
382 vector<double> tempi;
|
c@89
|
383
|
c@89
|
384 for (size_t i = 2; i < m_d->dfOutput.size(); ++i) { // discard first two elts
|
c@89
|
385 df.push_back(m_d->dfOutput[i]);
|
c@89
|
386 beatPeriod.push_back(0.0);
|
c@89
|
387 }
|
c@89
|
388 if (df.empty()) return FeatureSet();
|
c@89
|
389
|
c@89
|
390 TempoTrackV2 tt(m_inputSampleRate, m_d->dfConfig.stepSize);
|
luis@144
|
391
|
luis@144
|
392 // changes are as per the BeatTrack.cpp - allow m_inputtempo and m_constraintempo to be set be the user
|
luis@144
|
393 tt.calculateBeatPeriod(df, beatPeriod, tempi, m_inputtempo, m_constraintempo);
|
c@89
|
394
|
c@89
|
395 vector<double> beats;
|
luis@144
|
396 // changes are as per the BeatTrack.cpp - allow m_alpha and m_tightness to be set be the user
|
luis@144
|
397 tt.calculateBeats(df, beatPeriod, beats, m_alpha, m_tightness);
|
luis@144
|
398
|
luis@144
|
399 // tt.calculateBeatPeriod(df, beatPeriod, tempi, 0., 0); // use default parameters
|
luis@144
|
400
|
luis@144
|
401 // vector<double> beats;
|
luis@144
|
402 // tt.calculateBeats(df, beatPeriod, beats, 0.9, 4.); // use default parameters until i fix this plugin too
|
c@89
|
403
|
c@89
|
404 vector<int> downbeats;
|
c@89
|
405 size_t downLength = 0;
|
c@89
|
406 const float *downsampled = m_d->downBeat->getBufferedAudio(downLength);
|
c@89
|
407 m_d->downBeat->findDownBeats(downsampled, downLength, beats, downbeats);
|
c@89
|
408
|
c@90
|
409 vector<double> beatsd;
|
c@90
|
410 m_d->downBeat->getBeatSD(beatsd);
|
c@90
|
411
|
c@89
|
412 // std::cerr << "BarBeatTracker: found downbeats at: ";
|
c@89
|
413 // for (int i = 0; i < downbeats.size(); ++i) std::cerr << downbeats[i] << " " << std::endl;
|
luis@144
|
414
|
c@89
|
415 FeatureSet returnFeatures;
|
c@89
|
416
|
c@89
|
417 char label[20];
|
c@89
|
418
|
c@89
|
419 int dbi = 0;
|
c@89
|
420 int beat = 0;
|
c@89
|
421 int bar = 0;
|
c@89
|
422
|
c@124
|
423 if (!downbeats.empty()) {
|
c@124
|
424 // get the right number for the first beat; this will be
|
c@124
|
425 // incremented before use (at top of the following loop)
|
c@124
|
426 int firstDown = downbeats[0];
|
c@124
|
427 beat = m_bpb - firstDown - 1;
|
c@124
|
428 if (beat == m_bpb) beat = 0;
|
c@124
|
429 }
|
c@124
|
430
|
c@178
|
431 for (int i = 0; i < int(beats.size()); ++i) {
|
c@89
|
432
|
c@178
|
433 size_t frame = size_t(beats[i]) * m_d->dfConfig.stepSize;
|
c@89
|
434
|
c@178
|
435 if (dbi < int(downbeats.size()) && i == downbeats[dbi]) {
|
c@89
|
436 beat = 0;
|
c@89
|
437 ++bar;
|
c@89
|
438 ++dbi;
|
c@89
|
439 } else {
|
c@89
|
440 ++beat;
|
c@89
|
441 }
|
c@89
|
442
|
c@89
|
443 // outputs are:
|
c@89
|
444 //
|
c@89
|
445 // 0 -> beats
|
c@89
|
446 // 1 -> bars
|
c@89
|
447 // 2 -> beat counter function
|
luis@144
|
448
|
c@178
|
449 Feature feature;
|
c@178
|
450 feature.hasTimestamp = true;
|
c@178
|
451 feature.timestamp = m_d->origin + Vamp::RealTime::frame2RealTime
|
c@178
|
452 (frame, lrintf(m_inputSampleRate));
|
c@89
|
453
|
c@89
|
454 sprintf(label, "%d", beat + 1);
|
c@89
|
455 feature.label = label;
|
c@178
|
456 returnFeatures[0].push_back(feature); // labelled beats
|
c@89
|
457
|
c@89
|
458 feature.values.push_back(beat + 1);
|
c@89
|
459 returnFeatures[2].push_back(feature); // beat function
|
c@89
|
460
|
c@178
|
461 if (i > 0 && i <= int(beatsd.size())) {
|
c@90
|
462 feature.values.clear();
|
c@90
|
463 feature.values.push_back(beatsd[i-1]);
|
c@90
|
464 feature.label = "";
|
c@90
|
465 returnFeatures[3].push_back(feature); // beat spectral difference
|
c@90
|
466 }
|
c@90
|
467
|
c@89
|
468 if (beat == 0) {
|
c@89
|
469 feature.values.clear();
|
c@89
|
470 sprintf(label, "%d", bar);
|
c@89
|
471 feature.label = label;
|
c@89
|
472 returnFeatures[1].push_back(feature); // bars
|
c@89
|
473 }
|
c@89
|
474 }
|
c@89
|
475
|
c@89
|
476 return returnFeatures;
|
c@89
|
477 }
|
c@89
|
478
|