comparison src/Silvet.cpp @ 152:74f14efe032f

Update subrepo to new structure

 */
 
 #include "Silvet.h"
 #include "EM.h"
 
-#include "maths/MedianFilter.h"
-#include "maths/MathUtilities.h"
-#include "dsp/rateconversion/Resampler.h"
-
-#include "constant-q-cpp/cpp-qm-dsp/CQSpectrogram.h"
+#include <cq/CQSpectrogram.h>
+
+#include "MedianFilter.h"
+#include "constant-q-cpp/src/dsp/Resampler.h"
 
 #include <vector>
 
 #include <cstdio>
 

         double sum = 0.0;
         for (int j = 0; j < processingHeight; ++j) {
             sum += filtered.at(i).at(j);
         }
 
+//        cerr << "sum: " << sum << endl;
+
         if (sum < 1e-5) continue;
 
         EM em(m_hqMode);
 
         for (int j = 0; j < iterations; ++j) {

     map<int, double> active;
     ValueIndexMap::const_iterator si = strengths.end();
     while (int(active.size()) < polyphony) {
         --si;
         if (si->first < threshold) break;
-        cerr << si->second << " : " << si->first << endl;
+//        cerr << si->second << " : " << si->first << endl;
         active[si->second] = si->first;
         if (si == strengths.begin()) break;
     }
 
     // Minimum duration pruning, and conversion to notes. We can only

     // duration.
 
     int width = m_pianoRoll.size();
 
     //!!! adjust to only keep notes >= 100ms? or so
-    int durationThreshold = 2; // columns
+    int durationThreshold = 3; // columns
 
     FeatureList noteFeatures;
 
     if (width < durationThreshold + 1) {
         m_pianoRoll.push_back(active);

         }
 
         int velocity = maxStrength * 2;
         if (velocity > 127) velocity = 127;
 
-        cerr << "Found a genuine note, starting at " << columnDuration * start << " with duration " << columnDuration * duration << endl;
+//        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) + 0.02);