annotate MatchVampPlugin.cpp @ 15:a82276091bbd

Pull out Matcher parameters into an object
author Chris Cannam
date Fri, 10 Oct 2014 12:55:05 +0100
parents 6ea008aa8817
children 4c8526c5bf58
rev   line source
cannam@0 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
cannam@0 2
cannam@0 3 /*
cannam@0 4 Vamp feature extraction plugin using the MATCH audio alignment
cannam@0 5 algorithm.
cannam@0 6
cannam@0 7 Centre for Digital Music, Queen Mary, University of London.
cannam@0 8 This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
cannam@0 9
cannam@0 10 This program is free software; you can redistribute it and/or
cannam@0 11 modify it under the terms of the GNU General Public License as
cannam@0 12 published by the Free Software Foundation; either version 2 of the
cannam@0 13 License, or (at your option) any later version. See the file
cannam@0 14 COPYING included with this distribution for more information.
cannam@0 15 */
cannam@0 16
cannam@0 17 #include "MatchVampPlugin.h"
cannam@0 18
cannam@0 19 #include "Matcher.h"
cannam@0 20 #include "MatchFeeder.h"
cannam@0 21 #include "Path.h"
cannam@0 22
cannam@0 23 #include <vamp/vamp.h>
cannam@0 24 #include <vamp-sdk/PluginAdapter.h>
cannam@0 25 #include <vamp-sdk/RealTime.h>
cannam@0 26
cannam@0 27 #include <vector>
cannam@0 28 #include <algorithm>
cannam@0 29
cannam@0 30 //static int extant = 0;
cannam@0 31
cannam@0 32 #ifdef _WIN32
cannam@0 33 HANDLE
cannam@0 34 MatchVampPlugin::m_serialisingMutex;
cannam@0 35 #else
cannam@0 36 pthread_mutex_t
cannam@0 37 MatchVampPlugin::m_serialisingMutex;
cannam@0 38 #endif
cannam@0 39
cannam@0 40 bool
cannam@0 41 MatchVampPlugin::m_serialisingMutexInitialised = false;
cannam@0 42
Chris@10 43 // We want to ensure our freq map / crossover bin in Matcher.cpp are
Chris@10 44 // always valid with a fixed FFT length in seconds, so must reject low
Chris@10 45 // sample rates
Chris@10 46 static float sampleRateMin = 5000.f;
Chris@10 47
Chris@15 48 static float defaultStepTime = 0.020;
Chris@15 49
cannam@0 50 MatchVampPlugin::MatchVampPlugin(float inputSampleRate) :
cannam@0 51 Plugin(inputSampleRate),
cannam@6 52 m_stepSize(0),
Chris@15 53 m_stepTime(defaultStepTime),
Chris@15 54 m_blockSize(0),
cannam@0 55 m_serialise(false),
cannam@0 56 m_begin(true),
cannam@0 57 m_locked(false)
cannam@0 58 {
Chris@10 59 if (inputSampleRate < sampleRateMin) {
Chris@10 60 std::cerr << "MatchVampPlugin::MatchVampPlugin: input sample rate "
Chris@10 61 << inputSampleRate << " < min supported rate "
Chris@10 62 << sampleRateMin << ", plugin will refuse to initialise"
Chris@10 63 << std::endl;
Chris@10 64 }
Chris@10 65
cannam@0 66 if (!m_serialisingMutexInitialised) {
cannam@0 67 m_serialisingMutexInitialised = true;
cannam@0 68 #ifdef _WIN32
cannam@0 69 m_serialisingMutex = CreateMutex(NULL, FALSE, NULL);
cannam@0 70 #else
cannam@0 71 pthread_mutex_init(&m_serialisingMutex, 0);
cannam@0 72 #endif
cannam@0 73 }
cannam@0 74
cannam@0 75 pm1 = 0;
cannam@0 76 pm2 = 0;
cannam@0 77 feeder = 0;
cannam@0 78 // std::cerr << "MatchVampPlugin::MatchVampPlugin(" << this << "): extant = " << ++extant << std::endl;
cannam@0 79 }
cannam@0 80
cannam@0 81 MatchVampPlugin::~MatchVampPlugin()
cannam@0 82 {
cannam@0 83 // std::cerr << "MatchVampPlugin::~MatchVampPlugin(" << this << "): extant = " << --extant << std::endl;
cannam@0 84
cannam@0 85 delete feeder;
cannam@0 86 delete pm1;
cannam@0 87 delete pm2;
cannam@0 88
cannam@0 89 if (m_locked) {
cannam@0 90 #ifdef _WIN32
cannam@0 91 ReleaseMutex(m_serialisingMutex);
cannam@0 92 #else
cannam@0 93 pthread_mutex_unlock(&m_serialisingMutex);
cannam@0 94 #endif
cannam@0 95 m_locked = false;
cannam@0 96 }
cannam@0 97 }
cannam@0 98
cannam@0 99 string
cannam@0 100 MatchVampPlugin::getIdentifier() const
cannam@0 101 {
cannam@0 102 return "match";
cannam@0 103 }
cannam@0 104
cannam@0 105 string
cannam@0 106 MatchVampPlugin::getName() const
cannam@0 107 {
cannam@0 108 return "Match Performance Aligner";
cannam@0 109 }
cannam@0 110
cannam@0 111 string
cannam@0 112 MatchVampPlugin::getDescription() const
cannam@0 113 {
cannam@0 114 return "Calculate alignment between two performances in separate channel inputs";
cannam@0 115 }
cannam@0 116
cannam@0 117 string
cannam@0 118 MatchVampPlugin::getMaker() const
cannam@0 119 {
cannam@0 120 return "Simon Dixon (plugin by Chris Cannam)";
cannam@0 121 }
cannam@0 122
cannam@0 123 int
cannam@0 124 MatchVampPlugin::getPluginVersion() const
cannam@0 125 {
cannam@0 126 return 1;
cannam@0 127 }
cannam@0 128
cannam@0 129 string
cannam@0 130 MatchVampPlugin::getCopyright() const
cannam@0 131 {
cannam@0 132 return "GPL";
cannam@0 133 }
cannam@0 134
cannam@0 135 MatchVampPlugin::ParameterList
cannam@0 136 MatchVampPlugin::getParameterDescriptors() const
cannam@0 137 {
cannam@0 138 ParameterList list;
cannam@0 139
cannam@0 140 ParameterDescriptor desc;
cannam@0 141 desc.identifier = "serialise";
cannam@0 142 desc.name = "Serialise Plugin Invocations";
cannam@0 143 desc.description = "Reduce potential memory load at the expense of multiprocessor performance by serialising multi-threaded plugin runs";
cannam@0 144 desc.minValue = 0;
cannam@0 145 desc.maxValue = 1;
cannam@0 146 desc.defaultValue = 0;
cannam@0 147 desc.isQuantized = true;
cannam@0 148 desc.quantizeStep = 1;
cannam@0 149 list.push_back(desc);
cannam@0 150
cannam@0 151 return list;
cannam@0 152 }
cannam@0 153
cannam@0 154 float
cannam@0 155 MatchVampPlugin::getParameter(std::string name) const
cannam@0 156 {
cannam@0 157 if (name == "serialise") {
cannam@0 158 return m_serialise ? 1.0 : 0.0;
cannam@0 159 }
cannam@0 160 return 0.0;
cannam@0 161 }
cannam@0 162
cannam@0 163 void
cannam@0 164 MatchVampPlugin::setParameter(std::string name, float value)
cannam@0 165 {
cannam@0 166 if (name == "serialise") {
cannam@0 167 m_serialise = (value > 0.5);
Chris@10 168 // std::cerr << "MatchVampPlugin::setParameter: set serialise to " << m_serialise << std::endl;
cannam@0 169 }
cannam@0 170 }
cannam@0 171
cannam@0 172 size_t
cannam@0 173 MatchVampPlugin::getPreferredStepSize() const
cannam@0 174 {
Chris@15 175 return m_inputSampleRate * defaultStepTime;
cannam@0 176 }
cannam@0 177
cannam@0 178 size_t
cannam@0 179 MatchVampPlugin::getPreferredBlockSize() const
cannam@0 180 {
Chris@15 181 return 2048;
cannam@0 182 }
cannam@0 183
cannam@0 184 void
cannam@0 185 MatchVampPlugin::createMatchers() const
cannam@0 186 {
Chris@15 187 Matcher::Parameters params(m_inputSampleRate, m_stepTime, m_blockSize);
Chris@15 188 pm1 = new Matcher(params, 0);
Chris@15 189 pm2 = new Matcher(params, pm1);
cannam@0 190 pm1->setOtherMatcher(pm2);
cannam@0 191 feeder = new MatchFeeder(pm1, pm2);
cannam@0 192 }
cannam@0 193
cannam@0 194 bool
cannam@0 195 MatchVampPlugin::initialise(size_t channels, size_t stepSize, size_t blockSize)
cannam@0 196 {
Chris@10 197 if (m_inputSampleRate < sampleRateMin) {
Chris@10 198 std::cerr << "MatchVampPlugin::MatchVampPlugin: input sample rate "
Chris@10 199 << m_inputSampleRate << " < min supported rate "
Chris@10 200 << sampleRateMin << std::endl;
Chris@10 201 return false;
Chris@10 202 }
cannam@0 203 if (channels < getMinChannelCount() ||
cannam@0 204 channels > getMaxChannelCount()) return false;
cannam@1 205 if (stepSize > blockSize/2 ||
cannam@0 206 blockSize != getPreferredBlockSize()) return false;
Chris@15 207
cannam@6 208 m_stepSize = stepSize;
Chris@15 209 m_stepTime = float(stepSize) / m_inputSampleRate;
Chris@15 210 m_blockSize = blockSize;
Chris@15 211
Chris@15 212 cerr << "step size = " << m_stepSize << ", time = " << m_stepTime << endl;
Chris@15 213
Chris@15 214 createMatchers();
cannam@0 215 m_begin = true;
cannam@0 216 m_locked = false;
Chris@15 217
cannam@0 218 return true;
cannam@0 219 }
cannam@0 220
cannam@0 221 void
cannam@0 222 MatchVampPlugin::reset()
cannam@0 223 {
cannam@6 224 delete feeder;
cannam@6 225 delete pm1;
cannam@6 226 delete pm2;
cannam@6 227 feeder = 0;
cannam@6 228 pm1 = 0;
cannam@6 229 pm2 = 0;
cannam@6 230
cannam@6 231 createMatchers();
cannam@6 232 m_begin = true;
cannam@6 233 m_locked = false;
cannam@0 234 }
cannam@0 235
cannam@0 236 MatchVampPlugin::OutputList
cannam@0 237 MatchVampPlugin::getOutputDescriptors() const
cannam@0 238 {
cannam@0 239 OutputList list;
cannam@0 240
Chris@15 241 float outRate = 1.0 / m_stepTime;
cannam@0 242
cannam@0 243 OutputDescriptor desc;
cannam@0 244 desc.identifier = "path";
cannam@0 245 desc.name = "Path";
cannam@0 246 desc.description = "Alignment path";
cannam@0 247 desc.unit = "";
cannam@0 248 desc.hasFixedBinCount = true;
cannam@0 249 desc.binCount = 1;
cannam@0 250 desc.hasKnownExtents = false;
cannam@0 251 desc.isQuantized = true;
cannam@0 252 desc.quantizeStep = 1;
cannam@0 253 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 254 desc.sampleRate = outRate;
cannam@0 255 list.push_back(desc);
cannam@0 256
cannam@0 257 desc.identifier = "a_b";
cannam@0 258 desc.name = "A-B Timeline";
cannam@0 259 desc.description = "Timing in performance B corresponding to moments in performance A";
cannam@0 260 desc.unit = "sec";
cannam@0 261 desc.hasFixedBinCount = true;
cannam@0 262 desc.binCount = 1;
cannam@0 263 desc.hasKnownExtents = false;
cannam@0 264 desc.isQuantized = false;
cannam@0 265 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 266 desc.sampleRate = outRate;
cannam@0 267 list.push_back(desc);
cannam@0 268
cannam@0 269 desc.identifier = "b_a";
cannam@0 270 desc.name = "B-A Timeline";
cannam@0 271 desc.description = "Timing in performance A corresponding to moments in performance B";
cannam@0 272 desc.unit = "sec";
cannam@0 273 desc.hasFixedBinCount = true;
cannam@0 274 desc.binCount = 1;
cannam@0 275 desc.hasKnownExtents = false;
cannam@0 276 desc.isQuantized = false;
cannam@0 277 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 278 desc.sampleRate = outRate;
cannam@0 279 list.push_back(desc);
cannam@0 280
cannam@0 281 desc.identifier = "a_b_divergence";
cannam@0 282 desc.name = "A-B Divergence";
cannam@0 283 desc.description = "Difference between timings in performances A and B";
cannam@0 284 desc.unit = "sec";
cannam@0 285 desc.hasFixedBinCount = true;
cannam@0 286 desc.binCount = 1;
cannam@0 287 desc.hasKnownExtents = false;
cannam@0 288 desc.isQuantized = false;
cannam@0 289 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 290 desc.sampleRate = outRate;
cannam@0 291 list.push_back(desc);
cannam@0 292
cannam@0 293 desc.identifier = "a_b_temporatio";
cannam@0 294 desc.name = "A-B Tempo Ratio";
cannam@0 295 desc.description = "Ratio of tempi between performances A and B";
cannam@0 296 desc.unit = "";
cannam@0 297 desc.hasFixedBinCount = true;
cannam@0 298 desc.binCount = 1;
cannam@0 299 desc.hasKnownExtents = false;
cannam@0 300 desc.isQuantized = false;
cannam@0 301 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 302 desc.sampleRate = outRate;
cannam@0 303 list.push_back(desc);
cannam@0 304
Chris@15 305 desc.identifier = "a_features";
Chris@15 306 desc.name = "A Features";
Chris@15 307 desc.description = "Spectral features extracted from performance A";
Chris@15 308 desc.unit = "";
Chris@15 309 desc.hasFixedBinCount = true;
Chris@15 310 desc.binCount = 1;
Chris@15 311 desc.hasKnownExtents = false;
Chris@15 312 desc.isQuantized = false;
Chris@15 313 desc.sampleType = OutputDescriptor::VariableSampleRate;
Chris@15 314 desc.sampleRate = outRate;
Chris@15 315 list.push_back(desc);
Chris@15 316
cannam@0 317 return list;
cannam@0 318 }
cannam@0 319
cannam@0 320 MatchVampPlugin::FeatureSet
cannam@0 321 MatchVampPlugin::process(const float *const *inputBuffers,
cannam@0 322 Vamp::RealTime timestamp)
cannam@0 323 {
cannam@0 324 if (m_begin) {
cannam@0 325 if (!m_locked && m_serialise) {
cannam@0 326 m_locked = true;
cannam@0 327 #ifdef _WIN32
cannam@0 328 WaitForSingleObject(m_serialisingMutex, INFINITE);
cannam@0 329 #else
cannam@0 330 pthread_mutex_lock(&m_serialisingMutex);
cannam@0 331 #endif
cannam@0 332 }
Chris@10 333 m_startTime = timestamp;
cannam@0 334 m_begin = false;
cannam@0 335 }
cannam@0 336
cannam@0 337 // std::cerr << timestamp.toString();
cannam@0 338
cannam@0 339 feeder->feed(inputBuffers);
cannam@0 340
cannam@0 341 // std::cerr << ".";
cannam@0 342 // std::cerr << std::endl;
cannam@0 343
cannam@0 344 return FeatureSet();
cannam@0 345 }
cannam@0 346
cannam@0 347 MatchVampPlugin::FeatureSet
cannam@0 348 MatchVampPlugin::getRemainingFeatures()
cannam@0 349 {
cannam@0 350 int x = pm2->getFrameCount() - 1;
cannam@0 351 int y = pm1->getFrameCount() - 1;
cannam@0 352
cannam@0 353 Finder *finder = feeder->getFinder();
cannam@0 354
cannam@0 355 std::vector<int> pathx;
cannam@0 356 std::vector<int> pathy;
cannam@0 357
cannam@0 358 // std::cerr << "initial x,y = " << x << std::endl;
cannam@0 359
cannam@0 360 while (finder->find(y, x) && ((x > 0) || (y > 0))) {
cannam@0 361
cannam@0 362 pathx.push_back(x);
cannam@0 363 pathy.push_back(y);
cannam@0 364
cannam@0 365 // std::cerr << pathx.size() << ": (" << x << "," << y << ")" << std::endl;
cannam@0 366
cannam@0 367 switch (finder->getDistance() & ADVANCE_BOTH){
cannam@0 368 case ADVANCE_THIS: y--; break;
cannam@0 369 case ADVANCE_OTHER: x--; break;
cannam@0 370 case ADVANCE_BOTH: x--; y--; break;
cannam@0 371 default: // this would indicate a bug, but we wouldn't want to hang
cannam@0 372 std::cerr << "WARNING: MatchVampPlugin::getRemainingFeatures: Neither matcher advanced in path backtrack at (" << x << "," << y << ")" << std::endl;
cannam@0 373 if (x > y) x--; else y--; break;
cannam@0 374 }
cannam@0 375 }
cannam@0 376
cannam@0 377 std::reverse(pathx.begin(), pathx.end());
cannam@0 378 std::reverse(pathy.begin(), pathy.end());
cannam@0 379
cannam@0 380 int smoothedLen = Path().smooth(pathx, pathy, pathx.size());
cannam@0 381
cannam@0 382 FeatureSet returnFeatures;
cannam@0 383
cannam@0 384 int prevx = 0;
cannam@0 385 int prevy = 0;
cannam@0 386
cannam@0 387 for (int i = 0; i < smoothedLen; ++i) {
cannam@0 388
cannam@0 389 int x = pathx[i];
cannam@0 390 int y = pathy[i];
cannam@0 391
cannam@0 392 Vamp::RealTime xt = Vamp::RealTime::frame2RealTime
Chris@15 393 (x * m_stepSize, lrintf(m_inputSampleRate));
cannam@0 394 Vamp::RealTime yt = Vamp::RealTime::frame2RealTime
Chris@15 395 (y * m_stepSize, lrintf(m_inputSampleRate));
cannam@0 396
cannam@0 397 Feature feature;
cannam@0 398 feature.hasTimestamp = true;
Chris@10 399 feature.timestamp = m_startTime + xt;
cannam@0 400 feature.values.clear();
cannam@0 401 feature.values.push_back(yt.sec + double(yt.nsec)/1.0e9);
cannam@0 402 returnFeatures[0].push_back(feature);
cannam@0 403
cannam@0 404 if (x != prevx) {
cannam@0 405
cannam@0 406 feature.hasTimestamp = true;
Chris@10 407 feature.timestamp = m_startTime + xt;
cannam@0 408 feature.values.clear();
cannam@0 409 feature.values.push_back(yt.sec + yt.msec()/1000.0);
cannam@0 410 returnFeatures[1].push_back(feature);
cannam@0 411
cannam@0 412 Vamp::RealTime diff = yt - xt;
cannam@0 413 feature.values.clear();
cannam@0 414 feature.values.push_back(diff.sec + diff.msec()/1000.0);
cannam@0 415 returnFeatures[3].push_back(feature);
cannam@0 416
cannam@0 417 if (i > 0) {
cannam@0 418 int lookback = 100; //!!! arbitrary
cannam@0 419 if (lookback > i) lookback = i;
cannam@0 420 int xdiff = x - pathx[i-lookback];
cannam@0 421 int ydiff = y - pathy[i-lookback];
cannam@0 422 if (xdiff != 0 && ydiff != 0) {
cannam@0 423 float ratio = float(ydiff)/float(xdiff);
cannam@0 424 if (ratio < 8 && ratio > (1.0/8)) { //!!! just for now, since we aren't dealing properly with silence yet
cannam@0 425 feature.values.clear();
cannam@0 426 feature.values.push_back(ratio);
cannam@0 427 returnFeatures[4].push_back(feature);
cannam@0 428 }
cannam@0 429 }
cannam@0 430 }
cannam@0 431 }
cannam@0 432
cannam@0 433 if (y != prevy) {
cannam@0 434 feature.hasTimestamp = true;
Chris@10 435 feature.timestamp = m_startTime + yt;
cannam@0 436 feature.values.clear();
cannam@0 437 feature.values.push_back(xt.sec + xt.msec()/1000.0);
cannam@0 438 returnFeatures[2].push_back(feature);
cannam@0 439 }
cannam@0 440
cannam@0 441 prevx = x;
cannam@0 442 prevy = y;
cannam@0 443 }
cannam@0 444
cannam@0 445 delete feeder;
cannam@0 446 delete pm1;
cannam@0 447 delete pm2;
cannam@0 448 feeder = 0;
cannam@0 449 pm1 = 0;
cannam@0 450 pm2 = 0;
cannam@0 451
cannam@0 452 if (m_locked) {
cannam@0 453 #ifdef _WIN32
cannam@0 454 ReleaseMutex(m_serialisingMutex);
cannam@0 455 #else
cannam@0 456 pthread_mutex_unlock(&m_serialisingMutex);
cannam@0 457 #endif
cannam@0 458 m_locked = false;
cannam@0 459 }
cannam@0 460
cannam@0 461 return returnFeatures;
cannam@0 462
cannam@0 463
cannam@0 464 /*
cannam@0 465 for (int i = 0; i < smoothedLen; ++i) {
cannam@0 466 std::cerr << i << ": [" << pathx[i] << "," << pathy[i] << "]" << std::endl;
cannam@0 467 }
cannam@0 468
cannam@0 469 std::cerr << std::endl;
cannam@0 470 std::cerr << "File: A" << std::endl;
cannam@0 471 std::cerr << "Marks: -1" << std::endl;
cannam@0 472 std::cerr << "FixedPoints: true 0" << std::endl;
cannam@0 473 std::cerr << "0" << std::endl;
cannam@0 474 std::cerr << "0" << std::endl;
cannam@0 475 std::cerr << "0" << std::endl;
cannam@0 476 std::cerr << "0" << std::endl;
cannam@0 477 std::cerr << "File: B" << std::endl;
cannam@0 478 std::cerr << "Marks: 0" << std::endl;
cannam@0 479 std::cerr << "FixedPoints: true 0" << std::endl;
cannam@0 480 std::cerr << "0.02" << std::endl;
cannam@0 481 std::cerr << "0.02" << std::endl;
cannam@0 482
cannam@0 483 std::cerr << smoothedLen << std::endl;
cannam@0 484 for (int i = 0; i < smoothedLen; ++i) {
cannam@0 485 std::cerr << pathx[i] << std::endl;
cannam@0 486 }
cannam@0 487
cannam@0 488 std::cerr << smoothedLen << std::endl;
cannam@0 489 for (int i = 0; i < smoothedLen; ++i) {
cannam@0 490 std::cerr << pathy[i] << std::endl;
cannam@0 491 }
cannam@0 492 */
cannam@0 493 }
cannam@0 494
cannam@0 495 static Vamp::PluginAdapter<MatchVampPlugin> mvpAdapter;
cannam@0 496
cannam@0 497 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version,
cannam@0 498 unsigned int index)
cannam@0 499 {
cannam@0 500 if (version < 1) return 0;
cannam@0 501
cannam@0 502 switch (index) {
cannam@0 503 case 0: return mvpAdapter.getDescriptor();
cannam@0 504 default: return 0;
cannam@0 505 }
cannam@0 506 }