comparison vamp/CQVamp.cpp @ 58:daf7c92058da

Put spectrogram the "right" way up, add bin labels

 #include "CQVamp.h"
 
 #include "cpp-qm-dsp/ConstantQ.h"
 
 #include "base/Pitch.h"
+
+#include <algorithm>
+#include <cstdio>
 
 using std::string;
 using std::vector;
 using std::cerr;
 using std::endl;

 
 CQVamp::ParameterList
 CQVamp::getParameterDescriptors() const
 {
     ParameterList list;
-/*
-    ParameterDescriptor desc;
-    desc.identifier = "minfreq";
-    desc.name = "Minimum Frequency";
-    desc.unit = "Hz";
-    desc.description = "Hint for the lowest frequency to be included in the constant-Q transform. The actual frequency range will be an integral number of octaves ending at the highest frequency specified";
-    desc.minValue = 10;
-    desc.maxValue = m_inputSampleRate/2;
-    desc.defaultValue = 46;
-    desc.isQuantized = false;
-    list.push_back(desc);
-
-    desc.identifier = "maxfreq";
-    desc.name = "Maximum Frequency";
-    desc.unit = "Hz";
-    desc.description = "Highest frequency to be included in the constant-Q transform";
-    desc.minValue = 10;
-    desc.maxValue = m_inputSampleRate/2;
-    desc.defaultValue = m_inputSampleRate/2;
-    desc.isQuantized = false;
-    list.push_back(desc);
- */
+
     ParameterDescriptor desc;
     desc.identifier = "minpitch";
     desc.name = "Minimum Pitch";
     desc.unit = "MIDI units";
     desc.description = "MIDI pitch corresponding to the lowest frequency to be included in the constant-Q transform";

         return m_maxMIDIPitch;
     }
     if (param == "tuning") {
         return m_tuningFrequency;
     }
-/*
-    if (param == "minfreq") {
-        return m_minFrequency;
-    }
-    if (param == "maxfreq") {
-        return m_maxFrequency;
-    }
-*/
     if (param == "bpo") {
         return m_bpo;
     }
     std::cerr << "WARNING: CQVamp::getParameter: unknown parameter \""
               << param << "\"" << std::endl;

         m_minMIDIPitch = lrintf(value);
     } else if (param == "maxpitch") {
         m_maxMIDIPitch = lrintf(value);
     } else if (param == "tuning") {
         m_tuningFrequency = value;
-/*    if (param == "minfreq") {
-        m_minFrequency = value;
-    } else if (param == "maxfreq") {
-        m_maxFrequency = value;
-*/
     } else  if (param == "bpo") {
         m_bpo = lrintf(value);
     } else {
         std::cerr << "WARNING: CQVamp::setParameter: unknown parameter \""
                   << param << "\"" << std::endl;

     d.name = "Constant-Q Spectrogram";
     d.unit = "";
     d.description = "Output of constant-Q transform, as a single vector per process block";
     d.hasFixedBinCount = true;
     d.binCount = (m_cq ? m_cq->getTotalBins() : (9 * 24));
+
+    if (m_cq) {
+        char name[20];
+        for (int i = 0; i < d.binCount; ++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() : 256);
     list.push_back(d);

 	    if (j < (int)m_prevFeature.size()) {
 		column[j] = m_prevFeature[j];
 	    }
 	}
 
+        // put low frequencies at the start
+        std::reverse(column.begin(), column.end());
+
 	m_prevFeature = column;
 
 	Feature feature;
 	feature.hasTimestamp = true;
         feature.timestamp = m_startTime + Vamp::RealTime::frame2RealTime