comparison src/Silvet.cpp @ 52:22553e7b2a63 preshift

Merge from default branch

 Silvet::getOutputDescriptors() const
 {
     OutputList list;
 
     OutputDescriptor d;
-    d.identifier = "transcription";
-    d.name = "Transcription";
-    d.description = ""; //!!!
+    d.identifier = "notes";
+    d.name = "Note transcription";
+    d.description = "Overall note transcription across all instruments";
     d.unit = "Hz";
     d.hasFixedBinCount = true;
     d.binCount = 2;
     d.binNames.push_back("Frequency");
     d.binNames.push_back("Velocity");
     d.hasKnownExtents = false;
     d.isQuantized = false;
     d.sampleType = OutputDescriptor::VariableSampleRate;
-    d.sampleRate = m_inputSampleRate / (m_cq ? m_cq->getColumnHop() : 256);
+    d.sampleRate = m_inputSampleRate / (m_cq ? m_cq->getColumnHop() : 62);
     d.hasDuration = true;
     m_notesOutputNo = list.size();
     list.push_back(d);
 
+    d.identifier = "cq";
+    d.name = "Raw constant-Q";
+    d.description = "Unfiltered constant-Q time-frequency distribution";
+    d.unit = "";
+    d.hasFixedBinCount = true;
+    d.binCount = processingHeight + 55;
+    d.binNames.clear();
+    if (m_cq) {
+        char name[20];
+        for (int i = 0; i < processingHeight + 55; ++i) {
+            float freq = m_cq->getBinFrequency(i);
+            sprintf(name, "%.1f Hz", freq);
+            d.binNames.push_back(name);
+        }
+    }
+    d.hasKnownExtents = false;
+    d.isQuantized = false;
+    d.sampleType = OutputDescriptor::FixedSampleRate;
+    d.sampleRate = m_inputSampleRate / (m_cq ? m_cq->getColumnHop() : 62);
+    d.hasDuration = false;
+    m_cqOutputNo = list.size();
+    list.push_back(d);
+
     d.identifier = "inputgrid";
-    d.name = "Filtered time-frequency grid";
-    d.description = "The pre-processed constant-Q time-frequency distribution used as input to the PLCA step";
+    d.name = "Filtered constant-Q";
+    d.description = "Filtered constant-Q time-frequency distribution used as input to the PLCA step";
     d.unit = "";
     d.hasFixedBinCount = true;
     d.binCount = processingHeight;
     d.binNames.clear();
     if (m_cq) {

     d.hasKnownExtents = false;
     d.isQuantized = false;
     d.sampleType = OutputDescriptor::FixedSampleRate;
     d.sampleRate = 25;
     d.hasDuration = false;
-    m_cqOutputNo = list.size();
+    m_fcqOutputNo = list.size();
     list.push_back(d);
 
-    d.identifier = "pitchdistribution";
-    d.name = "Pitch distribution";
-    d.description = "The estimated pitch contribution matrix";
+    d.identifier = "pitches";
+    d.name = "Pitch activation";
+    d.description = "Estimated pitch activation matrix";
     d.unit = "";
     d.hasFixedBinCount = true;
     d.binCount = processingPitches;
     d.binNames.clear();
     for (int i = 0; i < processingPitches; ++i) {

     if (m_resampler) {
 	data = m_resampler->process(data.data(), data.size());
     }
 
     Grid cqout = m_cq->process(data);
-    return transcribe(cqout);
+    FeatureSet fs = transcribe(cqout);
+
+    for (int i = 0; i < (int)cqout.size(); ++i) {
+        Feature f;
+        for (int j = 0; j < (int)cqout[i].size(); ++j) {
+            f.values.push_back(float(cqout[i][j]));
+        }
+        fs[m_cqOutputNo].push_back(f);
+    }
+
+    return fs;
 }
 
 Silvet::FeatureSet
 Silvet::getRemainingFeatures()
 {
     Grid cqout = m_cq->getRemainingBlocks();
-    return transcribe(cqout);
+    FeatureSet fs = transcribe(cqout);
+
+    for (int i = 0; i < (int)cqout.size(); ++i) {
+        Feature f;
+        for (int j = 0; j < (int)cqout[i].size(); ++j) {
+            f.values.push_back(float(cqout[i][j]));
+        }
+        fs[m_cqOutputNo].push_back(f);
+    }
+
+    return fs;
 }
 
 Silvet::FeatureSet
 Silvet::transcribe(const Grid &cqout)
 {

     for (int i = 0; i < (int)filtered.size(); ++i) {
         Feature f;
         for (int j = 0; j < processingHeight; ++j) {
             f.values.push_back(float(filtered[i][j]));
         }
-        fs[m_cqOutputNo].push_back(f);
+        fs[m_fcqOutputNo].push_back(f);
     }
 
     int width = filtered.size();
 
     int iterations = 12;