annotate src/MatchVampPlugin.cpp @ 156:d6df9fe7b12f refactors

Implement distance metric selection (euclidean or cosine)
author Chris Cannam
date Thu, 29 Jan 2015 10:25:47 +0000
parents 246de093f0f1
children d6c1556fadd0
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"
Chris@74 20 #include "MatchFeatureFeeder.h"
Chris@74 21 #include "FeatureExtractor.h"
cannam@0 22 #include "Path.h"
cannam@0 23
cannam@0 24 #include <vamp/vamp.h>
cannam@0 25 #include <vamp-sdk/PluginAdapter.h>
cannam@0 26 #include <vamp-sdk/RealTime.h>
cannam@0 27
cannam@0 28 #include <vector>
cannam@0 29 #include <algorithm>
cannam@0 30
cannam@0 31 //static int extant = 0;
cannam@0 32
cannam@0 33 #ifdef _WIN32
cannam@0 34 HANDLE
cannam@0 35 MatchVampPlugin::m_serialisingMutex;
cannam@0 36 #else
cannam@0 37 pthread_mutex_t
cannam@0 38 MatchVampPlugin::m_serialisingMutex;
cannam@0 39 #endif
cannam@0 40
cannam@0 41 bool
cannam@0 42 MatchVampPlugin::m_serialisingMutexInitialised = false;
cannam@0 43
Chris@10 44 // We want to ensure our freq map / crossover bin in Matcher.cpp are
Chris@10 45 // always valid with a fixed FFT length in seconds, so must reject low
Chris@10 46 // sample rates
Chris@10 47 static float sampleRateMin = 5000.f;
Chris@10 48
Chris@52 49 static float defaultStepTime = 0.020f;
Chris@15 50
cannam@0 51 MatchVampPlugin::MatchVampPlugin(float inputSampleRate) :
cannam@0 52 Plugin(inputSampleRate),
Chris@52 53 m_stepSize(int(inputSampleRate * defaultStepTime + 0.001)),
Chris@15 54 m_stepTime(defaultStepTime),
Chris@16 55 m_blockSize(2048),
cannam@0 56 m_serialise(false),
cannam@0 57 m_begin(true),
Chris@17 58 m_locked(false),
Chris@138 59 m_smooth(false),
Chris@74 60 m_frameNo(0),
Chris@113 61 m_params(defaultStepTime),
Chris@113 62 m_defaultParams(defaultStepTime),
Chris@38 63 m_feParams(inputSampleRate, m_blockSize),
Chris@103 64 m_defaultFeParams(inputSampleRate, m_blockSize),
Chris@103 65 m_fcParams(),
Chris@143 66 m_defaultFcParams(),
Chris@143 67 m_dParams(),
Chris@143 68 m_defaultDParams()
cannam@0 69 {
Chris@10 70 if (inputSampleRate < sampleRateMin) {
Chris@10 71 std::cerr << "MatchVampPlugin::MatchVampPlugin: input sample rate "
Chris@10 72 << inputSampleRate << " < min supported rate "
Chris@10 73 << sampleRateMin << ", plugin will refuse to initialise"
Chris@10 74 << std::endl;
Chris@10 75 }
Chris@10 76
cannam@0 77 if (!m_serialisingMutexInitialised) {
cannam@0 78 m_serialisingMutexInitialised = true;
cannam@0 79 #ifdef _WIN32
cannam@0 80 m_serialisingMutex = CreateMutex(NULL, FALSE, NULL);
cannam@0 81 #else
cannam@0 82 pthread_mutex_init(&m_serialisingMutex, 0);
cannam@0 83 #endif
cannam@0 84 }
cannam@0 85
Chris@107 86 m_pipeline = 0;
cannam@0 87 // std::cerr << "MatchVampPlugin::MatchVampPlugin(" << this << "): extant = " << ++extant << std::endl;
cannam@0 88 }
cannam@0 89
cannam@0 90 MatchVampPlugin::~MatchVampPlugin()
cannam@0 91 {
cannam@0 92 // std::cerr << "MatchVampPlugin::~MatchVampPlugin(" << this << "): extant = " << --extant << std::endl;
cannam@0 93
Chris@107 94 delete m_pipeline;
cannam@0 95
cannam@0 96 if (m_locked) {
cannam@0 97 #ifdef _WIN32
cannam@0 98 ReleaseMutex(m_serialisingMutex);
cannam@0 99 #else
cannam@0 100 pthread_mutex_unlock(&m_serialisingMutex);
cannam@0 101 #endif
cannam@0 102 m_locked = false;
cannam@0 103 }
cannam@0 104 }
cannam@0 105
cannam@0 106 string
cannam@0 107 MatchVampPlugin::getIdentifier() const
cannam@0 108 {
cannam@0 109 return "match";
cannam@0 110 }
cannam@0 111
cannam@0 112 string
cannam@0 113 MatchVampPlugin::getName() const
cannam@0 114 {
cannam@0 115 return "Match Performance Aligner";
cannam@0 116 }
cannam@0 117
cannam@0 118 string
cannam@0 119 MatchVampPlugin::getDescription() const
cannam@0 120 {
cannam@0 121 return "Calculate alignment between two performances in separate channel inputs";
cannam@0 122 }
cannam@0 123
cannam@0 124 string
cannam@0 125 MatchVampPlugin::getMaker() const
cannam@0 126 {
cannam@0 127 return "Simon Dixon (plugin by Chris Cannam)";
cannam@0 128 }
cannam@0 129
cannam@0 130 int
cannam@0 131 MatchVampPlugin::getPluginVersion() const
cannam@0 132 {
Chris@137 133 return 3;
cannam@0 134 }
cannam@0 135
cannam@0 136 string
cannam@0 137 MatchVampPlugin::getCopyright() const
cannam@0 138 {
cannam@0 139 return "GPL";
cannam@0 140 }
cannam@0 141
cannam@0 142 MatchVampPlugin::ParameterList
cannam@0 143 MatchVampPlugin::getParameterDescriptors() const
cannam@0 144 {
cannam@0 145 ParameterList list;
cannam@0 146
cannam@0 147 ParameterDescriptor desc;
Chris@18 148
cannam@0 149 desc.identifier = "serialise";
cannam@0 150 desc.name = "Serialise Plugin Invocations";
cannam@0 151 desc.description = "Reduce potential memory load at the expense of multiprocessor performance by serialising multi-threaded plugin runs";
cannam@0 152 desc.minValue = 0;
cannam@0 153 desc.maxValue = 1;
cannam@0 154 desc.defaultValue = 0;
cannam@0 155 desc.isQuantized = true;
cannam@0 156 desc.quantizeStep = 1;
cannam@0 157 list.push_back(desc);
cannam@0 158
Chris@18 159 desc.identifier = "framenorm";
Chris@18 160 desc.name = "Frame Normalisation";
Chris@18 161 desc.description = "Type of normalisation to use for frequency-domain audio features";
Chris@18 162 desc.minValue = 0;
Chris@18 163 desc.maxValue = 2;
Chris@103 164 desc.defaultValue = (int)m_defaultFcParams.norm;
Chris@18 165 desc.isQuantized = true;
Chris@18 166 desc.quantizeStep = 1;
Chris@18 167 desc.valueNames.clear();
Chris@18 168 desc.valueNames.push_back("None");
Chris@18 169 desc.valueNames.push_back("Sum To 1");
Chris@18 170 desc.valueNames.push_back("Long-Term Average");
Chris@18 171 list.push_back(desc);
Chris@18 172 desc.valueNames.clear();
Chris@18 173
Chris@18 174 desc.identifier = "distnorm";
Chris@18 175 desc.name = "Distance Normalisation";
Chris@18 176 desc.description = "Type of normalisation to use for distance metric";
Chris@18 177 desc.minValue = 0;
Chris@18 178 desc.maxValue = 2;
Chris@143 179 desc.defaultValue = (int)m_defaultDParams.norm;
Chris@18 180 desc.isQuantized = true;
Chris@18 181 desc.quantizeStep = 1;
Chris@18 182 desc.valueNames.clear();
Chris@18 183 desc.valueNames.push_back("None");
Chris@18 184 desc.valueNames.push_back("Sum of Frames");
Chris@18 185 desc.valueNames.push_back("Log Sum of Frames");
Chris@18 186 list.push_back(desc);
Chris@18 187 desc.valueNames.clear();
Chris@18 188
Chris@18 189 desc.identifier = "usespecdiff";
Chris@18 190 desc.name = "Use Spectral Difference";
Chris@18 191 desc.description = "Whether to use half-wave rectified spectral difference instead of straight spectrum";
Chris@18 192 desc.minValue = 0;
Chris@18 193 desc.maxValue = 1;
Chris@103 194 desc.defaultValue = (int)m_defaultFcParams.order;
Chris@18 195 desc.isQuantized = true;
Chris@18 196 desc.quantizeStep = 1;
Chris@18 197 list.push_back(desc);
Chris@18 198
Chris@18 199 desc.identifier = "usechroma";
Chris@18 200 desc.name = "Use Chroma Frequency Map";
Chris@18 201 desc.description = "Whether to use a chroma frequency map instead of the default warped spectrogram";
Chris@18 202 desc.minValue = 0;
Chris@18 203 desc.maxValue = 1;
Chris@38 204 desc.defaultValue = m_defaultFeParams.useChromaFrequencyMap ? 1 : 0;
Chris@18 205 desc.isQuantized = true;
Chris@18 206 desc.quantizeStep = 1;
Chris@18 207 list.push_back(desc);
Chris@18 208
Chris@136 209 desc.identifier = "silencethreshold";
Chris@136 210 desc.name = "Silence Threshold";
Chris@136 211 desc.description = "Total frame energy threshold below which a feature will be regarded as silent";
Chris@136 212 desc.minValue = 0;
Chris@136 213 desc.maxValue = 1;
Chris@136 214 desc.defaultValue = m_defaultFcParams.silenceThreshold;
Chris@136 215 desc.isQuantized = false;
Chris@136 216 list.push_back(desc);
Chris@151 217
Chris@156 218 desc.identifier = "metric";
Chris@156 219 desc.name = "Distance metric";
Chris@156 220 desc.description = "Metric for distance calculations.";
Chris@156 221 desc.minValue = 0;
Chris@156 222 desc.maxValue = 1;
Chris@156 223 desc.defaultValue = (int)m_defaultDParams.metric;
Chris@156 224 desc.isQuantized = true;
Chris@156 225 desc.quantizeStep = 1;
Chris@156 226 desc.valueNames.clear();
Chris@156 227 desc.valueNames.push_back("Euclidean");
Chris@156 228 desc.valueNames.push_back("Cosine");
Chris@156 229 list.push_back(desc);
Chris@156 230 desc.valueNames.clear();
Chris@156 231
Chris@151 232 desc.identifier = "noise";
Chris@151 233 desc.name = "Mix in Noise";
Chris@151 234 desc.description = "Whether to mix in a small constant white noise term when calculating feature distance. This can improve alignment against sources containing cleanly synthesised audio.";
Chris@151 235 desc.minValue = 0;
Chris@151 236 desc.maxValue = 1;
Chris@151 237 desc.defaultValue = (int)m_defaultDParams.noise;
Chris@151 238 desc.isQuantized = true;
Chris@151 239 desc.quantizeStep = 1;
Chris@151 240 list.push_back(desc);
Chris@136 241
Chris@25 242 desc.identifier = "gradientlimit";
Chris@25 243 desc.name = "Gradient Limit";
Chris@18 244 desc.description = "Limit of number of frames that will be accepted from one source without a frame from the other source being accepted";
Chris@18 245 desc.minValue = 1;
Chris@18 246 desc.maxValue = 10;
Chris@18 247 desc.defaultValue = m_defaultParams.maxRunCount;
Chris@18 248 desc.isQuantized = true;
Chris@18 249 desc.quantizeStep = 1;
Chris@18 250 list.push_back(desc);
Chris@18 251
Chris@25 252 desc.identifier = "zonewidth";
Chris@25 253 desc.name = "Search Zone Width";
Chris@25 254 desc.description = "Width of the search zone (error margin) either side of the ongoing match position, in seconds";
Chris@25 255 desc.minValue = 1;
Chris@25 256 desc.maxValue = 60;
Chris@52 257 desc.defaultValue = (float)m_defaultParams.blockTime;
Chris@25 258 desc.isQuantized = true;
Chris@25 259 desc.quantizeStep = 1;
Chris@25 260 desc.unit = "s";
Chris@25 261 list.push_back(desc);
Chris@25 262
Chris@83 263 desc.identifier = "diagonalweight";
Chris@83 264 desc.name = "Diagonal Weight";
Chris@83 265 desc.description = "Weight applied to cost of diagonal step relative to horizontal or vertical step. The default of 2.0 is good for gross tracking of quite different performances; closer to 1.0 produces a smoother path for performances more similar in tempo";
Chris@83 266 desc.minValue = 1.0;
Chris@86 267 desc.maxValue = 2.0;
Chris@138 268 desc.defaultValue = (float)m_defaultParams.diagonalWeight;
Chris@83 269 desc.isQuantized = false;
Chris@83 270 desc.unit = "";
Chris@83 271 list.push_back(desc);
Chris@83 272
Chris@32 273 desc.identifier = "smooth";
Chris@32 274 desc.name = "Smooth Path";
Chris@138 275 desc.description = "Smooth the path by replacing steps with diagonals. (This was enabled by default in earlier versions of the MATCH plugin, but the default now is to produce an un-smoothed path.)";
Chris@32 276 desc.minValue = 0;
Chris@32 277 desc.maxValue = 1;
Chris@138 278 desc.defaultValue = 0;
Chris@32 279 desc.isQuantized = true;
Chris@32 280 desc.quantizeStep = 1;
Chris@32 281 desc.unit = "";
Chris@32 282 list.push_back(desc);
Chris@32 283
cannam@0 284 return list;
cannam@0 285 }
cannam@0 286
cannam@0 287 float
cannam@0 288 MatchVampPlugin::getParameter(std::string name) const
cannam@0 289 {
cannam@0 290 if (name == "serialise") {
cannam@0 291 return m_serialise ? 1.0 : 0.0;
Chris@18 292 } else if (name == "framenorm") {
Chris@103 293 return (int)m_fcParams.norm;
Chris@18 294 } else if (name == "distnorm") {
Chris@143 295 return (int)m_dParams.norm;
Chris@18 296 } else if (name == "usespecdiff") {
Chris@103 297 return (int)m_fcParams.order;
Chris@18 298 } else if (name == "usechroma") {
Chris@38 299 return m_feParams.useChromaFrequencyMap ? 1.0 : 0.0;
Chris@25 300 } else if (name == "gradientlimit") {
Chris@18 301 return m_params.maxRunCount;
Chris@83 302 } else if (name == "diagonalweight") {
Chris@83 303 return m_params.diagonalWeight;
Chris@25 304 } else if (name == "zonewidth") {
Chris@52 305 return (float)m_params.blockTime;
Chris@32 306 } else if (name == "smooth") {
Chris@32 307 return m_smooth ? 1.0 : 0.0;
Chris@136 308 } else if (name == "silencethreshold") {
Chris@136 309 return m_fcParams.silenceThreshold;
Chris@156 310 } else if (name == "metric") {
Chris@156 311 return (int)m_dParams.metric;
Chris@151 312 } else if (name == "noise") {
Chris@151 313 return m_dParams.noise;
cannam@0 314 }
Chris@18 315
cannam@0 316 return 0.0;
cannam@0 317 }
cannam@0 318
cannam@0 319 void
cannam@0 320 MatchVampPlugin::setParameter(std::string name, float value)
cannam@0 321 {
cannam@0 322 if (name == "serialise") {
cannam@0 323 m_serialise = (value > 0.5);
Chris@18 324 } else if (name == "framenorm") {
Chris@103 325 m_fcParams.norm = (FeatureConditioner::Normalisation)(int(value + 0.1));
Chris@18 326 } else if (name == "distnorm") {
Chris@143 327 m_dParams.norm = (DistanceMetric::DistanceNormalisation)(int(value + 0.1));
Chris@18 328 } else if (name == "usespecdiff") {
Chris@103 329 m_fcParams.order = (FeatureConditioner::OutputOrder)(int(value + 0.1));
Chris@18 330 } else if (name == "usechroma") {
Chris@38 331 m_feParams.useChromaFrequencyMap = (value > 0.5);
Chris@25 332 } else if (name == "gradientlimit") {
Chris@18 333 m_params.maxRunCount = int(value + 0.1);
Chris@83 334 } else if (name == "diagonalweight") {
Chris@83 335 m_params.diagonalWeight = value;
Chris@25 336 } else if (name == "zonewidth") {
Chris@25 337 m_params.blockTime = value;
Chris@32 338 } else if (name == "smooth") {
Chris@32 339 m_smooth = (value > 0.5);
Chris@136 340 } else if (name == "silencethreshold") {
Chris@136 341 m_fcParams.silenceThreshold = value;
Chris@156 342 } else if (name == "metric") {
Chris@156 343 m_dParams.metric = (DistanceMetric::Metric)(int(value + 0.1));
Chris@151 344 } else if (name == "noise") {
Chris@151 345 m_dParams.noise = (DistanceMetric::NoiseAddition)(int(value + 0.1));
cannam@0 346 }
cannam@0 347 }
cannam@0 348
cannam@0 349 size_t
cannam@0 350 MatchVampPlugin::getPreferredStepSize() const
cannam@0 351 {
Chris@52 352 return int(m_inputSampleRate * defaultStepTime + 0.001);
cannam@0 353 }
cannam@0 354
cannam@0 355 size_t
cannam@0 356 MatchVampPlugin::getPreferredBlockSize() const
cannam@0 357 {
Chris@15 358 return 2048;
cannam@0 359 }
cannam@0 360
cannam@0 361 void
Chris@17 362 MatchVampPlugin::createMatchers()
cannam@0 363 {
Chris@17 364 m_params.hopTime = m_stepTime;
Chris@38 365 m_feParams.fftSize = m_blockSize;
Chris@107 366
Chris@143 367 m_pipeline = new MatchPipeline(m_feParams, m_fcParams, m_dParams, m_params);
cannam@0 368 }
cannam@0 369
cannam@0 370 bool
cannam@0 371 MatchVampPlugin::initialise(size_t channels, size_t stepSize, size_t blockSize)
cannam@0 372 {
Chris@10 373 if (m_inputSampleRate < sampleRateMin) {
Chris@10 374 std::cerr << "MatchVampPlugin::MatchVampPlugin: input sample rate "
Chris@10 375 << m_inputSampleRate << " < min supported rate "
Chris@10 376 << sampleRateMin << std::endl;
Chris@10 377 return false;
Chris@10 378 }
cannam@0 379 if (channels < getMinChannelCount() ||
cannam@0 380 channels > getMaxChannelCount()) return false;
cannam@1 381 if (stepSize > blockSize/2 ||
cannam@0 382 blockSize != getPreferredBlockSize()) return false;
Chris@15 383
cannam@6 384 m_stepSize = stepSize;
Chris@15 385 m_stepTime = float(stepSize) / m_inputSampleRate;
Chris@15 386 m_blockSize = blockSize;
Chris@15 387
Chris@15 388 createMatchers();
cannam@0 389 m_begin = true;
cannam@0 390 m_locked = false;
Chris@15 391
cannam@0 392 return true;
cannam@0 393 }
cannam@0 394
cannam@0 395 void
cannam@0 396 MatchVampPlugin::reset()
cannam@0 397 {
Chris@107 398 delete m_pipeline;
Chris@107 399 m_pipeline = 0;
Chris@74 400 m_frameNo = 0;
cannam@6 401 createMatchers();
cannam@6 402 m_begin = true;
cannam@6 403 m_locked = false;
cannam@0 404 }
cannam@0 405
cannam@0 406 MatchVampPlugin::OutputList
cannam@0 407 MatchVampPlugin::getOutputDescriptors() const
cannam@0 408 {
cannam@0 409 OutputList list;
cannam@0 410
Chris@52 411 float outRate = 1.0f / m_stepTime;
cannam@0 412
cannam@0 413 OutputDescriptor desc;
cannam@0 414 desc.identifier = "path";
cannam@0 415 desc.name = "Path";
cannam@0 416 desc.description = "Alignment path";
cannam@0 417 desc.unit = "";
cannam@0 418 desc.hasFixedBinCount = true;
cannam@0 419 desc.binCount = 1;
cannam@0 420 desc.hasKnownExtents = false;
cannam@0 421 desc.isQuantized = true;
cannam@0 422 desc.quantizeStep = 1;
cannam@0 423 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 424 desc.sampleRate = outRate;
Chris@16 425 m_pathOutNo = list.size();
cannam@0 426 list.push_back(desc);
cannam@0 427
cannam@0 428 desc.identifier = "a_b";
cannam@0 429 desc.name = "A-B Timeline";
cannam@0 430 desc.description = "Timing in performance B corresponding to moments in performance A";
cannam@0 431 desc.unit = "sec";
cannam@0 432 desc.hasFixedBinCount = true;
cannam@0 433 desc.binCount = 1;
cannam@0 434 desc.hasKnownExtents = false;
cannam@0 435 desc.isQuantized = false;
cannam@0 436 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 437 desc.sampleRate = outRate;
Chris@16 438 m_abOutNo = list.size();
cannam@0 439 list.push_back(desc);
cannam@0 440
cannam@0 441 desc.identifier = "b_a";
cannam@0 442 desc.name = "B-A Timeline";
cannam@0 443 desc.description = "Timing in performance A corresponding to moments in performance B";
cannam@0 444 desc.unit = "sec";
cannam@0 445 desc.hasFixedBinCount = true;
cannam@0 446 desc.binCount = 1;
cannam@0 447 desc.hasKnownExtents = false;
cannam@0 448 desc.isQuantized = false;
cannam@0 449 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 450 desc.sampleRate = outRate;
Chris@16 451 m_baOutNo = list.size();
cannam@0 452 list.push_back(desc);
cannam@0 453
cannam@0 454 desc.identifier = "a_b_divergence";
cannam@0 455 desc.name = "A-B Divergence";
cannam@0 456 desc.description = "Difference between timings in performances A and B";
cannam@0 457 desc.unit = "sec";
cannam@0 458 desc.hasFixedBinCount = true;
cannam@0 459 desc.binCount = 1;
cannam@0 460 desc.hasKnownExtents = false;
cannam@0 461 desc.isQuantized = false;
cannam@0 462 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 463 desc.sampleRate = outRate;
Chris@16 464 m_abDivOutNo = list.size();
cannam@0 465 list.push_back(desc);
cannam@0 466
cannam@0 467 desc.identifier = "a_b_temporatio";
cannam@0 468 desc.name = "A-B Tempo Ratio";
cannam@0 469 desc.description = "Ratio of tempi between performances A and B";
cannam@0 470 desc.unit = "";
cannam@0 471 desc.hasFixedBinCount = true;
cannam@0 472 desc.binCount = 1;
cannam@0 473 desc.hasKnownExtents = false;
cannam@0 474 desc.isQuantized = false;
cannam@0 475 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 476 desc.sampleRate = outRate;
Chris@16 477 m_abRatioOutNo = list.size();
cannam@0 478 list.push_back(desc);
cannam@0 479
Chris@38 480 int featureSize = FeatureExtractor(m_feParams).getFeatureSize();
Chris@38 481
Chris@15 482 desc.identifier = "a_features";
Chris@140 483 desc.name = "Raw A Features";
Chris@15 484 desc.description = "Spectral features extracted from performance A";
Chris@15 485 desc.unit = "";
Chris@15 486 desc.hasFixedBinCount = true;
Chris@38 487 desc.binCount = featureSize;
Chris@15 488 desc.hasKnownExtents = false;
Chris@15 489 desc.isQuantized = false;
Chris@16 490 desc.sampleType = OutputDescriptor::FixedSampleRate;
Chris@15 491 desc.sampleRate = outRate;
Chris@16 492 m_aFeaturesOutNo = list.size();
Chris@16 493 list.push_back(desc);
Chris@16 494
Chris@16 495 desc.identifier = "b_features";
Chris@140 496 desc.name = "Raw B Features";
Chris@16 497 desc.description = "Spectral features extracted from performance B";
Chris@16 498 desc.unit = "";
Chris@16 499 desc.hasFixedBinCount = true;
Chris@38 500 desc.binCount = featureSize;
Chris@16 501 desc.hasKnownExtents = false;
Chris@16 502 desc.isQuantized = false;
Chris@16 503 desc.sampleType = OutputDescriptor::FixedSampleRate;
Chris@16 504 desc.sampleRate = outRate;
Chris@16 505 m_bFeaturesOutNo = list.size();
Chris@15 506 list.push_back(desc);
Chris@15 507
Chris@140 508 desc.identifier = "a_cfeatures";
Chris@140 509 desc.name = "Conditioned A Features";
Chris@140 510 desc.description = "Spectral features extracted from performance A, after normalisation and conditioning";
Chris@140 511 desc.unit = "";
Chris@140 512 desc.hasFixedBinCount = true;
Chris@140 513 desc.binCount = featureSize;
Chris@140 514 desc.hasKnownExtents = false;
Chris@140 515 desc.isQuantized = false;
Chris@140 516 desc.sampleType = OutputDescriptor::FixedSampleRate;
Chris@140 517 desc.sampleRate = outRate;
Chris@140 518 m_caFeaturesOutNo = list.size();
Chris@140 519 list.push_back(desc);
Chris@140 520
Chris@140 521 desc.identifier = "b_cfeatures";
Chris@140 522 desc.name = "Conditioned B Features";
Chris@140 523 desc.description = "Spectral features extracted from performance B, after norrmalisation and conditioning";
Chris@140 524 desc.unit = "";
Chris@140 525 desc.hasFixedBinCount = true;
Chris@140 526 desc.binCount = featureSize;
Chris@140 527 desc.hasKnownExtents = false;
Chris@140 528 desc.isQuantized = false;
Chris@140 529 desc.sampleType = OutputDescriptor::FixedSampleRate;
Chris@140 530 desc.sampleRate = outRate;
Chris@140 531 m_cbFeaturesOutNo = list.size();
Chris@140 532 list.push_back(desc);
Chris@140 533
cannam@0 534 return list;
cannam@0 535 }
cannam@0 536
cannam@0 537 MatchVampPlugin::FeatureSet
cannam@0 538 MatchVampPlugin::process(const float *const *inputBuffers,
cannam@0 539 Vamp::RealTime timestamp)
cannam@0 540 {
cannam@0 541 if (m_begin) {
cannam@0 542 if (!m_locked && m_serialise) {
cannam@0 543 m_locked = true;
cannam@0 544 #ifdef _WIN32
cannam@0 545 WaitForSingleObject(m_serialisingMutex, INFINITE);
cannam@0 546 #else
cannam@0 547 pthread_mutex_lock(&m_serialisingMutex);
cannam@0 548 #endif
cannam@0 549 }
Chris@10 550 m_startTime = timestamp;
cannam@0 551 m_begin = false;
cannam@0 552 }
cannam@0 553
cannam@0 554 // std::cerr << timestamp.toString();
cannam@0 555
Chris@107 556 m_pipeline->feedFrequencyDomainAudio(inputBuffers[0], inputBuffers[1]);
Chris@74 557
Chris@140 558 FeatureSet returnFeatures;
Chris@140 559
Chris@107 560 vector<double> f1, f2;
Chris@140 561 m_pipeline->extractFeatures(f1, f2);
Chris@16 562
Chris@140 563 vector<double> cf1, cf2;
Chris@140 564 m_pipeline->extractConditionedFeatures(cf1, cf2);
Chris@16 565
Chris@16 566 Feature f;
Chris@16 567 f.hasTimestamp = false;
Chris@16 568
Chris@74 569 f.values.clear();
Chris@74 570 for (int j = 0; j < (int)f1.size(); ++j) {
Chris@74 571 f.values.push_back(float(f1[j]));
Chris@16 572 }
Chris@74 573 returnFeatures[m_aFeaturesOutNo].push_back(f);
Chris@16 574
Chris@74 575 f.values.clear();
Chris@74 576 for (int j = 0; j < (int)f2.size(); ++j) {
Chris@74 577 f.values.push_back(float(f2[j]));
Chris@16 578 }
Chris@74 579 returnFeatures[m_bFeaturesOutNo].push_back(f);
cannam@0 580
Chris@140 581 f.values.clear();
Chris@140 582 for (int j = 0; j < (int)cf1.size(); ++j) {
Chris@140 583 f.values.push_back(float(cf1[j]));
Chris@140 584 }
Chris@140 585 returnFeatures[m_caFeaturesOutNo].push_back(f);
Chris@140 586
Chris@140 587 f.values.clear();
Chris@140 588 for (int j = 0; j < (int)cf2.size(); ++j) {
Chris@140 589 f.values.push_back(float(cf2[j]));
Chris@140 590 }
Chris@140 591 returnFeatures[m_cbFeaturesOutNo].push_back(f);
Chris@140 592
cannam@0 593 // std::cerr << ".";
cannam@0 594 // std::cerr << std::endl;
cannam@0 595
Chris@74 596 ++m_frameNo;
Chris@74 597
Chris@16 598 return returnFeatures;
cannam@0 599 }
cannam@0 600
cannam@0 601 MatchVampPlugin::FeatureSet
cannam@0 602 MatchVampPlugin::getRemainingFeatures()
cannam@0 603 {
Chris@107 604 m_pipeline->finish();
Chris@74 605
Chris@63 606 FeatureSet returnFeatures;
Chris@63 607
Chris@107 608 Finder *finder = m_pipeline->getFinder();
cannam@0 609 std::vector<int> pathx;
cannam@0 610 std::vector<int> pathy;
Chris@32 611 int len = finder->retrievePath(m_smooth, pathx, pathy);
cannam@0 612
cannam@0 613 int prevx = 0;
cannam@0 614 int prevy = 0;
cannam@0 615
Chris@30 616 for (int i = 0; i < len; ++i) {
cannam@0 617
cannam@0 618 int x = pathx[i];
cannam@0 619 int y = pathy[i];
cannam@0 620
cannam@0 621 Vamp::RealTime xt = Vamp::RealTime::frame2RealTime
Chris@15 622 (x * m_stepSize, lrintf(m_inputSampleRate));
cannam@0 623 Vamp::RealTime yt = Vamp::RealTime::frame2RealTime
Chris@15 624 (y * m_stepSize, lrintf(m_inputSampleRate));
cannam@0 625
cannam@0 626 Feature feature;
cannam@0 627 feature.hasTimestamp = true;
Chris@10 628 feature.timestamp = m_startTime + xt;
cannam@0 629 feature.values.clear();
Chris@52 630 feature.values.push_back(float(yt.sec + double(yt.nsec)/1.0e9));
Chris@16 631 returnFeatures[m_pathOutNo].push_back(feature);
cannam@0 632
cannam@0 633 if (x != prevx) {
cannam@0 634
cannam@0 635 feature.hasTimestamp = true;
Chris@10 636 feature.timestamp = m_startTime + xt;
cannam@0 637 feature.values.clear();
Chris@52 638 feature.values.push_back(float(yt.sec + yt.msec()/1000.0));
Chris@16 639 returnFeatures[m_abOutNo].push_back(feature);
cannam@0 640
cannam@0 641 Vamp::RealTime diff = yt - xt;
cannam@0 642 feature.values.clear();
Chris@52 643 feature.values.push_back(float(diff.sec + diff.msec()/1000.0));
Chris@16 644 returnFeatures[m_abDivOutNo].push_back(feature);
cannam@0 645
cannam@0 646 if (i > 0) {
cannam@0 647 int lookback = 100; //!!! arbitrary
cannam@0 648 if (lookback > i) lookback = i;
cannam@0 649 int xdiff = x - pathx[i-lookback];
cannam@0 650 int ydiff = y - pathy[i-lookback];
cannam@0 651 if (xdiff != 0 && ydiff != 0) {
cannam@0 652 float ratio = float(ydiff)/float(xdiff);
cannam@0 653 if (ratio < 8 && ratio > (1.0/8)) { //!!! just for now, since we aren't dealing properly with silence yet
cannam@0 654 feature.values.clear();
cannam@0 655 feature.values.push_back(ratio);
Chris@16 656 returnFeatures[m_abRatioOutNo].push_back(feature);
cannam@0 657 }
cannam@0 658 }
cannam@0 659 }
cannam@0 660 }
cannam@0 661
cannam@0 662 if (y != prevy) {
cannam@0 663 feature.hasTimestamp = true;
Chris@10 664 feature.timestamp = m_startTime + yt;
cannam@0 665 feature.values.clear();
Chris@52 666 feature.values.push_back(float(xt.sec + xt.msec()/1000.0));
Chris@16 667 returnFeatures[m_baOutNo].push_back(feature);
cannam@0 668 }
cannam@0 669
cannam@0 670 prevx = x;
cannam@0 671 prevy = y;
cannam@0 672 }
cannam@0 673
Chris@107 674 delete m_pipeline;
Chris@107 675 m_pipeline = 0;
cannam@0 676
cannam@0 677 if (m_locked) {
cannam@0 678 #ifdef _WIN32
cannam@0 679 ReleaseMutex(m_serialisingMutex);
cannam@0 680 #else
cannam@0 681 pthread_mutex_unlock(&m_serialisingMutex);
cannam@0 682 #endif
cannam@0 683 m_locked = false;
cannam@0 684 }
cannam@0 685
cannam@0 686 return returnFeatures;
cannam@0 687
cannam@0 688
cannam@0 689 /*
Chris@30 690 for (int i = 0; i < len; ++i) {
cannam@0 691 std::cerr << i << ": [" << pathx[i] << "," << pathy[i] << "]" << std::endl;
cannam@0 692 }
cannam@0 693
cannam@0 694 std::cerr << std::endl;
cannam@0 695 std::cerr << "File: A" << std::endl;
cannam@0 696 std::cerr << "Marks: -1" << std::endl;
cannam@0 697 std::cerr << "FixedPoints: true 0" << std::endl;
cannam@0 698 std::cerr << "0" << std::endl;
cannam@0 699 std::cerr << "0" << std::endl;
cannam@0 700 std::cerr << "0" << std::endl;
cannam@0 701 std::cerr << "0" << std::endl;
cannam@0 702 std::cerr << "File: B" << std::endl;
cannam@0 703 std::cerr << "Marks: 0" << std::endl;
cannam@0 704 std::cerr << "FixedPoints: true 0" << std::endl;
cannam@0 705 std::cerr << "0.02" << std::endl;
cannam@0 706 std::cerr << "0.02" << std::endl;
cannam@0 707
Chris@30 708 std::cerr << len << std::endl;
Chris@30 709 for (int i = 0; i < len; ++i) {
cannam@0 710 std::cerr << pathx[i] << std::endl;
cannam@0 711 }
cannam@0 712
Chris@30 713 std::cerr << len << std::endl;
Chris@30 714 for (int i = 0; i < len; ++i) {
cannam@0 715 std::cerr << pathy[i] << std::endl;
cannam@0 716 }
cannam@0 717 */
cannam@0 718 }
cannam@0 719
cannam@0 720 static Vamp::PluginAdapter<MatchVampPlugin> mvpAdapter;
cannam@0 721
cannam@0 722 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version,
cannam@0 723 unsigned int index)
cannam@0 724 {
cannam@0 725 if (version < 1) return 0;
cannam@0 726
cannam@0 727 switch (index) {
cannam@0 728 case 0: return mvpAdapter.getDescriptor();
cannam@0 729 default: return 0;
cannam@0 730 }
cannam@0 731 }