[POC] Down beat range

CMakeLists.txt

@@ -328,6 +328,9 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/analyzer/analyzersilence.cpp
   src/analyzer/analyzerthread.cpp
   src/analyzer/analyzerwaveform.cpp
+  src/analyzer/analyzerrhythm.cpp
+  src/analyzer/analyzerrhythmstats.cpp
+  src/analyzer/analyzerrhythmbpm.cpp
   src/analyzer/plugins/analyzerqueenmarybeats.cpp
   src/analyzer/plugins/analyzerqueenmarykey.cpp
   src/analyzer/plugins/analyzersoundtouchbeats.cpp
@@ -644,6 +647,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/preferences/dialog/dlgprefautodjdlg.ui
   src/preferences/dialog/dlgprefbeats.cpp
   src/preferences/dialog/dlgprefbeatsdlg.ui
+  src/preferences/dialog/dlgprefrhythm.cpp
+  src/preferences/dialog/dlgprefrhythm.ui
   src/preferences/dialog/dlgprefcolors.cpp
   src/preferences/dialog/dlgprefcolorsdlg.ui
   src/preferences/dialog/dlgprefcrossfader.cpp
@@ -1826,6 +1831,11 @@ add_library(QueenMaryDsp STATIC EXCLUDE_FROM_ALL
   lib/qm-dsp/maths/KLDivergence.cpp lib/qm-dsp/maths/MathUtilities.cpp
   # lib/qm-dsp/maths/pca/pca.c
   # lib/qm-dsp/thread/Thread.cpp
+  lib/qm-dsp/dsp/tempogram/FIRFilter.cpp
+  lib/qm-dsp/dsp/tempogram/WindowFunction.cpp
+  lib/qm-dsp/dsp/tempogram/NoveltyCurveProcessor.cpp
+  lib/qm-dsp/dsp/tempogram/SpectrogramProcessor.cpp
+  lib/qm-dsp/dsp/tempogram/AutocorrelationProcessor.cpp
 )
 target_compile_definitions(QueenMaryDsp PRIVATE kiss_fft_scalar=double)
 if(UNIX)

build/depends.py

@@ -779,6 +779,7 @@ def sources(self, build):
                    "src/preferences/dialog/dlgprefsounditem.cpp",
                    "src/preferences/dialog/dlgprefwaveform.cpp",
                    "src/preferences/dialog/dlgprefbeats.cpp",
+                   "src/preferences/dialog/dlgprefrhythm.cpp",
                    "src/preferences/dialog/dlgprefkey.cpp",
                    "src/preferences/settingsmanager.cpp",
                    "src/preferences/replaygainsettings.cpp",
@@ -895,6 +896,9 @@ def sources(self, build):
                    "src/analyzer/analyzerkey.cpp",
                    "src/analyzer/analyzerebur128.cpp",
                    "src/analyzer/analyzersilence.cpp",
+                   "src/analyzer/analyzerrhythm.cpp",
+                   "src/analyzer/analyzerrhythmstats.cpp",
+                   "src/analyzer/analyzerrhythmbpm.cpp",
                    "src/analyzer/plugins/analyzersoundtouchbeats.cpp",
                    "src/analyzer/plugins/analyzerqueenmarybeats.cpp",
                    "src/analyzer/plugins/analyzerqueenmarykey.cpp",
@@ -1394,6 +1398,7 @@ def sources(self, build):
             'src/preferences/dialog/dlgprefsounditem.ui',
             'src/preferences/dialog/dlgprefvinyldlg.ui',
             'src/preferences/dialog/dlgprefwaveformdlg.ui',
+            'src/preferences/dialog/dlgprefrhythm.ui',
         ]
 
         # In Python 3.x, map() returns a "map object" (instead of a list),

lib/qm-dsp/dsp/onsets/DetectionFunction.cpp

@@ -91,7 +91,7 @@ void DetectionFunction::deInitialise()
     delete m_window;
 }
 
-double DetectionFunction::processTimeDomain(const double *samples)
+DFresults DetectionFunction::processTimeDomain(const double *samples)
 {
     m_window->cut(samples, m_windowed);
 
@@ -103,7 +103,7 @@ double DetectionFunction::processTimeDomain(const double *samples)
     return runDF();
 }
 
-double DetectionFunction::processFrequencyDomain(const double *reals,
+DFresults DetectionFunction::processFrequencyDomain(const double *reals,
                                                  const double *imags)
 {
     m_phaseVoc->processFrequencyDomain(reals, imags,
@@ -116,6 +116,35 @@ double DetectionFunction::processFrequencyDomain(const double *reals,
 
 void DetectionFunction::whiten()
 {
+    static int count = 0;
+    static double oldPitch = 0;
+
+    if (count >= 109 && count <= 120) {
+        for (int i = 0; i < m_halfLength; ++i) {
+                double m = m_magnitude[i];
+                std::cout << m << " ";
+        }
+        std::cout << "\n";
+    }
+
+    for (int i = 1; i < m_halfLength; ++i) {
+        m_magnitude[i] *= log((i+300)/((double)i+2));
+    }
+
+
+    /*
+
+    if (count == 35 || count == 52 || count == 53 || count == 54) {
+        for (int i = 0; i < m_halfLength; ++i) {
+                double m = m_magnitude[i];
+                std::cout << m << " ";
+        }
+        std::cout << "\n";
+    }
+    */
+
+
+    /*
     for (int i = 0; i < m_halfLength; ++i) {
         double m = m_magnitude[i];
         if (m < m_magPeaks[i]) {
@@ -125,40 +154,34 @@ void DetectionFunction::whiten()
         m_magPeaks[i] = m;
         m_magnitude[i] /= m;
     }
+    */
+
+    count++;
 }
 
-double DetectionFunction::runDF()
+DFresults DetectionFunction::runDF()
 {
-    double retVal = 0;
-
-    switch( m_DFType )
-    {
-    case DF_HFC:
-        retVal = HFC( m_halfLength, m_magnitude);
-        break;
-
-    case DF_SPECDIFF:
-        retVal = specDiff( m_halfLength, m_magnitude);
-        break;
-
-    case DF_PHASEDEV:
-        // Using the instantaneous phases here actually provides the
-        // same results (for these calculations) as if we had used
-        // unwrapped phases, but without the possible accumulation of
-        // phase error over time
-        retVal = phaseDev( m_halfLength, m_thetaAngle);
-        break;
-
-    case DF_COMPLEXSD:
-        retVal = complexSD( m_halfLength, m_magnitude, m_thetaAngle);
-        break;
-
-    case DF_BROADBAND:
-        retVal = broadband( m_halfLength, m_magnitude);
-        break;
+    DFresults result = {};
+    if (m_DFType & dfHfc) {
+        result.t.hiFrequency = HFC(m_halfLength, m_magnitude);
     }
-
-    return retVal;
+    if (m_DFType & dfSpecDiff) {
+        result.t.specDiff = specDiff(m_halfLength, m_magnitude);
+    }
+    // Using the instantaneous phases here actually provides the
+    // same results (for these calculations) as if we had used
+    // unwrapped phases, but without the possible accumulation of
+    // phase error over time
+    if (m_DFType & dfPhaseDev) {
+        result.t.phaseDev = phaseDev(m_halfLength, m_thetaAngle);
+    }
+    if (m_DFType & dfComplexSd) {
+        result.t.complexSpecDiff = complexSD(m_halfLength, m_magnitude, m_thetaAngle);
+    }
+    if (m_DFType & dfBroadBand) {
+        result.t.broadband = broadband(m_halfLength, m_magnitude);
+    }
+    return result;
 }
 
 double DetectionFunction::HFC(int length, double *src)

lib/qm-dsp/dsp/onsets/DetectionFunction.h

@@ -21,11 +21,24 @@
 #include "dsp/phasevocoder/PhaseVocoder.h"
 #include "base/Window.h"
 
-#define DF_HFC (1)
-#define DF_SPECDIFF (2)
-#define DF_PHASEDEV (3)
-#define DF_COMPLEXSD (4)
-#define DF_BROADBAND (5)
+constexpr int dfHfc = 1;
+constexpr int dfSpecDiff = 2;
+constexpr int dfPhaseDev = 4;
+constexpr int dfComplexSd = 8;
+constexpr int dfBroadBand = 16;
+constexpr int dfAll = 31;
+
+struct DFTypes {
+    double hiFrequency;
+    double specDiff;
+    double phaseDev;
+    double complexSpecDiff;
+    double broadband;
+};
+union DFresults {
+    DFTypes t;
+    double results[5]; //c style so it has exact same memory locations of t items
+};
 
 struct DFConfig{
     int stepSize; // DF step in samples
@@ -48,17 +61,17 @@ class DetectionFunction
      * Process a single time-domain frame of audio, provided as
      * frameLength samples.
      */
-    double processTimeDomain(const double* samples);
+    DFresults processTimeDomain(const double* samples);
 
     /**
      * Process a single frequency-domain frame, provided as
      * frameLength/2+1 real and imaginary component values.
      */
-    double processFrequencyDomain(const double* reals, const double* imags);
+    DFresults processFrequencyDomain(const double* reals, const double* imags);
 
 private:
     void whiten();
-    double runDF();
+    DFresults runDF();
 
     double HFC(int length, double* src);
     double specDiff(int length, double* src);