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