comparison MatchVampPlugin.cpp @ 10:6ea008aa8817

Fixes to problems reported by plugin tester

 #endif
 
 bool
 MatchVampPlugin::m_serialisingMutexInitialised = false;
 
+// We want to ensure our freq map / crossover bin in Matcher.cpp are
+// always valid with a fixed FFT length in seconds, so must reject low
+// sample rates
+static float sampleRateMin = 5000.f;
+
 MatchVampPlugin::MatchVampPlugin(float inputSampleRate) :
     Plugin(inputSampleRate),
     m_stepSize(0),
     m_serialise(false),
     m_begin(true),
     m_locked(false)
 {
+    if (inputSampleRate < sampleRateMin) {
+        std::cerr << "MatchVampPlugin::MatchVampPlugin: input sample rate "
+                  << inputSampleRate << " < min supported rate "
+                  << sampleRateMin << ", plugin will refuse to initialise"
+                  << std::endl;
+    }
+
     if (!m_serialisingMutexInitialised) {
         m_serialisingMutexInitialised = true;
 #ifdef _WIN32
         m_serialisingMutex = CreateMutex(NULL, FALSE, NULL);
 #else

 void
 MatchVampPlugin::setParameter(std::string name, float value)
 {
     if (name == "serialise") {
         m_serialise = (value > 0.5);
-        std::cerr << "MatchVampPlugin::setParameter: set serialise to " << m_serialise << std::endl;
+//        std::cerr << "MatchVampPlugin::setParameter: set serialise to " << m_serialise << std::endl;
     }
 }
 
 size_t
 MatchVampPlugin::getPreferredStepSize() const

 }
 
 bool
 MatchVampPlugin::initialise(size_t channels, size_t stepSize, size_t blockSize)
 {
+    if (m_inputSampleRate < sampleRateMin) {
+        std::cerr << "MatchVampPlugin::MatchVampPlugin: input sample rate "
+                  << m_inputSampleRate << " < min supported rate "
+                  << sampleRateMin << std::endl;
+        return false;
+    }
     if (!pm1) createMatchers();
     if (channels < getMinChannelCount() ||
 	channels > getMaxChannelCount()) return false;
     if (stepSize > blockSize/2 ||
         blockSize != getPreferredBlockSize()) return false;

             WaitForSingleObject(m_serialisingMutex, INFINITE);
 #else
             pthread_mutex_lock(&m_serialisingMutex);
 #endif
         }
+        m_startTime = timestamp;
         m_begin = false;
     }
     
 //    std::cerr << timestamp.toString();
 

         Vamp::RealTime yt = Vamp::RealTime::frame2RealTime
             (y * pm2->getHopSize(), lrintf(m_inputSampleRate));
 
         Feature feature;
         feature.hasTimestamp = true;
-        feature.timestamp = xt;
+        feature.timestamp = m_startTime + xt;
         feature.values.clear();
         feature.values.push_back(yt.sec + double(yt.nsec)/1.0e9);
         returnFeatures[0].push_back(feature);
         
         if (x != prevx) {
 
             feature.hasTimestamp = true;
-            feature.timestamp = xt;
+            feature.timestamp = m_startTime + xt;
             feature.values.clear();
             feature.values.push_back(yt.sec + yt.msec()/1000.0);
             returnFeatures[1].push_back(feature);
 
             Vamp::RealTime diff = yt - xt;

             }
         }
 
         if (y != prevy) {
             feature.hasTimestamp = true;
-            feature.timestamp = yt;
+            feature.timestamp = m_startTime + yt;
             feature.values.clear();
             feature.values.push_back(xt.sec + xt.msec()/1000.0);
             returnFeatures[2].push_back(feature);
         }