comparison src/MatchVampPlugin.cpp @ 198:082ff90f1c82 re-minimise

Expose distance scale parameter
author Chris Cannam
date Fri, 27 Feb 2015 09:25:23 +0000
parents 487261a22b18
children ccdadbdd80df
comparison
equal deleted inserted replaced
197:547bea29ad89 198:082ff90f1c82
258 desc.valueNames.push_back("Sum of frames"); 258 desc.valueNames.push_back("Sum of frames");
259 desc.valueNames.push_back("Log sum of frames"); 259 desc.valueNames.push_back("Log sum of frames");
260 list.push_back(desc); 260 list.push_back(desc);
261 desc.valueNames.clear(); 261 desc.valueNames.clear();
262 262
263 #ifdef USE_COMPACT_TYPES
264 desc.identifier = "scale";
265 desc.name = "Distance scale";
266 desc.description = "Scale factor to use when mapping distance metric into byte range for storage";
267 desc.minValue = 1;
268 desc.maxValue = 1000;
269 desc.defaultValue = float(m_defaultDParams.scale);
270 desc.isQuantized = false;
271 list.push_back(desc);
272 #endif
273
263 desc.identifier = "silencethreshold"; 274 desc.identifier = "silencethreshold";
264 desc.name = "Silence threshold"; 275 desc.name = "Silence threshold";
265 desc.description = "Total frame energy threshold below which a feature will be regarded as silent"; 276 desc.description = "Total frame energy threshold below which a feature will be regarded as silent";
266 desc.minValue = 0; 277 desc.minValue = 0;
267 desc.maxValue = 0.1f; 278 desc.maxValue = 0.1f;
359 return float(m_fcParams.silenceThreshold); 370 return float(m_fcParams.silenceThreshold);
360 } else if (name == "metric") { 371 } else if (name == "metric") {
361 return float(m_dParams.metric); 372 return float(m_dParams.metric);
362 } else if (name == "noise") { 373 } else if (name == "noise") {
363 return m_dParams.noise; 374 return m_dParams.noise;
375 } else if (name == "scale") {
376 return float(m_dParams.scale);
364 } else if (name == "freq1") { 377 } else if (name == "freq1") {
365 return float(m_feParams.referenceFrequency); 378 return float(m_feParams.referenceFrequency);
366 } else if (name == "freq2") { 379 } else if (name == "freq2") {
367 return float(m_secondReferenceFrequency); 380 return float(m_secondReferenceFrequency);
368 } else if (name == "minfreq") { 381 } else if (name == "minfreq") {
399 m_fcParams.silenceThreshold = value; 412 m_fcParams.silenceThreshold = value;
400 } else if (name == "metric") { 413 } else if (name == "metric") {
401 m_dParams.metric = DistanceMetric::Metric(int(value + 0.1)); 414 m_dParams.metric = DistanceMetric::Metric(int(value + 0.1));
402 } else if (name == "noise") { 415 } else if (name == "noise") {
403 m_dParams.noise = DistanceMetric::NoiseAddition(int(value + 0.1)); 416 m_dParams.noise = DistanceMetric::NoiseAddition(int(value + 0.1));
417 } else if (name == "scale") {
418 m_dParams.scale = value;
404 } else if (name == "freq1") { 419 } else if (name == "freq1") {
405 m_feParams.referenceFrequency = value; 420 m_feParams.referenceFrequency = value;
406 } else if (name == "freq2") { 421 } else if (name == "freq2") {
407 m_secondReferenceFrequency = value; 422 m_secondReferenceFrequency = value;
408 } else if (name == "minfreq") { 423 } else if (name == "minfreq") {