comparison src/Silvet.cpp @ 150:d2bc51cc7f57

Some comments on things to try next...

         fs[m_fcqOutputNo].push_back(f);
     }
 
     int width = filtered.size();
 
-    int iterations = 12;
+    int iterations = 12; //!!! more might be good?
 
     Grid pitchMatrix(width, vector<double>(processingNotes));
 
 #pragma omp parallel for
     for (int i = 0; i < width; ++i) {

         for (int j = 0; j < iterations; ++j) {
             em.iterate(filtered.at(i).data());
         }
         
         const double *pitches = em.getPitchDistribution();
+
+        //!!! note: check the CQ output (and most immediately, the sum values here) against the MATLAB implementation
         
         for (int j = 0; j < processingNotes; ++j) {
             pitchMatrix[i][j] = pitches[j] * sum;
         }
     }

     int postFilterLatency = int(m_postFilter[0]->getSize() / 2);
 
     // Threshold for level and reduce number of candidate pitches
 
     int polyphony = 5;
-    double threshold = 4.8;
+
+    //!!! make this a parameter (was 4.8, try adjusting, compare levels against matlab code)
+    double threshold = 6;
 
     typedef std::multimap<double, int> ValueIndexMap;
 
     ValueIndexMap strengths;
     for (int j = 0; j < processingNotes; ++j) {

     // already, and if they haven't ended, we don't know their
     // duration.
 
     int width = m_pianoRoll.size();
 
+    //!!! adjust to only keep notes >= 100ms? or so
     int durationThreshold = 2; // columns
 
     FeatureList noteFeatures;
 
     if (width < durationThreshold + 1) {

     }
 
     // we have 25 columns per second
     double columnDuration = 1.0 / 25.0;
     
+    //!!! try: 20ms intervals in intensive mode
+    //!!! try: repeated note detection? (look for change in first derivative of the pitch matrix)
+
     for (map<int, double>::const_iterator ni = m_pianoRoll[width-1].begin();
          ni != m_pianoRoll[width-1].end(); ++ni) {
 
         int note = ni->first;
         

         cerr << "Found a genuine note, starting at " << columnDuration * start << " with duration " << columnDuration * duration << endl;
 
         Feature nf;
         nf.hasTimestamp = true;
         nf.timestamp = RealTime::fromSeconds
-            (columnDuration * (start - postFilterLatency));
+            (columnDuration * (start - postFilterLatency) + 0.02);
         nf.hasDuration = true;
         nf.duration = RealTime::fromSeconds
             (columnDuration * duration);
         nf.values.push_back(noteFrequency(note));
         nf.values.push_back(velocity);