annotate src/Silvet.cpp @ 51:782ca0d9ff3e

More outputs
author Chris Cannam
date Mon, 07 Apr 2014 17:07:36 +0100
parents 9b17bbd16a5f
children 22553e7b2a63
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@32 19 #include "maths/MedianFilter.h"
Chris@31 20 #include "dsp/rateconversion/Resampler.h"
Chris@31 21
Chris@32 22 #include "constant-q-cpp/cpp-qm-dsp/CQInterpolated.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@31 29 using std::cerr;
Chris@31 30 using std::endl;
Chris@40 31 using Vamp::RealTime;
Chris@31 32
Chris@31 33 static int processingSampleRate = 44100;
Chris@31 34 static int processingBPO = 60;
Chris@32 35 static int processingHeight = 545;
Chris@38 36 static int processingNotes = 88;
Chris@31 37
Chris@31 38 Silvet::Silvet(float inputSampleRate) :
Chris@31 39 Plugin(inputSampleRate),
Chris@31 40 m_resampler(0),
Chris@31 41 m_cq(0)
Chris@31 42 {
Chris@31 43 }
Chris@31 44
Chris@31 45 Silvet::~Silvet()
Chris@31 46 {
Chris@31 47 delete m_resampler;
Chris@31 48 delete m_cq;
Chris@41 49 for (int i = 0; i < (int)m_postFilter.size(); ++i) {
Chris@41 50 delete m_postFilter[i];
Chris@41 51 }
Chris@31 52 }
Chris@31 53
Chris@31 54 string
Chris@31 55 Silvet::getIdentifier() const
Chris@31 56 {
Chris@31 57 return "silvet";
Chris@31 58 }
Chris@31 59
Chris@31 60 string
Chris@31 61 Silvet::getName() const
Chris@31 62 {
Chris@31 63 return "Silvet Note Transcription";
Chris@31 64 }
Chris@31 65
Chris@31 66 string
Chris@31 67 Silvet::getDescription() const
Chris@31 68 {
Chris@31 69 // Return something helpful here!
Chris@31 70 return "";
Chris@31 71 }
Chris@31 72
Chris@31 73 string
Chris@31 74 Silvet::getMaker() const
Chris@31 75 {
Chris@31 76 // Your name here
Chris@31 77 return "";
Chris@31 78 }
Chris@31 79
Chris@31 80 int
Chris@31 81 Silvet::getPluginVersion() const
Chris@31 82 {
Chris@31 83 return 1;
Chris@31 84 }
Chris@31 85
Chris@31 86 string
Chris@31 87 Silvet::getCopyright() const
Chris@31 88 {
Chris@31 89 // This function is not ideally named. It does not necessarily
Chris@31 90 // need to say who made the plugin -- getMaker does that -- but it
Chris@31 91 // should indicate the terms under which it is distributed. For
Chris@31 92 // example, "Copyright (year). All Rights Reserved", or "GPL"
Chris@31 93 return "";
Chris@31 94 }
Chris@31 95
Chris@31 96 Silvet::InputDomain
Chris@31 97 Silvet::getInputDomain() const
Chris@31 98 {
Chris@31 99 return TimeDomain;
Chris@31 100 }
Chris@31 101
Chris@31 102 size_t
Chris@31 103 Silvet::getPreferredBlockSize() const
Chris@31 104 {
Chris@31 105 return 0;
Chris@31 106 }
Chris@31 107
Chris@31 108 size_t
Chris@31 109 Silvet::getPreferredStepSize() const
Chris@31 110 {
Chris@31 111 return 0;
Chris@31 112 }
Chris@31 113
Chris@31 114 size_t
Chris@31 115 Silvet::getMinChannelCount() const
Chris@31 116 {
Chris@31 117 return 1;
Chris@31 118 }
Chris@31 119
Chris@31 120 size_t
Chris@31 121 Silvet::getMaxChannelCount() const
Chris@31 122 {
Chris@31 123 return 1;
Chris@31 124 }
Chris@31 125
Chris@31 126 Silvet::ParameterList
Chris@31 127 Silvet::getParameterDescriptors() const
Chris@31 128 {
Chris@31 129 ParameterList list;
Chris@31 130 return list;
Chris@31 131 }
Chris@31 132
Chris@31 133 float
Chris@31 134 Silvet::getParameter(string identifier) const
Chris@31 135 {
Chris@31 136 return 0;
Chris@31 137 }
Chris@31 138
Chris@31 139 void
Chris@31 140 Silvet::setParameter(string identifier, float value)
Chris@31 141 {
Chris@31 142 }
Chris@31 143
Chris@31 144 Silvet::ProgramList
Chris@31 145 Silvet::getPrograms() const
Chris@31 146 {
Chris@31 147 ProgramList list;
Chris@31 148 return list;
Chris@31 149 }
Chris@31 150
Chris@31 151 string
Chris@31 152 Silvet::getCurrentProgram() const
Chris@31 153 {
Chris@31 154 return "";
Chris@31 155 }
Chris@31 156
Chris@31 157 void
Chris@31 158 Silvet::selectProgram(string name)
Chris@31 159 {
Chris@31 160 }
Chris@31 161
Chris@31 162 Silvet::OutputList
Chris@31 163 Silvet::getOutputDescriptors() const
Chris@31 164 {
Chris@31 165 OutputList list;
Chris@31 166
Chris@31 167 OutputDescriptor d;
Chris@51 168 d.identifier = "notes";
Chris@51 169 d.name = "Note transcription";
Chris@51 170 d.description = "Overall note transcription across all instruments";
Chris@41 171 d.unit = "Hz";
Chris@31 172 d.hasFixedBinCount = true;
Chris@31 173 d.binCount = 2;
Chris@41 174 d.binNames.push_back("Frequency");
Chris@31 175 d.binNames.push_back("Velocity");
Chris@31 176 d.hasKnownExtents = false;
Chris@31 177 d.isQuantized = false;
Chris@31 178 d.sampleType = OutputDescriptor::VariableSampleRate;
Chris@51 179 d.sampleRate = m_inputSampleRate / (m_cq ? m_cq->getColumnHop() : 62);
Chris@31 180 d.hasDuration = true;
Chris@32 181 m_notesOutputNo = list.size();
Chris@32 182 list.push_back(d);
Chris@32 183
Chris@51 184 d.identifier = "cq";
Chris@51 185 d.name = "Raw constant-Q";
Chris@51 186 d.description = "Unfiltered constant-Q time-frequency distribution";
Chris@51 187 d.unit = "";
Chris@51 188 d.hasFixedBinCount = true;
Chris@51 189 d.binCount = processingHeight + 55;
Chris@51 190 d.binNames.clear();
Chris@51 191 if (m_cq) {
Chris@51 192 char name[20];
Chris@51 193 for (int i = 0; i < processingHeight + 55; ++i) {
Chris@51 194 float freq = m_cq->getBinFrequency(i);
Chris@51 195 sprintf(name, "%.1f Hz", freq);
Chris@51 196 d.binNames.push_back(name);
Chris@51 197 }
Chris@51 198 }
Chris@51 199 d.hasKnownExtents = false;
Chris@51 200 d.isQuantized = false;
Chris@51 201 d.sampleType = OutputDescriptor::FixedSampleRate;
Chris@51 202 d.sampleRate = m_inputSampleRate / (m_cq ? m_cq->getColumnHop() : 62);
Chris@51 203 d.hasDuration = false;
Chris@51 204 m_cqOutputNo = list.size();
Chris@51 205 list.push_back(d);
Chris@51 206
Chris@32 207 d.identifier = "inputgrid";
Chris@51 208 d.name = "Filtered constant-Q";
Chris@51 209 d.description = "Filtered constant-Q time-frequency distribution used as input to the PLCA step";
Chris@32 210 d.unit = "";
Chris@32 211 d.hasFixedBinCount = true;
Chris@32 212 d.binCount = processingHeight;
Chris@32 213 d.binNames.clear();
Chris@32 214 if (m_cq) {
Chris@32 215 char name[20];
Chris@32 216 for (int i = 0; i < processingHeight; ++i) {
Chris@32 217 float freq = m_cq->getBinFrequency(i + 55);
Chris@32 218 sprintf(name, "%.1f Hz", freq);
Chris@32 219 d.binNames.push_back(name);
Chris@32 220 }
Chris@32 221 }
Chris@32 222 d.hasKnownExtents = false;
Chris@32 223 d.isQuantized = false;
Chris@32 224 d.sampleType = OutputDescriptor::FixedSampleRate;
Chris@32 225 d.sampleRate = 25;
Chris@32 226 d.hasDuration = false;
Chris@51 227 m_fcqOutputNo = list.size();
Chris@31 228 list.push_back(d);
Chris@31 229
Chris@51 230 d.identifier = "pitches";
Chris@51 231 d.name = "Pitch activation";
Chris@51 232 d.description = "Estimated pitch activation matrix";
Chris@38 233 d.unit = "";
Chris@38 234 d.hasFixedBinCount = true;
Chris@38 235 d.binCount = processingNotes;
Chris@38 236 d.binNames.clear();
Chris@38 237 for (int i = 0; i < processingNotes; ++i) {
Chris@38 238 d.binNames.push_back(noteName(i));
Chris@38 239 }
Chris@38 240 d.hasKnownExtents = false;
Chris@38 241 d.isQuantized = false;
Chris@38 242 d.sampleType = OutputDescriptor::FixedSampleRate;
Chris@38 243 d.sampleRate = 25;
Chris@38 244 d.hasDuration = false;
Chris@38 245 m_pitchOutputNo = list.size();
Chris@38 246 list.push_back(d);
Chris@38 247
Chris@31 248 return list;
Chris@31 249 }
Chris@31 250
Chris@38 251 std::string
Chris@38 252 Silvet::noteName(int i) const
Chris@38 253 {
Chris@38 254 static const char *names[] = {
Chris@38 255 "A", "A#", "B", "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#"
Chris@38 256 };
Chris@38 257
Chris@38 258 const char *n = names[i % 12];
Chris@38 259
Chris@38 260 int oct = (i + 9) / 12;
Chris@38 261
Chris@38 262 char buf[20];
Chris@38 263 sprintf(buf, "%s%d", n, oct);
Chris@38 264
Chris@38 265 return buf;
Chris@38 266 }
Chris@38 267
Chris@41 268 float
Chris@41 269 Silvet::noteFrequency(int note) const
Chris@41 270 {
Chris@41 271 return float(27.5 * pow(2.0, note / 12.0));
Chris@41 272 }
Chris@41 273
Chris@31 274 bool
Chris@31 275 Silvet::initialise(size_t channels, size_t stepSize, size_t blockSize)
Chris@31 276 {
Chris@31 277 if (channels < getMinChannelCount() ||
Chris@31 278 channels > getMaxChannelCount()) return false;
Chris@31 279
Chris@31 280 if (stepSize != blockSize) {
Chris@31 281 cerr << "Silvet::initialise: Step size must be the same as block size ("
Chris@31 282 << stepSize << " != " << blockSize << ")" << endl;
Chris@31 283 return false;
Chris@31 284 }
Chris@31 285
Chris@31 286 m_blockSize = blockSize;
Chris@31 287
Chris@31 288 reset();
Chris@31 289
Chris@31 290 return true;
Chris@31 291 }
Chris@31 292
Chris@31 293 void
Chris@31 294 Silvet::reset()
Chris@31 295 {
Chris@31 296 delete m_resampler;
Chris@31 297 delete m_cq;
Chris@31 298
Chris@31 299 if (m_inputSampleRate != processingSampleRate) {
Chris@31 300 m_resampler = new Resampler(m_inputSampleRate, processingSampleRate);
Chris@31 301 } else {
Chris@31 302 m_resampler = 0;
Chris@31 303 }
Chris@31 304
Chris@32 305 m_cq = new CQInterpolated
Chris@32 306 (processingSampleRate, 27.5, processingSampleRate / 3, processingBPO,
Chris@32 307 CQInterpolated::Linear);
Chris@31 308
Chris@41 309 for (int i = 0; i < (int)m_postFilter.size(); ++i) {
Chris@41 310 delete m_postFilter[i];
Chris@41 311 }
Chris@41 312 m_postFilter.clear();
Chris@41 313 for (int i = 0; i < processingNotes; ++i) {
Chris@41 314 m_postFilter.push_back(new MedianFilter<double>(3));
Chris@41 315 }
Chris@41 316 m_pianoRoll.clear();
Chris@32 317 m_columnCount = 0;
Chris@32 318 m_reducedColumnCount = 0;
Chris@40 319 m_startTime = RealTime::zeroTime;
Chris@31 320 }
Chris@31 321
Chris@31 322 Silvet::FeatureSet
Chris@31 323 Silvet::process(const float *const *inputBuffers, Vamp::RealTime timestamp)
Chris@31 324 {
Chris@40 325 if (m_columnCount == 0) {
Chris@40 326 m_startTime = timestamp;
Chris@40 327 }
Chris@40 328
Chris@31 329 vector<double> data;
Chris@40 330 for (int i = 0; i < m_blockSize; ++i) {
Chris@40 331 data.push_back(inputBuffers[0][i]);
Chris@40 332 }
Chris@31 333
Chris@31 334 if (m_resampler) {
Chris@31 335 data = m_resampler->process(data.data(), data.size());
Chris@31 336 }
Chris@31 337
Chris@32 338 Grid cqout = m_cq->process(data);
Chris@51 339 FeatureSet fs = transcribe(cqout);
Chris@51 340
Chris@51 341 for (int i = 0; i < (int)cqout.size(); ++i) {
Chris@51 342 Feature f;
Chris@51 343 for (int j = 0; j < (int)cqout[i].size(); ++j) {
Chris@51 344 f.values.push_back(float(cqout[i][j]));
Chris@51 345 }
Chris@51 346 fs[m_cqOutputNo].push_back(f);
Chris@51 347 }
Chris@51 348
Chris@51 349 return fs;
Chris@34 350 }
Chris@34 351
Chris@34 352 Silvet::FeatureSet
Chris@34 353 Silvet::getRemainingFeatures()
Chris@34 354 {
Chris@34 355 Grid cqout = m_cq->getRemainingBlocks();
Chris@51 356 FeatureSet fs = transcribe(cqout);
Chris@51 357
Chris@51 358 for (int i = 0; i < (int)cqout.size(); ++i) {
Chris@51 359 Feature f;
Chris@51 360 for (int j = 0; j < (int)cqout[i].size(); ++j) {
Chris@51 361 f.values.push_back(float(cqout[i][j]));
Chris@51 362 }
Chris@51 363 fs[m_cqOutputNo].push_back(f);
Chris@51 364 }
Chris@51 365
Chris@51 366 return fs;
Chris@34 367 }
Chris@34 368
Chris@34 369 Silvet::FeatureSet
Chris@34 370 Silvet::transcribe(const Grid &cqout)
Chris@34 371 {
Chris@32 372 Grid filtered = preProcess(cqout);
Chris@31 373
Chris@32 374 FeatureSet fs;
Chris@32 375
Chris@32 376 for (int i = 0; i < (int)filtered.size(); ++i) {
Chris@32 377 Feature f;
Chris@32 378 for (int j = 0; j < processingHeight; ++j) {
Chris@32 379 f.values.push_back(float(filtered[i][j]));
Chris@32 380 }
Chris@51 381 fs[m_fcqOutputNo].push_back(f);
Chris@32 382 }
Chris@32 383
Chris@34 384 int width = filtered.size();
Chris@34 385
Chris@34 386 int iterations = 12;
Chris@34 387
Chris@34 388 for (int i = 0; i < width; ++i) {
Chris@37 389
Chris@37 390 double sum = 0.0;
Chris@37 391 for (int j = 0; j < processingHeight; ++j) {
Chris@37 392 sum += filtered[i][j];
Chris@37 393 }
Chris@37 394
Chris@37 395 if (sum < 1e-5) continue;
Chris@37 396
Chris@34 397 EM em;
Chris@34 398 for (int j = 0; j < iterations; ++j) {
Chris@34 399 em.iterate(filtered[i]);
Chris@34 400 }
Chris@37 401
Chris@38 402 vector<double> pitches = em.getPitchDistribution();
Chris@41 403
Chris@41 404 for (int j = 0; j < processingNotes; ++j) {
Chris@41 405 pitches[j] *= sum;
Chris@41 406 }
Chris@41 407
Chris@38 408 Feature f;
Chris@41 409 for (int j = 0; j < processingNotes; ++j) {
Chris@41 410 f.values.push_back(float(pitches[j]));
Chris@38 411 }
Chris@38 412 fs[m_pitchOutputNo].push_back(f);
Chris@38 413
Chris@41 414 FeatureList noteFeatures = postProcess(pitches);
Chris@41 415 for (FeatureList::const_iterator fi = noteFeatures.begin();
Chris@41 416 fi != noteFeatures.end(); ++fi) {
Chris@41 417 fs[m_notesOutputNo].push_back(*fi);
Chris@40 418 }
Chris@34 419 }
Chris@34 420
Chris@32 421 return fs;
Chris@31 422 }
Chris@31 423
Chris@32 424 Silvet::Grid
Chris@32 425 Silvet::preProcess(const Grid &in)
Chris@32 426 {
Chris@32 427 int width = in.size();
Chris@32 428
Chris@32 429 // reduce to 100 columns per second, or one column every 441 samples
Chris@32 430
Chris@32 431 int spacing = processingSampleRate / 100;
Chris@32 432
Chris@32 433 Grid out;
Chris@32 434
Chris@33 435 //!!! nb we count the CQ latency in terms of processing hops, but
Chris@33 436 //!!! actually it isn't guaranteed to be an exact number (in fact
Chris@33 437 //!!! it probably isn't) so this is imprecise -- fix
Chris@33 438 int latentColumns = m_cq->getLatency() / m_cq->getColumnHop();
Chris@33 439
Chris@32 440 for (int i = 0; i < width; ++i) {
Chris@32 441
Chris@33 442 if (m_columnCount < latentColumns) {
Chris@33 443 ++m_columnCount;
Chris@33 444 continue;
Chris@33 445 }
Chris@33 446
Chris@32 447 int prevSampleNo = (m_columnCount - 1) * m_cq->getColumnHop();
Chris@32 448 int sampleNo = m_columnCount * m_cq->getColumnHop();
Chris@32 449
Chris@32 450 bool select = (sampleNo / spacing != prevSampleNo / spacing);
Chris@32 451
Chris@32 452 if (select) {
Chris@32 453 vector<double> inCol = in[i];
Chris@32 454 vector<double> outCol(processingHeight);
Chris@32 455
Chris@32 456 // we reverse the column as we go (the CQ output is
Chris@32 457 // "upside-down", with high frequencies at the start of
Chris@32 458 // each column, and we want it the other way around) and
Chris@32 459 // then ignore the first 55 (lowest-frequency) bins,
Chris@32 460 // giving us 545 bins instead of 600
Chris@32 461
Chris@32 462 for (int j = 0; j < processingHeight; ++j) {
Chris@46 463 int ix = inCol.size() - j - 55;
Chris@46 464 outCol[j] = inCol[ix];
Chris@46 465 }
Chris@32 466
Chris@46 467 vector<double> noiseLevel1 =
Chris@46 468 MedianFilter<double>::filter(40, outCol);
Chris@46 469 for (int j = 0; j < processingHeight; ++j) {
Chris@46 470 noiseLevel1[j] = std::min(outCol[j], noiseLevel1[j]);
Chris@46 471 }
Chris@32 472
Chris@46 473 vector<double> noiseLevel2 =
Chris@46 474 MedianFilter<double>::filter(40, noiseLevel1);
Chris@46 475 for (int j = 0; j < processingHeight; ++j) {
Chris@46 476 outCol[j] = std::max(outCol[j] - noiseLevel2[j], 0.0);
Chris@32 477 }
Chris@32 478
Chris@32 479 // then we only use every fourth filtered column, for 25
Chris@32 480 // columns per second in the eventual grid
Chris@46 481 //!!! why, if we're filtering the time columns, don't we just
Chris@46 482 // reduce to this frame rate before filtering at all?
Chris@32 483
Chris@32 484 if (m_reducedColumnCount % 4 == 0) {
Chris@32 485 out.push_back(outCol);
Chris@32 486 }
Chris@32 487
Chris@32 488 ++m_reducedColumnCount;
Chris@32 489 }
Chris@32 490
Chris@32 491 ++m_columnCount;
Chris@32 492 }
Chris@32 493
Chris@32 494 return out;
Chris@32 495 }
Chris@32 496
Chris@41 497 Vamp::Plugin::FeatureList
Chris@41 498 Silvet::postProcess(const vector<double> &pitches)
Chris@41 499 {
Chris@41 500 vector<double> filtered;
Chris@41 501
Chris@41 502 for (int j = 0; j < processingNotes; ++j) {
Chris@41 503 m_postFilter[j]->push(pitches[j]);
Chris@41 504 filtered.push_back(m_postFilter[j]->get());
Chris@41 505 }
Chris@41 506
Chris@41 507 // Threshold for level and reduce number of candidate pitches
Chris@41 508
Chris@41 509 int polyphony = 5;
Chris@41 510 double threshold = 4.8;
Chris@41 511
Chris@41 512 typedef std::multimap<double, int> ValueIndexMap;
Chris@41 513
Chris@41 514 ValueIndexMap strengths;
Chris@41 515 for (int j = 0; j < processingNotes; ++j) {
Chris@41 516 strengths.insert(ValueIndexMap::value_type(filtered[j], j));
Chris@41 517 }
Chris@41 518
Chris@41 519 set<int> active;
Chris@41 520 ValueIndexMap::const_iterator si = strengths.end();
Chris@41 521 for (int j = 0; j < polyphony; ++j) {
Chris@41 522 --si;
Chris@41 523 if (si->first < threshold) break;
Chris@41 524 cerr << si->second << " : " << si->first << endl;
Chris@41 525 active.insert(si->second);
Chris@41 526 }
Chris@41 527
Chris@41 528 // Minimum duration pruning, and conversion to notes. We can only
Chris@41 529 // report notes that have just ended (i.e. that are absent in the
Chris@41 530 // latest active set but present in the last set in the piano
Chris@41 531 // roll) -- any notes that ended earlier will have been reported
Chris@41 532 // already, and if they haven't ended, we don't know their
Chris@41 533 // duration.
Chris@41 534
Chris@41 535 int width = m_pianoRoll.size();
Chris@41 536
Chris@41 537 int durationThreshold = 2; // columns
Chris@41 538
Chris@41 539 FeatureList noteFeatures;
Chris@41 540
Chris@41 541 if (width < durationThreshold + 1) {
Chris@41 542 m_pianoRoll.push_back(active);
Chris@41 543 return noteFeatures;
Chris@41 544 }
Chris@41 545
Chris@41 546 // we have 25 columns per second
Chris@41 547 double columnDuration = 1.0 / 25.0;
Chris@41 548
Chris@41 549 for (set<int>::const_iterator ni = m_pianoRoll[width-1].begin();
Chris@41 550 ni != m_pianoRoll[width-1].end(); ++ni) {
Chris@41 551
Chris@41 552 int note = *ni;
Chris@41 553
Chris@41 554 if (active.find(note) != active.end()) {
Chris@41 555 // the note is still playing
Chris@41 556 continue;
Chris@41 557 }
Chris@41 558
Chris@41 559 // the note was playing but just ended
Chris@41 560 int end = width;
Chris@41 561 int start = end-1;
Chris@41 562
Chris@41 563 while (m_pianoRoll[start].find(note) != m_pianoRoll[start].end()) {
Chris@41 564 --start;
Chris@41 565 }
Chris@41 566 ++start;
Chris@41 567
Chris@41 568 int duration = width - start;
Chris@41 569 cerr << "duration " << duration << " for just-ended note " << note << endl;
Chris@41 570 if (duration < durationThreshold) {
Chris@41 571 // spurious
Chris@41 572 continue;
Chris@41 573 }
Chris@41 574
Chris@41 575 Feature nf;
Chris@41 576 nf.hasTimestamp = true;
Chris@41 577 nf.timestamp = RealTime::fromSeconds(columnDuration * start);
Chris@41 578 nf.hasDuration = true;
Chris@41 579 nf.duration = RealTime::fromSeconds(columnDuration * duration);
Chris@41 580 nf.values.push_back(noteFrequency(note));
Chris@41 581 nf.values.push_back(80.f); //!!! todo: calculate velocity
Chris@41 582 nf.label = noteName(note);
Chris@41 583 noteFeatures.push_back(nf);
Chris@41 584 }
Chris@41 585
Chris@41 586 m_pianoRoll.push_back(active);
Chris@41 587
Chris@41 588 cerr << "returning " << noteFeatures.size() << " complete notes" << endl;
Chris@41 589
Chris@41 590 return noteFeatures;
Chris@41 591 }
Chris@41 592