annotate src/Silvet.cpp @ 52:22553e7b2a63 preshift

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