# HG changeset patch
# User mathieub <mathieu.barthet@eecs.qmul.ac.uk>
# Date 1318857028 -3600
# Node ID 62811ec41cbf08962a893807ee697dea356e0a38
# Parent  eb741b4e8d21e6507972d317d9e93bbbf9dd6942# Parent  7f76499ef4f2b961c069944c50467e685b38d1a1
Merge from the default branch

diff -r eb741b4e8d21 -r 62811ec41cbf transform/FeatureExtractionModelTransformer.cpp
--- a/transform/FeatureExtractionModelTransformer.cpp	Mon Oct 17 14:07:54 2011 +0100
+++ b/transform/FeatureExtractionModelTransformer.cpp	Mon Oct 17 14:10:28 2011 +0100
@@ -176,9 +176,8 @@
 {
     DenseTimeValueModel *input = getConformingInput();
 
-//    std::cerr << "FeatureExtractionModelTransformer: output sample type "
-//	      << m_descriptor->sampleType << std::endl;
-
+//    std::cerr << "FeatureExtractionModelTransformer::createOutputModel: sample type " << m_descriptor->sampleType << ", rate " << m_descriptor->sampleRate << std::endl;
+    
     PluginRDFDescription description(m_transform.getPluginIdentifier());
     QString outputId = m_transform.getOutput();
 
@@ -201,7 +200,7 @@
 
     size_t modelRate = input->getSampleRate();
     size_t modelResolution = 1;
-    
+
     switch (m_descriptor->sampleType) {
 
     case Vamp::Plugin::OutputDescriptor::VariableSampleRate:
@@ -636,8 +635,11 @@
 {
     size_t inputRate = m_input.getModel()->getSampleRate();
 
-//    SVDEBUG << "FeatureExtractionModelTransformer::addFeature("
-//	      << blockFrame << ")" << endl;
+//    std::cerr << "FeatureExtractionModelTransformer::addFeature: blockFrame = "
+//              << blockFrame << ", hasTimestamp = " << feature.hasTimestamp
+//              << ", timestamp = " << feature.timestamp << ", hasDuration = "
+//              << feature.hasDuration << ", duration = " << feature.duration
+//              << std::endl;
 
     int binCount = 1;
     if (m_descriptor->hasFixedBinCount) {