comparison transform/FeatureExtractionModelTransformer.cpp @ 875:3e6ed8a8577b tonioni

Use a sparse time-value model only for outputs with fixed bin count of 1, not for those with unknown bin count. (Precursor to using more than one model for outputs with unknown bin count)
author Chris Cannam
date Tue, 28 Jan 2014 18:52:22 +0000
parents 13803edd513d
children 47aa3aeb687b
comparison
equal deleted inserted replaced
873:4dce43294740 875:3e6ed8a8577b
390 } 390 }
391 391
392 QString outputEventTypeURI = description.getOutputEventTypeURI(outputId); 392 QString outputEventTypeURI = description.getOutputEventTypeURI(outputId);
393 out->setRDFTypeURI(outputEventTypeURI); 393 out->setRDFTypeURI(outputEventTypeURI);
394 394
395 } else if (binCount == 1 || 395 } else if ((binCount == 1 && m_descriptors[n]->hasFixedBinCount) ||
396 (m_descriptors[n]->sampleType == 396 (m_descriptors[n]->sampleType ==
397 Vamp::Plugin::OutputDescriptor::VariableSampleRate)) { 397 Vamp::Plugin::OutputDescriptor::VariableSampleRate)) {
398 398
399 // Anything that is not a 1D, note, or interval model and that 399 // Anything that is not a 1D, note, or interval model and that
400 // has only one value per result must be a sparse time value 400 // has only one value per result must be a sparse time value