comparison src/Silvet.cpp @ 323:6f8fa7fc8fdc livemode

Fix oversight which saw note tracking use pre-filtered pitches (resulting in many short notes)

     m_notesOutputNo = list.size();
     list.push_back(d);
 
     d.identifier = "onsets";
     d.name = "Note onsets";
-    d.description = "Note onsets, without durations. These can be calculated sooner than complete notes as it isn't necessary to wait for the note to finish. Each event has time, estimated fundamental frequency in Hz, and a synthetic MIDI velocity (1-127) estimated from the strength of the pitch in the mixture.";
+    d.description = "Note onsets, without durations. These can be calculated sooner than complete notes, because it isn't necessary to wait for a note to finish before returning its feature. Each event has time, estimated fundamental frequency in Hz, and a synthetic MIDI velocity (1-127) estimated from the strength of the pitch in the mixture.";
     d.unit = "Hz";
     d.hasFixedBinCount = true;
     d.binCount = 2;
     d.binNames.push_back("Frequency");
     d.binNames.push_back("Velocity");

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

         // 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.
         if (m_mode == LiveMode) {
-            if (j == 0 || j + 1 == pack.templateNoteCount ||
+            if (j == 0 ||
+                j + 1 == pack.templateNoteCount ||
                 pitches[j] < pitches[j-1] ||
                 pitches[j] < pitches[j+1]) {
                 continue;
             }
         }
-        
+
         strengths.insert(ValueIndexMap::value_type(strength, j));
     }
 
     ValueIndexMap::const_iterator si = strengths.end();
 

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