annotate src/MatchVampPlugin.cpp @ 107:a07b962e9f03 feature_conditioner

Use MatchPipeline in MatchVampPlugin
author Chris Cannam
date Thu, 04 Dec 2014 13:48:17 +0000
parents 6636aca831c0
children 4b263ef50c9b 46a652da1415
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@17 61 m_params(inputSampleRate, defaultStepTime, m_blockSize),
Chris@38 62 m_defaultParams(inputSampleRate, defaultStepTime, m_blockSize),
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@19 131 return 2;
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@25 207 desc.identifier = "gradientlimit";
Chris@25 208 desc.name = "Gradient Limit";
Chris@18 209 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 210 desc.minValue = 1;
Chris@18 211 desc.maxValue = 10;
Chris@18 212 desc.defaultValue = m_defaultParams.maxRunCount;
Chris@18 213 desc.isQuantized = true;
Chris@18 214 desc.quantizeStep = 1;
Chris@18 215 list.push_back(desc);
Chris@18 216
Chris@25 217 desc.identifier = "zonewidth";
Chris@25 218 desc.name = "Search Zone Width";
Chris@25 219 desc.description = "Width of the search zone (error margin) either side of the ongoing match position, in seconds";
Chris@25 220 desc.minValue = 1;
Chris@25 221 desc.maxValue = 60;
Chris@52 222 desc.defaultValue = (float)m_defaultParams.blockTime;
Chris@25 223 desc.isQuantized = true;
Chris@25 224 desc.quantizeStep = 1;
Chris@25 225 desc.unit = "s";
Chris@25 226 list.push_back(desc);
Chris@25 227
Chris@83 228 desc.identifier = "diagonalweight";
Chris@83 229 desc.name = "Diagonal Weight";
Chris@83 230 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 231 desc.minValue = 1.0;
Chris@86 232 desc.maxValue = 2.0;
Chris@83 233 desc.defaultValue = 2.0;
Chris@83 234 desc.isQuantized = false;
Chris@83 235 desc.unit = "";
Chris@83 236 list.push_back(desc);
Chris@83 237
Chris@32 238 desc.identifier = "smooth";
Chris@32 239 desc.name = "Smooth Path";
Chris@32 240 desc.description = "Smooth the path by replacing steps with diagonals";
Chris@32 241 desc.minValue = 0;
Chris@32 242 desc.maxValue = 1;
Chris@32 243 desc.defaultValue = 1;
Chris@32 244 desc.isQuantized = true;
Chris@32 245 desc.quantizeStep = 1;
Chris@32 246 desc.unit = "";
Chris@32 247 list.push_back(desc);
Chris@32 248
cannam@0 249 return list;
cannam@0 250 }
cannam@0 251
cannam@0 252 float
cannam@0 253 MatchVampPlugin::getParameter(std::string name) const
cannam@0 254 {
cannam@0 255 if (name == "serialise") {
cannam@0 256 return m_serialise ? 1.0 : 0.0;
Chris@18 257 } else if (name == "framenorm") {
Chris@103 258 return (int)m_fcParams.norm;
Chris@18 259 } else if (name == "distnorm") {
Chris@18 260 return (int)m_params.distanceNorm;
Chris@18 261 } else if (name == "usespecdiff") {
Chris@103 262 return (int)m_fcParams.order;
Chris@18 263 } else if (name == "usechroma") {
Chris@38 264 return m_feParams.useChromaFrequencyMap ? 1.0 : 0.0;
Chris@25 265 } else if (name == "gradientlimit") {
Chris@18 266 return m_params.maxRunCount;
Chris@83 267 } else if (name == "diagonalweight") {
Chris@83 268 return m_params.diagonalWeight;
Chris@25 269 } else if (name == "zonewidth") {
Chris@52 270 return (float)m_params.blockTime;
Chris@32 271 } else if (name == "smooth") {
Chris@32 272 return m_smooth ? 1.0 : 0.0;
cannam@0 273 }
Chris@18 274
cannam@0 275 return 0.0;
cannam@0 276 }
cannam@0 277
cannam@0 278 void
cannam@0 279 MatchVampPlugin::setParameter(std::string name, float value)
cannam@0 280 {
cannam@0 281 if (name == "serialise") {
cannam@0 282 m_serialise = (value > 0.5);
Chris@18 283 } else if (name == "framenorm") {
Chris@103 284 m_fcParams.norm = (FeatureConditioner::Normalisation)(int(value + 0.1));
Chris@18 285 } else if (name == "distnorm") {
Chris@26 286 m_params.distanceNorm = (DistanceMetric::DistanceNormalisation)(int(value + 0.1));
Chris@18 287 } else if (name == "usespecdiff") {
Chris@103 288 m_fcParams.order = (FeatureConditioner::OutputOrder)(int(value + 0.1));
Chris@18 289 } else if (name == "usechroma") {
Chris@38 290 m_feParams.useChromaFrequencyMap = (value > 0.5);
Chris@25 291 } else if (name == "gradientlimit") {
Chris@18 292 m_params.maxRunCount = int(value + 0.1);
Chris@83 293 } else if (name == "diagonalweight") {
Chris@83 294 m_params.diagonalWeight = value;
Chris@25 295 } else if (name == "zonewidth") {
Chris@25 296 m_params.blockTime = value;
Chris@32 297 } else if (name == "smooth") {
Chris@32 298 m_smooth = (value > 0.5);
cannam@0 299 }
cannam@0 300 }
cannam@0 301
cannam@0 302 size_t
cannam@0 303 MatchVampPlugin::getPreferredStepSize() const
cannam@0 304 {
Chris@52 305 return int(m_inputSampleRate * defaultStepTime + 0.001);
cannam@0 306 }
cannam@0 307
cannam@0 308 size_t
cannam@0 309 MatchVampPlugin::getPreferredBlockSize() const
cannam@0 310 {
Chris@15 311 return 2048;
cannam@0 312 }
cannam@0 313
cannam@0 314 void
Chris@17 315 MatchVampPlugin::createMatchers()
cannam@0 316 {
Chris@17 317 m_params.hopTime = m_stepTime;
Chris@17 318 m_params.fftSize = m_blockSize;
Chris@38 319 m_feParams.fftSize = m_blockSize;
Chris@107 320
Chris@107 321 m_pipeline = new MatchPipeline(m_feParams, m_fcParams, m_params);
cannam@0 322 }
cannam@0 323
cannam@0 324 bool
cannam@0 325 MatchVampPlugin::initialise(size_t channels, size_t stepSize, size_t blockSize)
cannam@0 326 {
Chris@10 327 if (m_inputSampleRate < sampleRateMin) {
Chris@10 328 std::cerr << "MatchVampPlugin::MatchVampPlugin: input sample rate "
Chris@10 329 << m_inputSampleRate << " < min supported rate "
Chris@10 330 << sampleRateMin << std::endl;
Chris@10 331 return false;
Chris@10 332 }
cannam@0 333 if (channels < getMinChannelCount() ||
cannam@0 334 channels > getMaxChannelCount()) return false;
cannam@1 335 if (stepSize > blockSize/2 ||
cannam@0 336 blockSize != getPreferredBlockSize()) return false;
Chris@15 337
cannam@6 338 m_stepSize = stepSize;
Chris@15 339 m_stepTime = float(stepSize) / m_inputSampleRate;
Chris@15 340 m_blockSize = blockSize;
Chris@15 341
Chris@15 342 createMatchers();
cannam@0 343 m_begin = true;
cannam@0 344 m_locked = false;
Chris@15 345
cannam@0 346 return true;
cannam@0 347 }
cannam@0 348
cannam@0 349 void
cannam@0 350 MatchVampPlugin::reset()
cannam@0 351 {
Chris@107 352 delete m_pipeline;
Chris@107 353 m_pipeline = 0;
Chris@74 354 m_frameNo = 0;
cannam@6 355 createMatchers();
cannam@6 356 m_begin = true;
cannam@6 357 m_locked = false;
cannam@0 358 }
cannam@0 359
cannam@0 360 MatchVampPlugin::OutputList
cannam@0 361 MatchVampPlugin::getOutputDescriptors() const
cannam@0 362 {
cannam@0 363 OutputList list;
cannam@0 364
Chris@52 365 float outRate = 1.0f / m_stepTime;
cannam@0 366
cannam@0 367 OutputDescriptor desc;
cannam@0 368 desc.identifier = "path";
cannam@0 369 desc.name = "Path";
cannam@0 370 desc.description = "Alignment path";
cannam@0 371 desc.unit = "";
cannam@0 372 desc.hasFixedBinCount = true;
cannam@0 373 desc.binCount = 1;
cannam@0 374 desc.hasKnownExtents = false;
cannam@0 375 desc.isQuantized = true;
cannam@0 376 desc.quantizeStep = 1;
cannam@0 377 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 378 desc.sampleRate = outRate;
Chris@16 379 m_pathOutNo = list.size();
cannam@0 380 list.push_back(desc);
cannam@0 381
cannam@0 382 desc.identifier = "a_b";
cannam@0 383 desc.name = "A-B Timeline";
cannam@0 384 desc.description = "Timing in performance B corresponding to moments in performance A";
cannam@0 385 desc.unit = "sec";
cannam@0 386 desc.hasFixedBinCount = true;
cannam@0 387 desc.binCount = 1;
cannam@0 388 desc.hasKnownExtents = false;
cannam@0 389 desc.isQuantized = false;
cannam@0 390 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 391 desc.sampleRate = outRate;
Chris@16 392 m_abOutNo = list.size();
cannam@0 393 list.push_back(desc);
cannam@0 394
cannam@0 395 desc.identifier = "b_a";
cannam@0 396 desc.name = "B-A Timeline";
cannam@0 397 desc.description = "Timing in performance A corresponding to moments in performance B";
cannam@0 398 desc.unit = "sec";
cannam@0 399 desc.hasFixedBinCount = true;
cannam@0 400 desc.binCount = 1;
cannam@0 401 desc.hasKnownExtents = false;
cannam@0 402 desc.isQuantized = false;
cannam@0 403 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 404 desc.sampleRate = outRate;
Chris@16 405 m_baOutNo = list.size();
cannam@0 406 list.push_back(desc);
cannam@0 407
cannam@0 408 desc.identifier = "a_b_divergence";
cannam@0 409 desc.name = "A-B Divergence";
cannam@0 410 desc.description = "Difference between timings in performances A and B";
cannam@0 411 desc.unit = "sec";
cannam@0 412 desc.hasFixedBinCount = true;
cannam@0 413 desc.binCount = 1;
cannam@0 414 desc.hasKnownExtents = false;
cannam@0 415 desc.isQuantized = false;
cannam@0 416 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 417 desc.sampleRate = outRate;
Chris@16 418 m_abDivOutNo = list.size();
cannam@0 419 list.push_back(desc);
cannam@0 420
cannam@0 421 desc.identifier = "a_b_temporatio";
cannam@0 422 desc.name = "A-B Tempo Ratio";
cannam@0 423 desc.description = "Ratio of tempi between performances A and B";
cannam@0 424 desc.unit = "";
cannam@0 425 desc.hasFixedBinCount = true;
cannam@0 426 desc.binCount = 1;
cannam@0 427 desc.hasKnownExtents = false;
cannam@0 428 desc.isQuantized = false;
cannam@0 429 desc.sampleType = OutputDescriptor::VariableSampleRate;
cannam@0 430 desc.sampleRate = outRate;
Chris@16 431 m_abRatioOutNo = list.size();
cannam@0 432 list.push_back(desc);
cannam@0 433
Chris@38 434 int featureSize = FeatureExtractor(m_feParams).getFeatureSize();
Chris@38 435
Chris@15 436 desc.identifier = "a_features";
Chris@15 437 desc.name = "A Features";
Chris@15 438 desc.description = "Spectral features extracted from performance A";
Chris@15 439 desc.unit = "";
Chris@15 440 desc.hasFixedBinCount = true;
Chris@38 441 desc.binCount = featureSize;
Chris@15 442 desc.hasKnownExtents = false;
Chris@15 443 desc.isQuantized = false;
Chris@16 444 desc.sampleType = OutputDescriptor::FixedSampleRate;
Chris@15 445 desc.sampleRate = outRate;
Chris@16 446 m_aFeaturesOutNo = list.size();
Chris@16 447 list.push_back(desc);
Chris@16 448
Chris@16 449 desc.identifier = "b_features";
Chris@16 450 desc.name = "B Features";
Chris@16 451 desc.description = "Spectral features extracted from performance B";
Chris@16 452 desc.unit = "";
Chris@16 453 desc.hasFixedBinCount = true;
Chris@38 454 desc.binCount = featureSize;
Chris@16 455 desc.hasKnownExtents = false;
Chris@16 456 desc.isQuantized = false;
Chris@16 457 desc.sampleType = OutputDescriptor::FixedSampleRate;
Chris@16 458 desc.sampleRate = outRate;
Chris@16 459 m_bFeaturesOutNo = list.size();
Chris@15 460 list.push_back(desc);
Chris@15 461
cannam@0 462 return list;
cannam@0 463 }
cannam@0 464
cannam@0 465 MatchVampPlugin::FeatureSet
cannam@0 466 MatchVampPlugin::process(const float *const *inputBuffers,
cannam@0 467 Vamp::RealTime timestamp)
cannam@0 468 {
cannam@0 469 if (m_begin) {
cannam@0 470 if (!m_locked && m_serialise) {
cannam@0 471 m_locked = true;
cannam@0 472 #ifdef _WIN32
cannam@0 473 WaitForSingleObject(m_serialisingMutex, INFINITE);
cannam@0 474 #else
cannam@0 475 pthread_mutex_lock(&m_serialisingMutex);
cannam@0 476 #endif
cannam@0 477 }
Chris@10 478 m_startTime = timestamp;
cannam@0 479 m_begin = false;
cannam@0 480 }
cannam@0 481
cannam@0 482 // std::cerr << timestamp.toString();
cannam@0 483
Chris@107 484 m_pipeline->feedFrequencyDomainAudio(inputBuffers[0], inputBuffers[1]);
Chris@74 485
Chris@107 486 vector<double> f1, f2;
Chris@107 487 m_pipeline->extractConditionedFeatures(f1, f2);
Chris@16 488
Chris@16 489 FeatureSet returnFeatures;
Chris@16 490
Chris@16 491 Feature f;
Chris@16 492 f.hasTimestamp = false;
Chris@16 493
Chris@74 494 f.values.clear();
Chris@74 495 for (int j = 0; j < (int)f1.size(); ++j) {
Chris@74 496 f.values.push_back(float(f1[j]));
Chris@16 497 }
Chris@74 498 returnFeatures[m_aFeaturesOutNo].push_back(f);
Chris@16 499
Chris@74 500 f.values.clear();
Chris@74 501 for (int j = 0; j < (int)f2.size(); ++j) {
Chris@74 502 f.values.push_back(float(f2[j]));
Chris@16 503 }
Chris@74 504 returnFeatures[m_bFeaturesOutNo].push_back(f);
cannam@0 505
cannam@0 506 // std::cerr << ".";
cannam@0 507 // std::cerr << std::endl;
cannam@0 508
Chris@74 509 ++m_frameNo;
Chris@74 510
Chris@16 511 return returnFeatures;
cannam@0 512 }
cannam@0 513
cannam@0 514 MatchVampPlugin::FeatureSet
cannam@0 515 MatchVampPlugin::getRemainingFeatures()
cannam@0 516 {
Chris@107 517 m_pipeline->finish();
Chris@74 518
Chris@63 519 FeatureSet returnFeatures;
Chris@63 520
Chris@107 521 Finder *finder = m_pipeline->getFinder();
cannam@0 522 std::vector<int> pathx;
cannam@0 523 std::vector<int> pathy;
Chris@32 524 int len = finder->retrievePath(m_smooth, pathx, pathy);
cannam@0 525
cannam@0 526 int prevx = 0;
cannam@0 527 int prevy = 0;
cannam@0 528
Chris@30 529 for (int i = 0; i < len; ++i) {
cannam@0 530
cannam@0 531 int x = pathx[i];
cannam@0 532 int y = pathy[i];
cannam@0 533
cannam@0 534 Vamp::RealTime xt = Vamp::RealTime::frame2RealTime
Chris@15 535 (x * m_stepSize, lrintf(m_inputSampleRate));
cannam@0 536 Vamp::RealTime yt = Vamp::RealTime::frame2RealTime
Chris@15 537 (y * m_stepSize, lrintf(m_inputSampleRate));
cannam@0 538
cannam@0 539 Feature feature;
cannam@0 540 feature.hasTimestamp = true;
Chris@10 541 feature.timestamp = m_startTime + xt;
cannam@0 542 feature.values.clear();
Chris@52 543 feature.values.push_back(float(yt.sec + double(yt.nsec)/1.0e9));
Chris@16 544 returnFeatures[m_pathOutNo].push_back(feature);
cannam@0 545
cannam@0 546 if (x != prevx) {
cannam@0 547
cannam@0 548 feature.hasTimestamp = true;
Chris@10 549 feature.timestamp = m_startTime + xt;
cannam@0 550 feature.values.clear();
Chris@52 551 feature.values.push_back(float(yt.sec + yt.msec()/1000.0));
Chris@16 552 returnFeatures[m_abOutNo].push_back(feature);
cannam@0 553
cannam@0 554 Vamp::RealTime diff = yt - xt;
cannam@0 555 feature.values.clear();
Chris@52 556 feature.values.push_back(float(diff.sec + diff.msec()/1000.0));
Chris@16 557 returnFeatures[m_abDivOutNo].push_back(feature);
cannam@0 558
cannam@0 559 if (i > 0) {
cannam@0 560 int lookback = 100; //!!! arbitrary
cannam@0 561 if (lookback > i) lookback = i;
cannam@0 562 int xdiff = x - pathx[i-lookback];
cannam@0 563 int ydiff = y - pathy[i-lookback];
cannam@0 564 if (xdiff != 0 && ydiff != 0) {
cannam@0 565 float ratio = float(ydiff)/float(xdiff);
cannam@0 566 if (ratio < 8 && ratio > (1.0/8)) { //!!! just for now, since we aren't dealing properly with silence yet
cannam@0 567 feature.values.clear();
cannam@0 568 feature.values.push_back(ratio);
Chris@16 569 returnFeatures[m_abRatioOutNo].push_back(feature);
cannam@0 570 }
cannam@0 571 }
cannam@0 572 }
cannam@0 573 }
cannam@0 574
cannam@0 575 if (y != prevy) {
cannam@0 576 feature.hasTimestamp = true;
Chris@10 577 feature.timestamp = m_startTime + yt;
cannam@0 578 feature.values.clear();
Chris@52 579 feature.values.push_back(float(xt.sec + xt.msec()/1000.0));
Chris@16 580 returnFeatures[m_baOutNo].push_back(feature);
cannam@0 581 }
cannam@0 582
cannam@0 583 prevx = x;
cannam@0 584 prevy = y;
cannam@0 585 }
cannam@0 586
Chris@107 587 delete m_pipeline;
Chris@107 588 m_pipeline = 0;
cannam@0 589
cannam@0 590 if (m_locked) {
cannam@0 591 #ifdef _WIN32
cannam@0 592 ReleaseMutex(m_serialisingMutex);
cannam@0 593 #else
cannam@0 594 pthread_mutex_unlock(&m_serialisingMutex);
cannam@0 595 #endif
cannam@0 596 m_locked = false;
cannam@0 597 }
cannam@0 598
cannam@0 599 return returnFeatures;
cannam@0 600
cannam@0 601
cannam@0 602 /*
Chris@30 603 for (int i = 0; i < len; ++i) {
cannam@0 604 std::cerr << i << ": [" << pathx[i] << "," << pathy[i] << "]" << std::endl;
cannam@0 605 }
cannam@0 606
cannam@0 607 std::cerr << std::endl;
cannam@0 608 std::cerr << "File: A" << std::endl;
cannam@0 609 std::cerr << "Marks: -1" << std::endl;
cannam@0 610 std::cerr << "FixedPoints: true 0" << std::endl;
cannam@0 611 std::cerr << "0" << std::endl;
cannam@0 612 std::cerr << "0" << std::endl;
cannam@0 613 std::cerr << "0" << std::endl;
cannam@0 614 std::cerr << "0" << std::endl;
cannam@0 615 std::cerr << "File: B" << std::endl;
cannam@0 616 std::cerr << "Marks: 0" << std::endl;
cannam@0 617 std::cerr << "FixedPoints: true 0" << std::endl;
cannam@0 618 std::cerr << "0.02" << std::endl;
cannam@0 619 std::cerr << "0.02" << std::endl;
cannam@0 620
Chris@30 621 std::cerr << len << std::endl;
Chris@30 622 for (int i = 0; i < len; ++i) {
cannam@0 623 std::cerr << pathx[i] << std::endl;
cannam@0 624 }
cannam@0 625
Chris@30 626 std::cerr << len << std::endl;
Chris@30 627 for (int i = 0; i < len; ++i) {
cannam@0 628 std::cerr << pathy[i] << std::endl;
cannam@0 629 }
cannam@0 630 */
cannam@0 631 }
cannam@0 632
cannam@0 633 static Vamp::PluginAdapter<MatchVampPlugin> mvpAdapter;
cannam@0 634
cannam@0 635 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version,
cannam@0 636 unsigned int index)
cannam@0 637 {
cannam@0 638 if (version < 1) return 0;
cannam@0 639
cannam@0 640 switch (index) {
cannam@0 641 case 0: return mvpAdapter.getDescriptor();
cannam@0 642 default: return 0;
cannam@0 643 }
cannam@0 644 }