comparison onsetsdsplugin.cpp @ 1:3d1928670329

* Commit Dan's patch for threshold parameter

 OnsetsDSPlugin::OnsetsDSPlugin(float inputSampleRate) :
     Vamp::Plugin(inputSampleRate),
     m_ods(0),
     m_odsdata(0),
     m_dfType(ODS_ODF_RCOMPLEX),
+    m_threshold(0.5),
     m_medspan(11),
-    m_stepSize(512),
-    m_fftSize(1024)
+    m_stepSize(256),
+    m_fftSize(512)
 {
 }
 
 OnsetsDSPlugin::~OnsetsDSPlugin()
 {

     desc.valueNames.push_back("Phase deviation");
     desc.valueNames.push_back("Weighted phase deviation");
     desc.valueNames.push_back("Modified Kullback-Liebler deviation");
     list.push_back(desc);
 
+    desc.identifier = "threshold";
+    desc.name = "Detection threshold";
+    desc.description = "Onsets trigger when the function beats this value";
+    desc.minValue = 0;
+    desc.maxValue = 1;
+    desc.defaultValue = 0.5;
+    desc.isQuantized = false;
+    desc.valueNames.clear();
+    list.push_back(desc);
+
     desc.identifier = "medspan";
     desc.name = "Median frame span";
     desc.description = "Number of past frames used in median calculation";
     desc.minValue = 5;
     desc.maxValue = 21;

         case ODS_ODF_RCOMPLEX: return 3;
         case ODS_ODF_PHASE:    return 4;
         case ODS_ODF_WPHASE:   return 5;
         case ODS_ODF_MKL:      return 6;
         }
+    } else if (name == "threshold") {
+        return m_threshold;
     } else if (name == "medspan") {
         return m_medspan;
     }
     return 0.0;
 }

         case 5: dfType = ODS_ODF_WPHASE; break;
         case 6: dfType = ODS_ODF_MKL; break;
         }
         if (dfType == m_dfType) return;
         m_dfType = dfType;
+    } else if (name == "threshold") {
+        m_threshold = value;
     } else if (name == "medspan") {
         m_medspan = lrintf(value);
     }
 }
 

     m_odsdata = new float[onsetsds_memneeded(m_dfType, m_fftSize, m_medspan)];
     m_ods = new OnsetsDS;
     memset(m_ods, 0, sizeof(OnsetsDS));
     onsetsds_init(m_ods, m_odsdata, ODS_FFT_FFTW3_R2C, m_dfType, m_fftSize,
                   m_medspan, m_inputSampleRate);
-
+	m_ods->thresh = m_threshold;
+	
     return true;
 }
 
 void
 OnsetsDSPlugin::reset()

 }
 
 size_t
 OnsetsDSPlugin::getPreferredStepSize() const
 {
-    return 512;
+    return 256;
 }
 
 size_t
 OnsetsDSPlugin::getPreferredBlockSize() const
 {
-    return 1024;
+    return 512;
 }
 
 OnsetsDSPlugin::OutputList
 OnsetsDSPlugin::getOutputDescriptors() const
 {