comparison src/Silvet.cpp @ 321:213a51e197c8 livemode

Shorten duration threshold for live mode; return non-peak-picked pitch distribution from pitch distribution output

         }
     }
         
     for (int i = 0; i < width; ++i) {
 
-        // This returns a filtered column, and pushes the
-        // up-to-max-polyphony activation column to m_pianoRoll
-        vector<double> filtered = postProcess
-            (localPitches[i], localBestShifts[i], wantShifts);
+        vector<double> filtered;
+
+        for (int j = 0; j < pack.templateNoteCount; ++j) {
+            m_postFilter[j]->push(localPitches[i][j]);
+            filtered.push_back(m_postFilter[j]->get());
+        }
 
         RealTime timestamp = getColumnTimestamp(m_pianoRoll.size() - 1);
         float inputGain = getInputGainAt(timestamp);
 
         Feature f;

         f.values.resize(12);
         for (int j = 0; j < (int)filtered.size(); ++j) {
             f.values[j % 12] += filtered[j] / inputGain;
         }
         fs[m_chromaOutputNo].push_back(f);
+
+        // This pushes the up-to-max-polyphony activation column to
+        // m_pianoRoll
+        postProcess(localPitches[i], localBestShifts[i], wantShifts);
 
         auto events = noteTrack(shiftCount);
 
         FeatureList noteFeatures = events.first;
         for (FeatureList::const_iterator fi = noteFeatures.begin();

     }
 
     return out;
 }
     
-vector<double>
+void
 Silvet::postProcess(const vector<double> &pitches,
                     const vector<int> &bestShifts,
                     bool wantShifts)
 {
     const InstrumentPack &pack(getPack(m_instrument));
 
-    vector<double> filtered;
+    // Threshold for level and reduce number of candidate pitches
+
+    typedef std::multimap<double, int> ValueIndexMap;
+
+    ValueIndexMap strengths;
 
     for (int j = 0; j < pack.templateNoteCount; ++j) {
-        m_postFilter[j]->push(pitches[j]);
-        filtered.push_back(m_postFilter[j]->get());
-    }
-
-    if (m_mode == LiveMode) {
+
+        double strength = pitches[j];
+        if (strength < pack.levelThreshold) continue;
+        
         // In live mode with only a 12-bpo CQ, we are very likely to
         // get clusters of two or three high scores at a time for
         // neighbouring semitones. Eliminate these by picking only the
         // peaks. This means we can't recognise actual semitone chords
         // if they ever appear, but it's not as if live mode is good
         // enough for that to be a big deal anyway.
-        for (int j = 0; j < pack.templateNoteCount; ++j) {
-            if (j > 0 && j + 1 < pack.templateNoteCount &&
-                filtered[j] >= filtered[j-1] &&
-                filtered[j] >= filtered[j+1]) {
-            } else {
-                filtered[j] = 0.0;
+        if (m_mode == LiveMode) {
+            if (j == 0 || j + 1 == pack.templateNoteCount ||
+                pitches[j] < pitches[j-1] ||
+                pitches[j] < pitches[j+1]) {
+                continue;
             }
         }
-    }
-
-    // Threshold for level and reduce number of candidate pitches
-
-    typedef std::multimap<double, int> ValueIndexMap;
-
-    ValueIndexMap strengths;
-
-    for (int j = 0; j < pack.templateNoteCount; ++j) {
-        double strength = filtered[j];
-        if (strength < pack.levelThreshold) continue;
+        
         strengths.insert(ValueIndexMap::value_type(strength, j));
     }
 
     ValueIndexMap::const_iterator si = strengths.end();
 

 
     if (wantShifts) {
         m_pianoRollShifts.push_back(activeShifts);
     }
 
-    return filtered;
+    return;
 }
 
 pair<Vamp::Plugin::FeatureList, Vamp::Plugin::FeatureList>
 Silvet::noteTrack(int shiftCount)
 {        

     const map<int, double> &active = m_pianoRoll[width];
 
     double columnDuration = 1.0 / m_colsPerSec;
 
     // only keep notes >= 100ms or thereabouts
-    int durationThreshold = floor(0.1 / columnDuration); // columns
+    double durationThreshSec = 0.1;
+    if (m_mode == LiveMode) durationThreshSec = 0.07;
+    int durationThreshold = floor(durationThreshSec / columnDuration); // in cols
     if (durationThreshold < 1) durationThreshold = 1;
 
     FeatureList noteFeatures, onsetFeatures;
 
     if (width < durationThreshold + 1) {