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