(Start to) remove the channel counts from everywhere: they should always be 1 anyway...

[vamp-aubio-plugins.git] / plugins / Silence.cpp

diff --git a/plugins/Silence.cpp b/plugins/Silence.cpp
index 7369276..cf3dda4 100644 (file)
--- a/plugins/Silence.cpp
+++ b/plugins/Silence.cpp
@@ -21,9 +21,8 @@ using std::vector;
 using std::cerr;
 using std::endl;
 
-Silence::Silence(float inputSampleRate, unsigned int apiVersion) :
+Silence::Silence(float inputSampleRate) :
     Plugin(inputSampleRate),
-    m_apiVersion(apiVersion),
     m_ibuf(0),
     m_pbuf(0),
     m_tmpptrs(0),
@@ -31,10 +30,6 @@ Silence::Silence(float inputSampleRate, unsigned int apiVersion) :
     m_prevSilent(false),
     m_first(true)
 {
-    if (m_apiVersion == 1) {
-        cerr << "vamp-aubio: WARNING: using compatibility version 1 of the Vamp API for silence\n"
-             << "detector plugin: upgrade your host to v2 for proper duration support" << endl;
-    }
 }
 
 Silence::~Silence()
@@ -71,8 +66,7 @@ Silence::getMaker() const
 int
 Silence::getPluginVersion() const
 {
-    if (m_apiVersion == 1) return 2;
-    return 3;
+    return 4;
 }
 
 string
@@ -84,12 +78,16 @@ Silence::getCopyright() const
 bool
 Silence::initialise(size_t channels, size_t stepSize, size_t blockSize)
 {
-    m_channelCount = channels;
+    if (channels != 1) {
+        std::cerr << "Silence::initialise: channels must be 1" << std::endl;
+        return false;
+    }
+
     m_stepSize = stepSize;
     m_blockSize = blockSize;
 
-    m_ibuf = new_fvec(stepSize, channels);
-    m_pbuf = new_fvec(stepSize, channels);
+    m_ibuf = new_fvec(stepSize);
+    m_pbuf = new_fvec(stepSize);
     m_tmpptrs = new smpl_t *[channels];
 
     return true;
@@ -157,50 +155,27 @@ Silence::getOutputDescriptors() const
 
     OutputDescriptor d;
 
-    if (m_apiVersion == 1) {
-
-        d.identifier = "silencestart";
-        d.name = "Beginnings of Silent Regions";
-        d.description = "Return a single instant at the point where each silent region begins";
-        d.hasFixedBinCount = true;
-        d.binCount = 0;
-        d.hasKnownExtents = false;
-        d.sampleType = OutputDescriptor::VariableSampleRate;
-        d.sampleRate = 0;
-        list.push_back(d);
-
-        d.identifier = "silenceend";
-        d.name = "Ends of Silent Regions";
-        d.description = "Return a single instant at the point where each silent region ends";
-        d.hasFixedBinCount = true;
-        d.binCount = 0;
-        d.hasKnownExtents = false;
-        d.sampleType = OutputDescriptor::VariableSampleRate;
-        d.sampleRate = 0;
-        list.push_back(d);
-
-    } else {
+    d.identifier = "silent";
+    d.name = "Silent Regions";
+    d.description = "Return an interval covering each silent region";
+    d.hasFixedBinCount = true;
+    d.binCount = 0;
+    d.hasKnownExtents = false;
+    d.sampleType = OutputDescriptor::VariableSampleRate;
+    d.sampleRate = 0;
+    d.hasDuration = true;
+    list.push_back(d);
 
-        d.identifier = "silent";
-        d.name = "Silent Regions";
-        d.description = "Return an interval covering each silent region";
-        d.hasFixedBinCount = true;
-        d.binCount = 0;
-        d.hasKnownExtents = false;
-        d.sampleType = OutputDescriptor::VariableSampleRate;
-        d.sampleRate = 0;
-        list.push_back(d);
-
-        d.identifier = "noisy";
-        d.name = "Non-Silent Regions";
-        d.description = "Return an interval covering each non-silent region";
-        d.hasFixedBinCount = true;
-        d.binCount = 0;
-        d.hasKnownExtents = false;
-        d.sampleType = OutputDescriptor::VariableSampleRate;
-        d.sampleRate = 0;
-        list.push_back(d);
-    }
+    d.identifier = "noisy";
+    d.name = "Non-Silent Regions";
+    d.description = "Return an interval covering each non-silent region";
+    d.hasFixedBinCount = true;
+    d.binCount = 0;
+    d.hasKnownExtents = false;
+    d.sampleType = OutputDescriptor::VariableSampleRate;
+    d.sampleRate = 0;
+    d.hasDuration = true;
+    list.push_back(d);
 
     d.identifier = "silencelevel";
     d.name = "Silence Test";
@@ -286,27 +261,21 @@ Silence::process(const float *const *inputBuffers,
 
         feature.values.clear();
 
-        if (m_apiVersion == 1) {
+        if (!m_first) {
+            feature.timestamp = m_lastChange;
+            feature.hasDuration = true;
+            feature.duration = featureStamp - m_lastChange;
             if (silent) {
-                returnFeatures[0].push_back(feature);
-            } else {
+                // non-silent regions feature
+                // (becoming silent, so this is a non-silent region)
                 returnFeatures[1].push_back(feature);
-            }
-        } else {
-            if (!m_first) {
-                feature.timestamp = m_lastChange;
-                feature.hasDuration = true;
-                feature.duration = featureStamp - m_lastChange;
-                if (silent) {
-                    // becoming silent, so this is a non-silent region
-                    returnFeatures[1].push_back(feature);
-                } else {
-                    // becoming non-silent, so this is a silent region
-                    returnFeatures[0].push_back(feature);
-                }                    
-            }
-            m_lastChange = featureStamp;
+            } else {
+                // silent regions feature
+                // (becoming non-silent, so this is a silent region)
+                returnFeatures[0].push_back(feature);
+            }                    
         }
+        m_lastChange = featureStamp;
 
         m_prevSilent = silent;
         m_first = false;
@@ -329,21 +298,33 @@ Silence::getRemainingFeatures()
 {
     FeatureSet returnFeatures;
     
-    if (m_prevSilent) {
-        if (m_lastTimestamp > m_lastChange) {
-            Feature feature;
-            feature.hasTimestamp = true;
-            feature.timestamp = m_lastChange;
-            feature.hasDuration = true;
-            feature.duration = m_lastTimestamp - m_lastChange;
-            if (m_prevSilent) {
-                returnFeatures[0].push_back(feature);
-            } else {
-                returnFeatures[1].push_back(feature);
-            }                
+//    std::cerr << "Silence::getRemainingFeatures: m_lastTimestamp = " << m_lastTimestamp << ", m_lastChange = " << m_lastChange << ", m_apiVersion = " << m_apiVersion << ", m_prevSilent = " << m_prevSilent << std::endl;
+
+    if (m_lastTimestamp > m_lastChange) {
+
+        Feature feature;
+        feature.hasTimestamp = true;
+
+        feature.timestamp = m_lastChange;
+        feature.hasDuration = true;
+        feature.duration = m_lastTimestamp - m_lastChange;
+        if (m_prevSilent) {
+            // silent regions feature
+            returnFeatures[0].push_back(feature);
+        } else {
+            // non-silent regions feature
+            returnFeatures[1].push_back(feature);
+        }
+
+        if (!m_prevSilent) {
+            Feature silenceTestFeature;
+            silenceTestFeature.hasTimestamp = true;
+            silenceTestFeature.timestamp = m_lastTimestamp;
+            silenceTestFeature.values.push_back(0);
+            returnFeatures[2].push_back(silenceTestFeature);
         }
     }
 
-    return FeatureSet();
+    return returnFeatures;
 }