comparison transform/FeatureExtractionModelTransformer.cpp @ 799:c808c57e5560 qt5 sonic-annotator-1.0

Merge from the default branch

         haveExtents = true;
     }
 
     size_t modelRate = input->getSampleRate();
     size_t modelResolution = 1;
+
+    if (m_descriptor->sampleType != 
+        Vamp::Plugin::OutputDescriptor::OneSamplePerStep) {
+        if (m_descriptor->sampleRate > input->getSampleRate()) {
+            std::cerr << "WARNING: plugin reports output sample rate as "
+                      << m_descriptor->sampleRate << " (can't display features with finer resolution than the input rate of " << input->getSampleRate() << ")" << std::endl;
+        }
+    }
 
     switch (m_descriptor->sampleType) {
 
     case Vamp::Plugin::OutputDescriptor::VariableSampleRate:
 	if (m_descriptor->sampleRate != 0.0) {

         }
  
         frame = lrintf((m_fixedRateFeatureNo / m_descriptor->sampleRate)
                        * inputRate);
 
-        std::cerr << "Feature hasTimestamp = " << feature.hasTimestamp << ", timestamp = " << feature.timestamp << ", frame works out to " << frame << std::endl;
-
+//        std::cerr << "Feature hasTimestamp = " << feature.hasTimestamp << ", timestamp = " << feature.timestamp << ", frame works out to " << frame << std::endl;
     }
 	
     // Rather than repeat the complicated tests from the constructor
     // to determine what sort of model we must be adding the features
     // to, we instead test what sort of model the constructor decided

 
             QString label = feature.label.c_str();
             if (feature.values.size() > 1) {
                 label = QString("[%1] %2").arg(i+1).arg(label);
             }
-
-            std::cerr << "Adding point at " << frame << " with value " << value << " and label " << label << std::endl;
 
             model->addPoint(SparseTimeValueModel::Point(frame, value, label));
         }
 
     } else if (isOutput<NoteModel>() || isOutput<RegionModel>()) {