comparison Tempogram.cpp @ 2:1d0b7dcea27f

Added manual setting of timestamps as wasn't working on both test machines.

     d_sampleRate = m_inputSampleRate/m_stepSize;
     d.sampleRate = d_sampleRate > 0 && !isnan(d_sampleRate) ? d_sampleRate : 0.0;
     d.hasDuration = false;
     list.push_back(d);
     
+    d.identifier = "spect";
+    d.name = "spect";
+    d.description = "spect";
+    d.unit = "";
+    d.hasFixedBinCount = true;
+    d.binCount = m_blockSize/2;
+    d.hasKnownExtents = false;
+    d.isQuantized = false;
+    d.sampleType = OutputDescriptor::OneSamplePerStep;
+    d.hasDuration = false;
+    list.push_back(d);
+    
     return list;
 }
 
 bool
 Tempogram::initialise(size_t channels, size_t stepSize, size_t blockSize)

     FeatureSet featureSet;
     Feature feature;
     
     const float *in = inputBuffers[0];
     
-    //Calculate log magnitude
     float sum = 0;
     for (int i = 0; i < n; i++){
         float magnitude = sqrt(in[2*i] * in[2*i] + in[2*i + 1] * in[2*i + 1]);
-        currentY[i] = log(1+compressionConstant*magnitude); //should be 1+C*magnitude
+        feature.values.push_back(magnitude);
+        currentY[i] = log(1+compressionConstant*magnitude);
         if(currentY[i] >= previousY[i]){
             sum += (currentY[i] - previousY[i]);
         }
     }
     
     noveltyCurve.push_back(sum);
     
     float *tmpY = currentY;
     currentY = previousY;
     previousY = tmpY;
+    tmpY = NULL;
     
     ncTimestamps.push_back(timestamp);
-    
-    return FeatureSet();
+    featureSet[2].push_back(feature);
+    
+    return featureSet;
 }
 
 void
 Tempogram::initialiseForGRF(){
     hannN = 129;

     
     for(int i = 0; i < ncLength; i++){
         noveltyCurve[i] -= noveltyCurveLocalAverage[i];
         noveltyCurve[i] = noveltyCurve[i] >= 0 ? noveltyCurve[i] : 0;
         Feature ncFeature;
+        ncFeature.hasTimestamp = true;
+        ncFeature.timestamp = ncTimestamps[i];
         ncFeature.values.push_back(noveltyCurve[i]);
         featureSet[1].push_back(ncFeature);
     }
     
+    WindowFunction::hanning(hannWindowtN, tN);
+    
+    int timestampInc = floor((((float)ncTimestamps[1].nsec - ncTimestamps[0].nsec)/1e9)*(thopSize) + 0.5);
     int i=0;
-    WindowFunction::hanning(hannWindowtN, tN);
-    
     int index;
     int frameBeginOffset = floor(tN/2 + 0.5);
-    int timestampInc = floor((((float)ncTimestamps[1].nsec - ncTimestamps[0].nsec)/1e9)*(thopSize) + 0.5);
-    //cout << timestampInc << endl;
     
     while(i < ncLength){
         Feature feature;
         
         for (int n = frameBeginOffset; n < tN; n++){