annotate src/Silvet.cpp @ 69:9c7e6086192d

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