annotate src/MatchVampPlugin.cpp @ 137:a1de1888a96c refactors

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