annotate src/Silvet.cpp @ 165:f73be84f5c90

Use 20ms resolution in hq mode, 40ms only in draft mode
author Chris Cannam
date Tue, 20 May 2014 16:48:33 +0100
parents 629c9525b815
children 7979fa40c9f7
rev   line source
Chris@31 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
Chris@31 2
Chris@31 3 /*
Chris@31 4 Silvet
Chris@31 5
Chris@31 6 A Vamp plugin for note transcription.
Chris@31 7 Centre for Digital Music, Queen Mary University of London.
Chris@31 8
Chris@31 9 This program is free software; you can redistribute it and/or
Chris@31 10 modify it under the terms of the GNU General Public License as
Chris@31 11 published by the Free Software Foundation; either version 2 of the
Chris@31 12 License, or (at your option) any later version. See the file
Chris@31 13 COPYING included with this distribution for more information.
Chris@31 14 */
Chris@31 15
Chris@31 16 #include "Silvet.h"
Chris@34 17 #include "EM.h"
Chris@31 18
Chris@152 19 #include <cq/CQSpectrogram.h>
Chris@31 20
Chris@152 21 #include "MedianFilter.h"
Chris@152 22 #include "constant-q-cpp/src/dsp/Resampler.h"
Chris@31 23
Chris@31 24 #include <vector>
Chris@31 25
Chris@32 26 #include <cstdio>
Chris@32 27
Chris@31 28 using std::vector;
Chris@48 29 using std::cout;
Chris@31 30 using std::cerr;
Chris@31 31 using std::endl;
Chris@40 32 using Vamp::RealTime;
Chris@31 33
Chris@31 34 static int processingSampleRate = 44100;
Chris@31 35 static int processingBPO = 60;
Chris@32 36 static int processingHeight = 545;
Chris@38 37 static int processingNotes = 88;
Chris@31 38
Chris@31 39 Silvet::Silvet(float inputSampleRate) :
Chris@31 40 Plugin(inputSampleRate),
Chris@161 41 m_instruments(InstrumentPack::listInstrumentPacks()),
Chris@31 42 m_resampler(0),
Chris@110 43 m_cq(0),
Chris@162 44 m_hqMode(true),
Chris@162 45 m_instrument(0)
Chris@31 46 {
Chris@31 47 }
Chris@31 48
Chris@31 49 Silvet::~Silvet()
Chris@31 50 {
Chris@31 51 delete m_resampler;
Chris@31 52 delete m_cq;
Chris@41 53 for (int i = 0; i < (int)m_postFilter.size(); ++i) {
Chris@41 54 delete m_postFilter[i];
Chris@41 55 }
Chris@31 56 }
Chris@31 57
Chris@31 58 string
Chris@31 59 Silvet::getIdentifier() const
Chris@31 60 {
Chris@31 61 return "silvet";
Chris@31 62 }
Chris@31 63
Chris@31 64 string
Chris@31 65 Silvet::getName() const
Chris@31 66 {
Chris@31 67 return "Silvet Note Transcription";
Chris@31 68 }
Chris@31 69
Chris@31 70 string
Chris@31 71 Silvet::getDescription() const
Chris@31 72 {
Chris@31 73 // Return something helpful here!
Chris@31 74 return "";
Chris@31 75 }
Chris@31 76
Chris@31 77 string
Chris@31 78 Silvet::getMaker() const
Chris@31 79 {
Chris@31 80 // Your name here
Chris@31 81 return "";
Chris@31 82 }
Chris@31 83
Chris@31 84 int
Chris@31 85 Silvet::getPluginVersion() const
Chris@31 86 {
Chris@31 87 return 1;
Chris@31 88 }
Chris@31 89
Chris@31 90 string
Chris@31 91 Silvet::getCopyright() const
Chris@31 92 {
Chris@31 93 // This function is not ideally named. It does not necessarily
Chris@31 94 // need to say who made the plugin -- getMaker does that -- but it
Chris@31 95 // should indicate the terms under which it is distributed. For
Chris@31 96 // example, "Copyright (year). All Rights Reserved", or "GPL"
Chris@31 97 return "";
Chris@31 98 }
Chris@31 99
Chris@31 100 Silvet::InputDomain
Chris@31 101 Silvet::getInputDomain() const
Chris@31 102 {
Chris@31 103 return TimeDomain;
Chris@31 104 }
Chris@31 105
Chris@31 106 size_t
Chris@31 107 Silvet::getPreferredBlockSize() const
Chris@31 108 {
Chris@31 109 return 0;
Chris@31 110 }
Chris@31 111
Chris@31 112 size_t
Chris@31 113 Silvet::getPreferredStepSize() const
Chris@31 114 {
Chris@31 115 return 0;
Chris@31 116 }
Chris@31 117
Chris@31 118 size_t
Chris@31 119 Silvet::getMinChannelCount() const
Chris@31 120 {
Chris@31 121 return 1;
Chris@31 122 }
Chris@31 123
Chris@31 124 size_t
Chris@31 125 Silvet::getMaxChannelCount() const
Chris@31 126 {
Chris@31 127 return 1;
Chris@31 128 }
Chris@31 129
Chris@31 130 Silvet::ParameterList
Chris@31 131 Silvet::getParameterDescriptors() const
Chris@31 132 {
Chris@31 133 ParameterList list;
Chris@110 134
Chris@110 135 ParameterDescriptor desc;
Chris@110 136 desc.identifier = "mode";
Chris@110 137 desc.name = "Processing mode";
Chris@110 138 desc.unit = "";
Chris@110 139 desc.description = "Determines the tradeoff of processing speed against transcription quality";
Chris@110 140 desc.minValue = 0;
Chris@110 141 desc.maxValue = 1;
Chris@113 142 desc.defaultValue = 1;
Chris@110 143 desc.isQuantized = true;
Chris@110 144 desc.quantizeStep = 1;
Chris@165 145 desc.valueNames.push_back("Draft (faster)");
Chris@165 146 desc.valueNames.push_back("Intensive (higher quality)");
Chris@161 147 list.push_back(desc);
Chris@161 148
Chris@161 149 desc.identifier = "soloinstrument";
Chris@165 150 desc.name = "Solo instrument";
Chris@161 151 desc.unit = "";
Chris@162 152 desc.description = "The instrument known to be present in the recording, if there is only one";
Chris@161 153 desc.minValue = 0;
Chris@162 154 desc.maxValue = m_instruments.size()-1;
Chris@162 155 desc.defaultValue = 0;
Chris@161 156 desc.isQuantized = true;
Chris@161 157 desc.quantizeStep = 1;
Chris@161 158 desc.valueNames.clear();
Chris@162 159 for (int i = 0; i < int(m_instruments.size()); ++i) {
Chris@162 160 desc.valueNames.push_back(m_instruments[i].name);
Chris@162 161 }
Chris@161 162
Chris@110 163 list.push_back(desc);
Chris@110 164
Chris@31 165 return list;
Chris@31 166 }
Chris@31 167
Chris@31 168 float
Chris@31 169 Silvet::getParameter(string identifier) const
Chris@31 170 {
Chris@110 171 if (identifier == "mode") {
Chris@110 172 return m_hqMode ? 1.f : 0.f;
Chris@162 173 } else if (identifier == "soloinstrument") {
Chris@162 174 return m_instrument;
Chris@110 175 }
Chris@31 176 return 0;
Chris@31 177 }
Chris@31 178
Chris@31 179 void
Chris@31 180 Silvet::setParameter(string identifier, float value)
Chris@31 181 {
Chris@110 182 if (identifier == "mode") {
Chris@110 183 m_hqMode = (value > 0.5);
Chris@162 184 } else if (identifier == "soloinstrument") {
Chris@162 185 m_instrument = lrintf(value);
Chris@110 186 }
Chris@31 187 }
Chris@31 188
Chris@31 189 Silvet::ProgramList
Chris@31 190 Silvet::getPrograms() const
Chris@31 191 {
Chris@31 192 ProgramList list;
Chris@31 193 return list;
Chris@31 194 }
Chris@31 195
Chris@31 196 string
Chris@31 197 Silvet::getCurrentProgram() const
Chris@31 198 {
Chris@31 199 return "";
Chris@31 200 }
Chris@31 201
Chris@31 202 void
Chris@31 203 Silvet::selectProgram(string name)
Chris@31 204 {
Chris@31 205 }
Chris@31 206
Chris@31 207 Silvet::OutputList
Chris@31 208 Silvet::getOutputDescriptors() const
Chris@31 209 {
Chris@31 210 OutputList list;
Chris@31 211
Chris@31 212 OutputDescriptor d;
Chris@51 213 d.identifier = "notes";
Chris@51 214 d.name = "Note transcription";
Chris@162 215 d.description = "Overall note transcription across selected instruments";
Chris@41 216 d.unit = "Hz";
Chris@31 217 d.hasFixedBinCount = true;
Chris@31 218 d.binCount = 2;
Chris@41 219 d.binNames.push_back("Frequency");
Chris@31 220 d.binNames.push_back("Velocity");
Chris@31 221 d.hasKnownExtents = false;
Chris@31 222 d.isQuantized = false;
Chris@31 223 d.sampleType = OutputDescriptor::VariableSampleRate;
Chris@51 224 d.sampleRate = m_inputSampleRate / (m_cq ? m_cq->getColumnHop() : 62);
Chris@31 225 d.hasDuration = true;
Chris@32 226 m_notesOutputNo = list.size();
Chris@32 227 list.push_back(d);
Chris@32 228
Chris@31 229 return list;
Chris@31 230 }
Chris@31 231
Chris@38 232 std::string
Chris@38 233 Silvet::noteName(int i) const
Chris@38 234 {
Chris@38 235 static const char *names[] = {
Chris@38 236 "A", "A#", "B", "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#"
Chris@38 237 };
Chris@38 238
Chris@38 239 const char *n = names[i % 12];
Chris@38 240
Chris@38 241 int oct = (i + 9) / 12;
Chris@38 242
Chris@38 243 char buf[20];
Chris@38 244 sprintf(buf, "%s%d", n, oct);
Chris@38 245
Chris@38 246 return buf;
Chris@38 247 }
Chris@38 248
Chris@41 249 float
Chris@41 250 Silvet::noteFrequency(int note) const
Chris@41 251 {
Chris@41 252 return float(27.5 * pow(2.0, note / 12.0));
Chris@41 253 }
Chris@41 254
Chris@31 255 bool
Chris@31 256 Silvet::initialise(size_t channels, size_t stepSize, size_t blockSize)
Chris@31 257 {
Chris@31 258 if (channels < getMinChannelCount() ||
Chris@31 259 channels > getMaxChannelCount()) return false;
Chris@31 260
Chris@31 261 if (stepSize != blockSize) {
Chris@31 262 cerr << "Silvet::initialise: Step size must be the same as block size ("
Chris@31 263 << stepSize << " != " << blockSize << ")" << endl;
Chris@31 264 return false;
Chris@31 265 }
Chris@31 266
Chris@31 267 m_blockSize = blockSize;
Chris@31 268
Chris@31 269 reset();
Chris@31 270
Chris@31 271 return true;
Chris@31 272 }
Chris@31 273
Chris@31 274 void
Chris@31 275 Silvet::reset()
Chris@31 276 {
Chris@31 277 delete m_resampler;
Chris@31 278 delete m_cq;
Chris@31 279
Chris@31 280 if (m_inputSampleRate != processingSampleRate) {
Chris@31 281 m_resampler = new Resampler(m_inputSampleRate, processingSampleRate);
Chris@31 282 } else {
Chris@31 283 m_resampler = 0;
Chris@31 284 }
Chris@31 285
Chris@154 286 CQParameters params(processingSampleRate,
Chris@154 287 27.5,
Chris@154 288 processingSampleRate / 3,
Chris@154 289 processingBPO);
Chris@154 290
Chris@155 291 params.q = 0.95; // MIREX code uses 0.8, but it seems 0.9 or lower
Chris@155 292 // drops the FFT size to 512 from 1024 and alters
Chris@155 293 // some other processing parameters, making
Chris@155 294 // everything much, much slower. Could be a flaw
Chris@155 295 // in the CQ parameter calculations, must check
Chris@154 296 params.atomHopFactor = 0.3;
Chris@154 297 params.threshold = 0.0005;
Chris@155 298 params.window = CQParameters::Hann; //!!! todo: test whether it makes any difference
Chris@154 299
Chris@154 300 m_cq = new CQSpectrogram(params, CQSpectrogram::InterpolateLinear);
Chris@31 301
Chris@165 302 m_colsPerSec = m_hqMode ? 50 : 25;
Chris@165 303
Chris@41 304 for (int i = 0; i < (int)m_postFilter.size(); ++i) {
Chris@41 305 delete m_postFilter[i];
Chris@41 306 }
Chris@41 307 m_postFilter.clear();
Chris@41 308 for (int i = 0; i < processingNotes; ++i) {
Chris@41 309 m_postFilter.push_back(new MedianFilter<double>(3));
Chris@41 310 }
Chris@41 311 m_pianoRoll.clear();
Chris@32 312 m_columnCount = 0;
Chris@40 313 m_startTime = RealTime::zeroTime;
Chris@31 314 }
Chris@31 315
Chris@31 316 Silvet::FeatureSet
Chris@31 317 Silvet::process(const float *const *inputBuffers, Vamp::RealTime timestamp)
Chris@31 318 {
Chris@40 319 if (m_columnCount == 0) {
Chris@40 320 m_startTime = timestamp;
Chris@40 321 }
Chris@40 322
Chris@31 323 vector<double> data;
Chris@40 324 for (int i = 0; i < m_blockSize; ++i) {
Chris@40 325 data.push_back(inputBuffers[0][i]);
Chris@40 326 }
Chris@31 327
Chris@31 328 if (m_resampler) {
Chris@31 329 data = m_resampler->process(data.data(), data.size());
Chris@31 330 }
Chris@31 331
Chris@32 332 Grid cqout = m_cq->process(data);
Chris@51 333 FeatureSet fs = transcribe(cqout);
Chris@51 334 return fs;
Chris@34 335 }
Chris@34 336
Chris@34 337 Silvet::FeatureSet
Chris@34 338 Silvet::getRemainingFeatures()
Chris@34 339 {
Chris@145 340 Grid cqout = m_cq->getRemainingOutput();
Chris@51 341 FeatureSet fs = transcribe(cqout);
Chris@51 342 return fs;
Chris@34 343 }
Chris@34 344
Chris@34 345 Silvet::FeatureSet
Chris@34 346 Silvet::transcribe(const Grid &cqout)
Chris@34 347 {
Chris@32 348 Grid filtered = preProcess(cqout);
Chris@31 349
Chris@32 350 FeatureSet fs;
Chris@32 351
Chris@104 352 if (filtered.empty()) return fs;
Chris@104 353
Chris@34 354 int width = filtered.size();
Chris@34 355
Chris@164 356 int iterations = m_hqMode ? 20 : 10;
Chris@34 357
Chris@123 358 Grid pitchMatrix(width, vector<double>(processingNotes));
Chris@37 359
Chris@123 360 #pragma omp parallel for
Chris@123 361 for (int i = 0; i < width; ++i) {
Chris@104 362
Chris@123 363 double sum = 0.0;
Chris@123 364 for (int j = 0; j < processingHeight; ++j) {
Chris@123 365 sum += filtered.at(i).at(j);
Chris@37 366 }
Chris@37 367
Chris@123 368 if (sum < 1e-5) continue;
Chris@37 369
Chris@162 370 EM em(&m_instruments[m_instrument], m_hqMode);
Chris@104 371
Chris@123 372 for (int j = 0; j < iterations; ++j) {
Chris@123 373 em.iterate(filtered.at(i).data());
Chris@34 374 }
Chris@104 375
Chris@151 376 const float *pitches = em.getPitchDistribution();
Chris@150 377
Chris@123 378 for (int j = 0; j < processingNotes; ++j) {
Chris@123 379 pitchMatrix[i][j] = pitches[j] * sum;
Chris@123 380 }
Chris@123 381 }
Chris@37 382
Chris@123 383 for (int i = 0; i < width; ++i) {
Chris@123 384
Chris@123 385 FeatureList noteFeatures = postProcess(pitchMatrix[i]);
Chris@38 386
Chris@123 387 for (FeatureList::const_iterator fi = noteFeatures.begin();
Chris@123 388 fi != noteFeatures.end(); ++fi) {
Chris@123 389 fs[m_notesOutputNo].push_back(*fi);
Chris@40 390 }
Chris@34 391 }
Chris@34 392
Chris@32 393 return fs;
Chris@31 394 }
Chris@31 395
Chris@32 396 Silvet::Grid
Chris@32 397 Silvet::preProcess(const Grid &in)
Chris@32 398 {
Chris@32 399 int width = in.size();
Chris@32 400
Chris@165 401 int spacing = processingSampleRate / m_colsPerSec;
Chris@32 402
Chris@165 403 // need to be careful that col spacing is an integer number of samples!
Chris@165 404 assert(spacing * m_colsPerSec == processingSampleRate);
Chris@32 405
Chris@32 406 Grid out;
Chris@32 407
Chris@58 408 // We count the CQ latency in terms of processing hops, but
Chris@58 409 // actually it probably isn't an exact number of hops so this
Chris@58 410 // isn't quite accurate. But the small constant offset is
Chris@165 411 // practically irrelevant compared to the jitter from the frame
Chris@165 412 // size we reduce to in a moment
Chris@33 413 int latentColumns = m_cq->getLatency() / m_cq->getColumnHop();
Chris@33 414
Chris@32 415 for (int i = 0; i < width; ++i) {
Chris@32 416
Chris@33 417 if (m_columnCount < latentColumns) {
Chris@33 418 ++m_columnCount;
Chris@33 419 continue;
Chris@33 420 }
Chris@33 421
Chris@32 422 int prevSampleNo = (m_columnCount - 1) * m_cq->getColumnHop();
Chris@32 423 int sampleNo = m_columnCount * m_cq->getColumnHop();
Chris@32 424
Chris@32 425 bool select = (sampleNo / spacing != prevSampleNo / spacing);
Chris@32 426
Chris@32 427 if (select) {
Chris@32 428 vector<double> inCol = in[i];
Chris@32 429 vector<double> outCol(processingHeight);
Chris@32 430
Chris@32 431 // we reverse the column as we go (the CQ output is
Chris@32 432 // "upside-down", with high frequencies at the start of
Chris@32 433 // each column, and we want it the other way around) and
Chris@32 434 // then ignore the first 55 (lowest-frequency) bins,
Chris@32 435 // giving us 545 bins instead of 600
Chris@32 436
Chris@32 437 for (int j = 0; j < processingHeight; ++j) {
Chris@46 438 int ix = inCol.size() - j - 55;
Chris@46 439 outCol[j] = inCol[ix];
Chris@46 440 }
Chris@32 441
Chris@46 442 vector<double> noiseLevel1 =
Chris@46 443 MedianFilter<double>::filter(40, outCol);
Chris@46 444 for (int j = 0; j < processingHeight; ++j) {
Chris@46 445 noiseLevel1[j] = std::min(outCol[j], noiseLevel1[j]);
Chris@46 446 }
Chris@32 447
Chris@46 448 vector<double> noiseLevel2 =
Chris@46 449 MedianFilter<double>::filter(40, noiseLevel1);
Chris@46 450 for (int j = 0; j < processingHeight; ++j) {
Chris@46 451 outCol[j] = std::max(outCol[j] - noiseLevel2[j], 0.0);
Chris@32 452 }
Chris@32 453
Chris@165 454 out.push_back(outCol);
Chris@32 455 }
Chris@32 456
Chris@32 457 ++m_columnCount;
Chris@32 458 }
Chris@32 459
Chris@32 460 return out;
Chris@32 461 }
Chris@32 462
Chris@41 463 Vamp::Plugin::FeatureList
Chris@41 464 Silvet::postProcess(const vector<double> &pitches)
Chris@41 465 {
Chris@41 466 vector<double> filtered;
Chris@41 467
Chris@41 468 for (int j = 0; j < processingNotes; ++j) {
Chris@55 469 m_postFilter[j]->push(pitches[j]);
Chris@41 470 filtered.push_back(m_postFilter[j]->get());
Chris@41 471 }
Chris@41 472
Chris@69 473 int postFilterLatency = int(m_postFilter[0]->getSize() / 2);
Chris@69 474
Chris@41 475 // Threshold for level and reduce number of candidate pitches
Chris@41 476
Chris@41 477 int polyphony = 5;
Chris@150 478
Chris@150 479 //!!! make this a parameter (was 4.8, try adjusting, compare levels against matlab code)
Chris@150 480 double threshold = 6;
Chris@154 481 // double threshold = 4.8;
Chris@41 482
Chris@41 483 typedef std::multimap<double, int> ValueIndexMap;
Chris@41 484
Chris@41 485 ValueIndexMap strengths;
Chris@41 486 for (int j = 0; j < processingNotes; ++j) {
Chris@41 487 strengths.insert(ValueIndexMap::value_type(filtered[j], j));
Chris@41 488 }
Chris@41 489
Chris@55 490 map<int, double> active;
Chris@41 491 ValueIndexMap::const_iterator si = strengths.end();
Chris@45 492 while (int(active.size()) < polyphony) {
Chris@41 493 --si;
Chris@41 494 if (si->first < threshold) break;
Chris@152 495 // cerr << si->second << " : " << si->first << endl;
Chris@55 496 active[si->second] = si->first;
Chris@45 497 if (si == strengths.begin()) break;
Chris@41 498 }
Chris@41 499
Chris@41 500 // Minimum duration pruning, and conversion to notes. We can only
Chris@41 501 // report notes that have just ended (i.e. that are absent in the
Chris@41 502 // latest active set but present in the last set in the piano
Chris@41 503 // roll) -- any notes that ended earlier will have been reported
Chris@41 504 // already, and if they haven't ended, we don't know their
Chris@41 505 // duration.
Chris@41 506
Chris@41 507 int width = m_pianoRoll.size();
Chris@41 508
Chris@165 509 double columnDuration = 1.0 / m_colsPerSec;
Chris@165 510
Chris@165 511 // only keep notes >= 100ms or thereabouts
Chris@165 512 int durationThreshold = floor(0.1 / columnDuration); // columns
Chris@165 513 if (durationThreshold < 1) durationThreshold = 1;
Chris@41 514
Chris@41 515 FeatureList noteFeatures;
Chris@41 516
Chris@41 517 if (width < durationThreshold + 1) {
Chris@41 518 m_pianoRoll.push_back(active);
Chris@41 519 return noteFeatures;
Chris@41 520 }
Chris@41 521
Chris@150 522 //!!! try: 20ms intervals in intensive mode
Chris@150 523 //!!! try: repeated note detection? (look for change in first derivative of the pitch matrix)
Chris@150 524
Chris@55 525 for (map<int, double>::const_iterator ni = m_pianoRoll[width-1].begin();
Chris@41 526 ni != m_pianoRoll[width-1].end(); ++ni) {
Chris@41 527
Chris@55 528 int note = ni->first;
Chris@41 529
Chris@41 530 if (active.find(note) != active.end()) {
Chris@41 531 // the note is still playing
Chris@41 532 continue;
Chris@41 533 }
Chris@41 534
Chris@41 535 // the note was playing but just ended
Chris@41 536 int end = width;
Chris@41 537 int start = end-1;
Chris@41 538
Chris@57 539 double maxStrength = 0.0;
Chris@55 540
Chris@41 541 while (m_pianoRoll[start].find(note) != m_pianoRoll[start].end()) {
Chris@57 542 double strength = m_pianoRoll[start][note];
Chris@57 543 if (strength > maxStrength) {
Chris@57 544 maxStrength = strength;
Chris@57 545 }
Chris@41 546 --start;
Chris@41 547 }
Chris@41 548 ++start;
Chris@41 549
Chris@41 550 int duration = width - start;
Chris@62 551 // cerr << "duration " << duration << " for just-ended note " << note << endl;
Chris@41 552 if (duration < durationThreshold) {
Chris@41 553 // spurious
Chris@41 554 continue;
Chris@41 555 }
Chris@41 556
Chris@57 557 int velocity = maxStrength * 2;
Chris@55 558 if (velocity > 127) velocity = 127;
Chris@55 559
Chris@152 560 // cerr << "Found a genuine note, starting at " << columnDuration * start << " with duration " << columnDuration * duration << endl;
Chris@62 561
Chris@41 562 Feature nf;
Chris@41 563 nf.hasTimestamp = true;
Chris@69 564 nf.timestamp = RealTime::fromSeconds
Chris@150 565 (columnDuration * (start - postFilterLatency) + 0.02);
Chris@41 566 nf.hasDuration = true;
Chris@69 567 nf.duration = RealTime::fromSeconds
Chris@69 568 (columnDuration * duration);
Chris@41 569 nf.values.push_back(noteFrequency(note));
Chris@55 570 nf.values.push_back(velocity);
Chris@41 571 nf.label = noteName(note);
Chris@41 572 noteFeatures.push_back(nf);
Chris@41 573 }
Chris@41 574
Chris@41 575 m_pianoRoll.push_back(active);
Chris@41 576
Chris@62 577 // cerr << "returning " << noteFeatures.size() << " complete note(s) " << endl;
Chris@41 578
Chris@41 579 return noteFeatures;
Chris@41 580 }
Chris@41 581