comparison layer/SpectrogramLayer.cpp @ 75:dfdbf336bb37

* Remove dsp directory.  This is now the qm-dsp library used by
  qm-vamp-plugins instead of being used in Sonic Visualiser directly.
* Remove plugins that have now become part of qm-vamp-plugins.
* Move time stretcher from dsp to audioio (this is the one DSP thing
  we do need in SV)

 #include "base/Profiler.h"
 #include "base/AudioLevel.h"
 #include "base/Window.h"
 #include "base/Pitch.h"
 
-#include "dsp/maths/MathUtilities.h"
-
 #include <QPainter>
 #include <QImage>
 #include <QPixmap>
 #include <QRect>
 #include <QTimer>

 
 #include <cassert>
 #include <cmath>
 
 //#define DEBUG_SPECTROGRAM_REPAINT 1
+
+static double mod(double x, double y)
+{
+    double a = floor(x / y);
+    double b = x - (y * a);
+    return b;
+}
+
+static double princarg(double ang)
+{
+    return mod(ang + M_PI, -2 * M_PI) + M_PI;
+}
 
 
 SpectrogramLayer::SpectrogramLayer(Configuration config) :
     Layer(),
     m_model(0),

     float frequency = (float(bin) * sampleRate) / windowSize;
 
     float expectedPhase =
 	oldPhase + (2.0 * M_PI * bin * windowIncrement) / windowSize;
 
-    float phaseError = MathUtilities::princarg(newPhase - expectedPhase);
+    float phaseError = princarg(newPhase - expectedPhase);
 	    
     if (fabs(phaseError) < (1.1 * (windowIncrement * M_PI) / windowSize)) {
 
 	// The new frequency estimate based on the phase error
 	// resulting from assuming the "native" frequency of this bin

 	mag /= windowSize / 2;
 
 	if (mag > factor) factor = mag;
 
 	double phase = atan2(output[i][1], output[i][0]);
-	phase = MathUtilities::princarg(phase);
+	phase = princarg(phase);
 
 	output[i][0] = mag;
 	m_cache->setPhaseAt(column, i, phase);
     }