cannam@0: /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ cannam@0: cannam@0: /* cannam@0: Vamp feature extraction plugin using the MATCH audio alignment cannam@0: algorithm. cannam@0: cannam@0: Centre for Digital Music, Queen Mary, University of London. cannam@0: This file copyright 2007 Simon Dixon, Chris Cannam and QMUL. cannam@0: cannam@0: This program is free software; you can redistribute it and/or cannam@0: modify it under the terms of the GNU General Public License as cannam@0: published by the Free Software Foundation; either version 2 of the cannam@0: License, or (at your option) any later version. See the file cannam@0: COPYING included with this distribution for more information. cannam@0: */ cannam@0: cannam@0: #include "MatchVampPlugin.h" cannam@0: cannam@0: #include "Matcher.h" Chris@74: #include "MatchFeatureFeeder.h" Chris@74: #include "FeatureExtractor.h" cannam@0: #include "Path.h" cannam@0: cannam@0: #include cannam@0: #include cannam@0: #include cannam@0: cannam@0: #include cannam@0: #include cannam@0: cannam@0: //static int extant = 0; cannam@0: cannam@0: #ifdef _WIN32 cannam@0: HANDLE cannam@0: MatchVampPlugin::m_serialisingMutex; cannam@0: #else cannam@0: pthread_mutex_t cannam@0: MatchVampPlugin::m_serialisingMutex; cannam@0: #endif cannam@0: cannam@0: bool cannam@0: MatchVampPlugin::m_serialisingMutexInitialised = false; cannam@0: Chris@10: // We want to ensure our freq map / crossover bin in Matcher.cpp are Chris@10: // always valid with a fixed FFT length in seconds, so must reject low Chris@10: // sample rates Chris@10: static float sampleRateMin = 5000.f; Chris@10: Chris@52: static float defaultStepTime = 0.020f; Chris@15: cannam@0: MatchVampPlugin::MatchVampPlugin(float inputSampleRate) : cannam@0: Plugin(inputSampleRate), Chris@52: m_stepSize(int(inputSampleRate * defaultStepTime + 0.001)), Chris@15: m_stepTime(defaultStepTime), Chris@16: m_blockSize(2048), cannam@0: m_serialise(false), cannam@0: m_begin(true), Chris@17: m_locked(false), Chris@138: m_smooth(false), Chris@74: m_frameNo(0), Chris@113: m_params(defaultStepTime), Chris@113: m_defaultParams(defaultStepTime), Chris@38: m_feParams(inputSampleRate, m_blockSize), Chris@103: m_defaultFeParams(inputSampleRate, m_blockSize), Chris@103: m_fcParams(), Chris@143: m_defaultFcParams(), Chris@143: m_dParams(), Chris@143: m_defaultDParams() cannam@0: { Chris@10: if (inputSampleRate < sampleRateMin) { Chris@10: std::cerr << "MatchVampPlugin::MatchVampPlugin: input sample rate " Chris@10: << inputSampleRate << " < min supported rate " Chris@10: << sampleRateMin << ", plugin will refuse to initialise" Chris@10: << std::endl; Chris@10: } Chris@10: cannam@0: if (!m_serialisingMutexInitialised) { cannam@0: m_serialisingMutexInitialised = true; cannam@0: #ifdef _WIN32 cannam@0: m_serialisingMutex = CreateMutex(NULL, FALSE, NULL); cannam@0: #else cannam@0: pthread_mutex_init(&m_serialisingMutex, 0); cannam@0: #endif cannam@0: } cannam@0: Chris@107: m_pipeline = 0; cannam@0: // std::cerr << "MatchVampPlugin::MatchVampPlugin(" << this << "): extant = " << ++extant << std::endl; cannam@0: } cannam@0: cannam@0: MatchVampPlugin::~MatchVampPlugin() cannam@0: { cannam@0: // std::cerr << "MatchVampPlugin::~MatchVampPlugin(" << this << "): extant = " << --extant << std::endl; cannam@0: Chris@107: delete m_pipeline; cannam@0: cannam@0: if (m_locked) { cannam@0: #ifdef _WIN32 cannam@0: ReleaseMutex(m_serialisingMutex); cannam@0: #else cannam@0: pthread_mutex_unlock(&m_serialisingMutex); cannam@0: #endif cannam@0: m_locked = false; cannam@0: } cannam@0: } cannam@0: cannam@0: string cannam@0: MatchVampPlugin::getIdentifier() const cannam@0: { cannam@0: return "match"; cannam@0: } cannam@0: cannam@0: string cannam@0: MatchVampPlugin::getName() const cannam@0: { cannam@0: return "Match Performance Aligner"; cannam@0: } cannam@0: cannam@0: string cannam@0: MatchVampPlugin::getDescription() const cannam@0: { cannam@0: return "Calculate alignment between two performances in separate channel inputs"; cannam@0: } cannam@0: cannam@0: string cannam@0: MatchVampPlugin::getMaker() const cannam@0: { cannam@0: return "Simon Dixon (plugin by Chris Cannam)"; cannam@0: } cannam@0: cannam@0: int cannam@0: MatchVampPlugin::getPluginVersion() const cannam@0: { Chris@137: return 3; cannam@0: } cannam@0: cannam@0: string cannam@0: MatchVampPlugin::getCopyright() const cannam@0: { cannam@0: return "GPL"; cannam@0: } cannam@0: cannam@0: MatchVampPlugin::ParameterList cannam@0: MatchVampPlugin::getParameterDescriptors() const cannam@0: { cannam@0: ParameterList list; cannam@0: cannam@0: ParameterDescriptor desc; Chris@18: cannam@0: desc.identifier = "serialise"; cannam@0: desc.name = "Serialise Plugin Invocations"; cannam@0: desc.description = "Reduce potential memory load at the expense of multiprocessor performance by serialising multi-threaded plugin runs"; cannam@0: desc.minValue = 0; cannam@0: desc.maxValue = 1; cannam@0: desc.defaultValue = 0; cannam@0: desc.isQuantized = true; cannam@0: desc.quantizeStep = 1; cannam@0: list.push_back(desc); cannam@0: Chris@18: desc.identifier = "framenorm"; Chris@18: desc.name = "Frame Normalisation"; Chris@18: desc.description = "Type of normalisation to use for frequency-domain audio features"; Chris@18: desc.minValue = 0; Chris@18: desc.maxValue = 2; Chris@103: desc.defaultValue = (int)m_defaultFcParams.norm; Chris@18: desc.isQuantized = true; Chris@18: desc.quantizeStep = 1; Chris@18: desc.valueNames.clear(); Chris@18: desc.valueNames.push_back("None"); Chris@18: desc.valueNames.push_back("Sum To 1"); Chris@18: desc.valueNames.push_back("Long-Term Average"); Chris@18: list.push_back(desc); Chris@18: desc.valueNames.clear(); Chris@18: Chris@18: desc.identifier = "distnorm"; Chris@18: desc.name = "Distance Normalisation"; Chris@18: desc.description = "Type of normalisation to use for distance metric"; Chris@18: desc.minValue = 0; Chris@18: desc.maxValue = 2; Chris@143: desc.defaultValue = (int)m_defaultDParams.norm; Chris@18: desc.isQuantized = true; Chris@18: desc.quantizeStep = 1; Chris@18: desc.valueNames.clear(); Chris@18: desc.valueNames.push_back("None"); Chris@18: desc.valueNames.push_back("Sum of Frames"); Chris@18: desc.valueNames.push_back("Log Sum of Frames"); Chris@18: list.push_back(desc); Chris@18: desc.valueNames.clear(); Chris@18: Chris@18: desc.identifier = "usespecdiff"; Chris@18: desc.name = "Use Spectral Difference"; Chris@18: desc.description = "Whether to use half-wave rectified spectral difference instead of straight spectrum"; Chris@18: desc.minValue = 0; Chris@18: desc.maxValue = 1; Chris@103: desc.defaultValue = (int)m_defaultFcParams.order; Chris@18: desc.isQuantized = true; Chris@18: desc.quantizeStep = 1; Chris@18: list.push_back(desc); Chris@18: Chris@18: desc.identifier = "usechroma"; Chris@18: desc.name = "Use Chroma Frequency Map"; Chris@18: desc.description = "Whether to use a chroma frequency map instead of the default warped spectrogram"; Chris@18: desc.minValue = 0; Chris@18: desc.maxValue = 1; Chris@38: desc.defaultValue = m_defaultFeParams.useChromaFrequencyMap ? 1 : 0; Chris@18: desc.isQuantized = true; Chris@18: desc.quantizeStep = 1; Chris@18: list.push_back(desc); Chris@18: Chris@136: desc.identifier = "silencethreshold"; Chris@136: desc.name = "Silence Threshold"; Chris@136: desc.description = "Total frame energy threshold below which a feature will be regarded as silent"; Chris@136: desc.minValue = 0; Chris@136: desc.maxValue = 1; Chris@136: desc.defaultValue = m_defaultFcParams.silenceThreshold; Chris@136: desc.isQuantized = false; Chris@136: list.push_back(desc); Chris@136: Chris@25: desc.identifier = "gradientlimit"; Chris@25: desc.name = "Gradient Limit"; Chris@18: 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: desc.minValue = 1; Chris@18: desc.maxValue = 10; Chris@18: desc.defaultValue = m_defaultParams.maxRunCount; Chris@18: desc.isQuantized = true; Chris@18: desc.quantizeStep = 1; Chris@18: list.push_back(desc); Chris@18: Chris@25: desc.identifier = "zonewidth"; Chris@25: desc.name = "Search Zone Width"; Chris@25: desc.description = "Width of the search zone (error margin) either side of the ongoing match position, in seconds"; Chris@25: desc.minValue = 1; Chris@25: desc.maxValue = 60; Chris@52: desc.defaultValue = (float)m_defaultParams.blockTime; Chris@25: desc.isQuantized = true; Chris@25: desc.quantizeStep = 1; Chris@25: desc.unit = "s"; Chris@25: list.push_back(desc); Chris@25: Chris@83: desc.identifier = "diagonalweight"; Chris@83: desc.name = "Diagonal Weight"; Chris@83: 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: desc.minValue = 1.0; Chris@86: desc.maxValue = 2.0; Chris@138: desc.defaultValue = (float)m_defaultParams.diagonalWeight; Chris@83: desc.isQuantized = false; Chris@83: desc.unit = ""; Chris@83: list.push_back(desc); Chris@83: Chris@32: desc.identifier = "smooth"; Chris@32: desc.name = "Smooth Path"; Chris@138: 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: desc.minValue = 0; Chris@32: desc.maxValue = 1; Chris@138: desc.defaultValue = 0; Chris@32: desc.isQuantized = true; Chris@32: desc.quantizeStep = 1; Chris@32: desc.unit = ""; Chris@32: list.push_back(desc); Chris@32: cannam@0: return list; cannam@0: } cannam@0: cannam@0: float cannam@0: MatchVampPlugin::getParameter(std::string name) const cannam@0: { cannam@0: if (name == "serialise") { cannam@0: return m_serialise ? 1.0 : 0.0; Chris@18: } else if (name == "framenorm") { Chris@103: return (int)m_fcParams.norm; Chris@18: } else if (name == "distnorm") { Chris@143: return (int)m_dParams.norm; Chris@18: } else if (name == "usespecdiff") { Chris@103: return (int)m_fcParams.order; Chris@18: } else if (name == "usechroma") { Chris@38: return m_feParams.useChromaFrequencyMap ? 1.0 : 0.0; Chris@25: } else if (name == "gradientlimit") { Chris@18: return m_params.maxRunCount; Chris@83: } else if (name == "diagonalweight") { Chris@83: return m_params.diagonalWeight; Chris@25: } else if (name == "zonewidth") { Chris@52: return (float)m_params.blockTime; Chris@32: } else if (name == "smooth") { Chris@32: return m_smooth ? 1.0 : 0.0; Chris@136: } else if (name == "silencethreshold") { Chris@136: return m_fcParams.silenceThreshold; cannam@0: } Chris@18: cannam@0: return 0.0; cannam@0: } cannam@0: cannam@0: void cannam@0: MatchVampPlugin::setParameter(std::string name, float value) cannam@0: { cannam@0: if (name == "serialise") { cannam@0: m_serialise = (value > 0.5); Chris@18: } else if (name == "framenorm") { Chris@103: m_fcParams.norm = (FeatureConditioner::Normalisation)(int(value + 0.1)); Chris@18: } else if (name == "distnorm") { Chris@143: m_dParams.norm = (DistanceMetric::DistanceNormalisation)(int(value + 0.1)); Chris@18: } else if (name == "usespecdiff") { Chris@103: m_fcParams.order = (FeatureConditioner::OutputOrder)(int(value + 0.1)); Chris@18: } else if (name == "usechroma") { Chris@38: m_feParams.useChromaFrequencyMap = (value > 0.5); Chris@25: } else if (name == "gradientlimit") { Chris@18: m_params.maxRunCount = int(value + 0.1); Chris@83: } else if (name == "diagonalweight") { Chris@83: m_params.diagonalWeight = value; Chris@25: } else if (name == "zonewidth") { Chris@25: m_params.blockTime = value; Chris@32: } else if (name == "smooth") { Chris@32: m_smooth = (value > 0.5); Chris@136: } else if (name == "silencethreshold") { Chris@136: m_fcParams.silenceThreshold = value; cannam@0: } cannam@0: } cannam@0: cannam@0: size_t cannam@0: MatchVampPlugin::getPreferredStepSize() const cannam@0: { Chris@52: return int(m_inputSampleRate * defaultStepTime + 0.001); cannam@0: } cannam@0: cannam@0: size_t cannam@0: MatchVampPlugin::getPreferredBlockSize() const cannam@0: { Chris@15: return 2048; cannam@0: } cannam@0: cannam@0: void Chris@17: MatchVampPlugin::createMatchers() cannam@0: { Chris@17: m_params.hopTime = m_stepTime; Chris@38: m_feParams.fftSize = m_blockSize; Chris@107: Chris@143: m_pipeline = new MatchPipeline(m_feParams, m_fcParams, m_dParams, m_params); cannam@0: } cannam@0: cannam@0: bool cannam@0: MatchVampPlugin::initialise(size_t channels, size_t stepSize, size_t blockSize) cannam@0: { Chris@10: if (m_inputSampleRate < sampleRateMin) { Chris@10: std::cerr << "MatchVampPlugin::MatchVampPlugin: input sample rate " Chris@10: << m_inputSampleRate << " < min supported rate " Chris@10: << sampleRateMin << std::endl; Chris@10: return false; Chris@10: } cannam@0: if (channels < getMinChannelCount() || cannam@0: channels > getMaxChannelCount()) return false; cannam@1: if (stepSize > blockSize/2 || cannam@0: blockSize != getPreferredBlockSize()) return false; Chris@15: cannam@6: m_stepSize = stepSize; Chris@15: m_stepTime = float(stepSize) / m_inputSampleRate; Chris@15: m_blockSize = blockSize; Chris@15: Chris@15: createMatchers(); cannam@0: m_begin = true; cannam@0: m_locked = false; Chris@15: cannam@0: return true; cannam@0: } cannam@0: cannam@0: void cannam@0: MatchVampPlugin::reset() cannam@0: { Chris@107: delete m_pipeline; Chris@107: m_pipeline = 0; Chris@74: m_frameNo = 0; cannam@6: createMatchers(); cannam@6: m_begin = true; cannam@6: m_locked = false; cannam@0: } cannam@0: cannam@0: MatchVampPlugin::OutputList cannam@0: MatchVampPlugin::getOutputDescriptors() const cannam@0: { cannam@0: OutputList list; cannam@0: Chris@52: float outRate = 1.0f / m_stepTime; cannam@0: cannam@0: OutputDescriptor desc; cannam@0: desc.identifier = "path"; cannam@0: desc.name = "Path"; cannam@0: desc.description = "Alignment path"; cannam@0: desc.unit = ""; cannam@0: desc.hasFixedBinCount = true; cannam@0: desc.binCount = 1; cannam@0: desc.hasKnownExtents = false; cannam@0: desc.isQuantized = true; cannam@0: desc.quantizeStep = 1; cannam@0: desc.sampleType = OutputDescriptor::VariableSampleRate; cannam@0: desc.sampleRate = outRate; Chris@16: m_pathOutNo = list.size(); cannam@0: list.push_back(desc); cannam@0: cannam@0: desc.identifier = "a_b"; cannam@0: desc.name = "A-B Timeline"; cannam@0: desc.description = "Timing in performance B corresponding to moments in performance A"; cannam@0: desc.unit = "sec"; cannam@0: desc.hasFixedBinCount = true; cannam@0: desc.binCount = 1; cannam@0: desc.hasKnownExtents = false; cannam@0: desc.isQuantized = false; cannam@0: desc.sampleType = OutputDescriptor::VariableSampleRate; cannam@0: desc.sampleRate = outRate; Chris@16: m_abOutNo = list.size(); cannam@0: list.push_back(desc); cannam@0: cannam@0: desc.identifier = "b_a"; cannam@0: desc.name = "B-A Timeline"; cannam@0: desc.description = "Timing in performance A corresponding to moments in performance B"; cannam@0: desc.unit = "sec"; cannam@0: desc.hasFixedBinCount = true; cannam@0: desc.binCount = 1; cannam@0: desc.hasKnownExtents = false; cannam@0: desc.isQuantized = false; cannam@0: desc.sampleType = OutputDescriptor::VariableSampleRate; cannam@0: desc.sampleRate = outRate; Chris@16: m_baOutNo = list.size(); cannam@0: list.push_back(desc); cannam@0: cannam@0: desc.identifier = "a_b_divergence"; cannam@0: desc.name = "A-B Divergence"; cannam@0: desc.description = "Difference between timings in performances A and B"; cannam@0: desc.unit = "sec"; cannam@0: desc.hasFixedBinCount = true; cannam@0: desc.binCount = 1; cannam@0: desc.hasKnownExtents = false; cannam@0: desc.isQuantized = false; cannam@0: desc.sampleType = OutputDescriptor::VariableSampleRate; cannam@0: desc.sampleRate = outRate; Chris@16: m_abDivOutNo = list.size(); cannam@0: list.push_back(desc); cannam@0: cannam@0: desc.identifier = "a_b_temporatio"; cannam@0: desc.name = "A-B Tempo Ratio"; cannam@0: desc.description = "Ratio of tempi between performances A and B"; cannam@0: desc.unit = ""; cannam@0: desc.hasFixedBinCount = true; cannam@0: desc.binCount = 1; cannam@0: desc.hasKnownExtents = false; cannam@0: desc.isQuantized = false; cannam@0: desc.sampleType = OutputDescriptor::VariableSampleRate; cannam@0: desc.sampleRate = outRate; Chris@16: m_abRatioOutNo = list.size(); cannam@0: list.push_back(desc); cannam@0: Chris@38: int featureSize = FeatureExtractor(m_feParams).getFeatureSize(); Chris@38: Chris@15: desc.identifier = "a_features"; Chris@140: desc.name = "Raw A Features"; Chris@15: desc.description = "Spectral features extracted from performance A"; Chris@15: desc.unit = ""; Chris@15: desc.hasFixedBinCount = true; Chris@38: desc.binCount = featureSize; Chris@15: desc.hasKnownExtents = false; Chris@15: desc.isQuantized = false; Chris@16: desc.sampleType = OutputDescriptor::FixedSampleRate; Chris@15: desc.sampleRate = outRate; Chris@16: m_aFeaturesOutNo = list.size(); Chris@16: list.push_back(desc); Chris@16: Chris@16: desc.identifier = "b_features"; Chris@140: desc.name = "Raw B Features"; Chris@16: desc.description = "Spectral features extracted from performance B"; Chris@16: desc.unit = ""; Chris@16: desc.hasFixedBinCount = true; Chris@38: desc.binCount = featureSize; Chris@16: desc.hasKnownExtents = false; Chris@16: desc.isQuantized = false; Chris@16: desc.sampleType = OutputDescriptor::FixedSampleRate; Chris@16: desc.sampleRate = outRate; Chris@16: m_bFeaturesOutNo = list.size(); Chris@15: list.push_back(desc); Chris@15: Chris@140: desc.identifier = "a_cfeatures"; Chris@140: desc.name = "Conditioned A Features"; Chris@140: desc.description = "Spectral features extracted from performance A, after normalisation and conditioning"; Chris@140: desc.unit = ""; Chris@140: desc.hasFixedBinCount = true; Chris@140: desc.binCount = featureSize; Chris@140: desc.hasKnownExtents = false; Chris@140: desc.isQuantized = false; Chris@140: desc.sampleType = OutputDescriptor::FixedSampleRate; Chris@140: desc.sampleRate = outRate; Chris@140: m_caFeaturesOutNo = list.size(); Chris@140: list.push_back(desc); Chris@140: Chris@140: desc.identifier = "b_cfeatures"; Chris@140: desc.name = "Conditioned B Features"; Chris@140: desc.description = "Spectral features extracted from performance B, after norrmalisation and conditioning"; Chris@140: desc.unit = ""; Chris@140: desc.hasFixedBinCount = true; Chris@140: desc.binCount = featureSize; Chris@140: desc.hasKnownExtents = false; Chris@140: desc.isQuantized = false; Chris@140: desc.sampleType = OutputDescriptor::FixedSampleRate; Chris@140: desc.sampleRate = outRate; Chris@140: m_cbFeaturesOutNo = list.size(); Chris@140: list.push_back(desc); Chris@140: cannam@0: return list; cannam@0: } cannam@0: cannam@0: MatchVampPlugin::FeatureSet cannam@0: MatchVampPlugin::process(const float *const *inputBuffers, cannam@0: Vamp::RealTime timestamp) cannam@0: { cannam@0: if (m_begin) { cannam@0: if (!m_locked && m_serialise) { cannam@0: m_locked = true; cannam@0: #ifdef _WIN32 cannam@0: WaitForSingleObject(m_serialisingMutex, INFINITE); cannam@0: #else cannam@0: pthread_mutex_lock(&m_serialisingMutex); cannam@0: #endif cannam@0: } Chris@10: m_startTime = timestamp; cannam@0: m_begin = false; cannam@0: } cannam@0: cannam@0: // std::cerr << timestamp.toString(); cannam@0: Chris@107: m_pipeline->feedFrequencyDomainAudio(inputBuffers[0], inputBuffers[1]); Chris@74: Chris@140: FeatureSet returnFeatures; Chris@140: Chris@107: vector f1, f2; Chris@140: m_pipeline->extractFeatures(f1, f2); Chris@16: Chris@140: vector cf1, cf2; Chris@140: m_pipeline->extractConditionedFeatures(cf1, cf2); Chris@16: Chris@16: Feature f; Chris@16: f.hasTimestamp = false; Chris@16: Chris@74: f.values.clear(); Chris@74: for (int j = 0; j < (int)f1.size(); ++j) { Chris@74: f.values.push_back(float(f1[j])); Chris@16: } Chris@74: returnFeatures[m_aFeaturesOutNo].push_back(f); Chris@16: Chris@74: f.values.clear(); Chris@74: for (int j = 0; j < (int)f2.size(); ++j) { Chris@74: f.values.push_back(float(f2[j])); Chris@16: } Chris@74: returnFeatures[m_bFeaturesOutNo].push_back(f); cannam@0: Chris@140: f.values.clear(); Chris@140: for (int j = 0; j < (int)cf1.size(); ++j) { Chris@140: f.values.push_back(float(cf1[j])); Chris@140: } Chris@140: returnFeatures[m_caFeaturesOutNo].push_back(f); Chris@140: Chris@140: f.values.clear(); Chris@140: for (int j = 0; j < (int)cf2.size(); ++j) { Chris@140: f.values.push_back(float(cf2[j])); Chris@140: } Chris@140: returnFeatures[m_cbFeaturesOutNo].push_back(f); Chris@140: cannam@0: // std::cerr << "."; cannam@0: // std::cerr << std::endl; cannam@0: Chris@74: ++m_frameNo; Chris@74: Chris@16: return returnFeatures; cannam@0: } cannam@0: cannam@0: MatchVampPlugin::FeatureSet cannam@0: MatchVampPlugin::getRemainingFeatures() cannam@0: { Chris@107: m_pipeline->finish(); Chris@74: Chris@63: FeatureSet returnFeatures; Chris@63: Chris@107: Finder *finder = m_pipeline->getFinder(); cannam@0: std::vector pathx; cannam@0: std::vector pathy; Chris@32: int len = finder->retrievePath(m_smooth, pathx, pathy); cannam@0: cannam@0: int prevx = 0; cannam@0: int prevy = 0; cannam@0: Chris@30: for (int i = 0; i < len; ++i) { cannam@0: cannam@0: int x = pathx[i]; cannam@0: int y = pathy[i]; cannam@0: cannam@0: Vamp::RealTime xt = Vamp::RealTime::frame2RealTime Chris@15: (x * m_stepSize, lrintf(m_inputSampleRate)); cannam@0: Vamp::RealTime yt = Vamp::RealTime::frame2RealTime Chris@15: (y * m_stepSize, lrintf(m_inputSampleRate)); cannam@0: cannam@0: Feature feature; cannam@0: feature.hasTimestamp = true; Chris@10: feature.timestamp = m_startTime + xt; cannam@0: feature.values.clear(); Chris@52: feature.values.push_back(float(yt.sec + double(yt.nsec)/1.0e9)); Chris@16: returnFeatures[m_pathOutNo].push_back(feature); cannam@0: cannam@0: if (x != prevx) { cannam@0: cannam@0: feature.hasTimestamp = true; Chris@10: feature.timestamp = m_startTime + xt; cannam@0: feature.values.clear(); Chris@52: feature.values.push_back(float(yt.sec + yt.msec()/1000.0)); Chris@16: returnFeatures[m_abOutNo].push_back(feature); cannam@0: cannam@0: Vamp::RealTime diff = yt - xt; cannam@0: feature.values.clear(); Chris@52: feature.values.push_back(float(diff.sec + diff.msec()/1000.0)); Chris@16: returnFeatures[m_abDivOutNo].push_back(feature); cannam@0: cannam@0: if (i > 0) { cannam@0: int lookback = 100; //!!! arbitrary cannam@0: if (lookback > i) lookback = i; cannam@0: int xdiff = x - pathx[i-lookback]; cannam@0: int ydiff = y - pathy[i-lookback]; cannam@0: if (xdiff != 0 && ydiff != 0) { cannam@0: float ratio = float(ydiff)/float(xdiff); cannam@0: if (ratio < 8 && ratio > (1.0/8)) { //!!! just for now, since we aren't dealing properly with silence yet cannam@0: feature.values.clear(); cannam@0: feature.values.push_back(ratio); Chris@16: returnFeatures[m_abRatioOutNo].push_back(feature); cannam@0: } cannam@0: } cannam@0: } cannam@0: } cannam@0: cannam@0: if (y != prevy) { cannam@0: feature.hasTimestamp = true; Chris@10: feature.timestamp = m_startTime + yt; cannam@0: feature.values.clear(); Chris@52: feature.values.push_back(float(xt.sec + xt.msec()/1000.0)); Chris@16: returnFeatures[m_baOutNo].push_back(feature); cannam@0: } cannam@0: cannam@0: prevx = x; cannam@0: prevy = y; cannam@0: } cannam@0: Chris@107: delete m_pipeline; Chris@107: m_pipeline = 0; cannam@0: cannam@0: if (m_locked) { cannam@0: #ifdef _WIN32 cannam@0: ReleaseMutex(m_serialisingMutex); cannam@0: #else cannam@0: pthread_mutex_unlock(&m_serialisingMutex); cannam@0: #endif cannam@0: m_locked = false; cannam@0: } cannam@0: cannam@0: return returnFeatures; cannam@0: cannam@0: cannam@0: /* Chris@30: for (int i = 0; i < len; ++i) { cannam@0: std::cerr << i << ": [" << pathx[i] << "," << pathy[i] << "]" << std::endl; cannam@0: } cannam@0: cannam@0: std::cerr << std::endl; cannam@0: std::cerr << "File: A" << std::endl; cannam@0: std::cerr << "Marks: -1" << std::endl; cannam@0: std::cerr << "FixedPoints: true 0" << std::endl; cannam@0: std::cerr << "0" << std::endl; cannam@0: std::cerr << "0" << std::endl; cannam@0: std::cerr << "0" << std::endl; cannam@0: std::cerr << "0" << std::endl; cannam@0: std::cerr << "File: B" << std::endl; cannam@0: std::cerr << "Marks: 0" << std::endl; cannam@0: std::cerr << "FixedPoints: true 0" << std::endl; cannam@0: std::cerr << "0.02" << std::endl; cannam@0: std::cerr << "0.02" << std::endl; cannam@0: Chris@30: std::cerr << len << std::endl; Chris@30: for (int i = 0; i < len; ++i) { cannam@0: std::cerr << pathx[i] << std::endl; cannam@0: } cannam@0: Chris@30: std::cerr << len << std::endl; Chris@30: for (int i = 0; i < len; ++i) { cannam@0: std::cerr << pathy[i] << std::endl; cannam@0: } cannam@0: */ cannam@0: } cannam@0: cannam@0: static Vamp::PluginAdapter mvpAdapter; cannam@0: cannam@0: const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version, cannam@0: unsigned int index) cannam@0: { cannam@0: if (version < 1) return 0; cannam@0: cannam@0: switch (index) { cannam@0: case 0: return mvpAdapter.getDescriptor(); cannam@0: default: return 0; cannam@0: } cannam@0: }