Move fast analysis samples calculation to init() and use analyzer/con…

…stants.h.
daschuer · Dec 30, 2018 · 2eb5dd5 · 2eb5dd5
1 parent ce067ea
commit 2eb5dd5
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/src/analyzer/analyzerbeats.cpp b/src/analyzer/analyzerbeats.cpp
@@ -5,6 +5,7 @@
 #include <QHash>
 #include <QString>
 
+#include "analyzer/constants.h"
 #include "analyzer/plugins/analyzersoundtouchbeats.h"
 #include "analyzer/plugins/analyzerqueenmarybeats.h"
 #include "track/beatfactory.h"
@@ -14,8 +15,6 @@
 
 // Only analyze the first minute in fast-analysis mode.
 static const int kFastAnalysisSecondsToAnalyze = 60;
-// All audio files are converted to stereo first before analysis.
-static const int kAnalyzerNumChannels = 2;
 
 // static
 QList<mixxx::AnalyzerPluginInfo> AnalyzerBeats::availablePlugins() {
@@ -34,6 +33,7 @@ AnalyzerBeats::AnalyzerBeats(UserSettingsPointer pConfig, bool enforceBpmDetecti
           m_bPreferencesFastAnalysis(false),
           m_iSampleRate(0),
           m_iTotalSamples(0),
+          m_iMaxSamplesToProcess(0),
           m_iCurrentSample(0),
           m_iMinBpm(0),
           m_iMaxBpm(9999) {
@@ -81,6 +81,13 @@ bool AnalyzerBeats::initialize(TrackPointer tio, int sampleRate, int totalSample
 
     m_iSampleRate = sampleRate;
     m_iTotalSamples = totalSamples;
+    // In fast analysis mode, skip processing after
+    // kFastAnalysisSecondsToAnalyze seconds are analyzed.
+    if (m_bPreferencesFastAnalysis) {
+        m_iMaxSamplesToProcess = mixxx::kFastAnalysisSecondsToAnalyze * m_iSampleRate * mixxx::kAnalysisChannels;
+    } else {
+        m_iMaxSamplesToProcess = m_iTotalSamples;
+    }
     m_iCurrentSample = 0;
 
     // if we can load a stored track don't reanalyze it
@@ -171,10 +178,7 @@ void AnalyzerBeats::process(const CSAMPLE *pIn, const int iLen) {
     }
 
     m_iCurrentSample += iLen;
-    // In fast analysis mode, skip processing after
-    // kFastAnalysisSecondsToAnalyze seconds are analyzed.
-    const int maxSamples = kFastAnalysisSecondsToAnalyze * m_iSampleRate * kAnalyzerNumChannels;
-    if (m_bPreferencesFastAnalysis && m_iCurrentSample > maxSamples) {
+    if (m_iCurrentSample > m_iMaxSamplesToProcess) {
         return;
     }
 

diff --git a/src/analyzer/analyzerbeats.h b/src/analyzer/analyzerbeats.h
@@ -47,6 +47,7 @@ class AnalyzerBeats: public Analyzer {
 
     int m_iSampleRate;
     int m_iTotalSamples;
+    int m_iMaxSamplesToProcess;
     int m_iCurrentSample;
     int m_iMinBpm, m_iMaxBpm;
 };

diff --git a/src/analyzer/analyzerkey.cpp b/src/analyzer/analyzerkey.cpp
@@ -3,15 +3,11 @@
 #include <QtDebug>
 #include <QVector>
 
+#include "analyzer/constants.h"
 #include "analyzer/plugins/analyzerqueenmarykey.h"
 #include "proto/keys.pb.h"
 #include "track/keyfactory.h"
 
-// Only analyze the first minute in fast-analysis mode.
-static const int kFastAnalysisSecondsToAnalyze = 60;
-// All audio files are converted to stereo first before analysis.
-static const int kAnalyzerNumChannels = 2;
-
 // static
 QList<mixxx::AnalyzerPluginInfo> AnalyzerKey::availablePlugins() {
     QList<mixxx::AnalyzerPluginInfo> analyzers;
@@ -23,6 +19,7 @@ AnalyzerKey::AnalyzerKey(KeyDetectionSettings keySettings)
         : m_keySettings(keySettings),
           m_iSampleRate(0),
           m_iTotalSamples(0),
+          m_iMaxSamplesToProcess(0),
           m_iCurrentSample(0),
           m_bPreferencesKeyDetectionEnabled(true),
           m_bPreferencesFastAnalysisEnabled(false),
@@ -51,6 +48,13 @@ bool AnalyzerKey::initialize(TrackPointer tio, int sampleRate, int totalSamples)
 
     m_iSampleRate = sampleRate;
     m_iTotalSamples = totalSamples;
+    // In fast analysis mode, skip processing after
+    // kFastAnalysisSecondsToAnalyze seconds are analyzed.
+    if (m_bPreferencesFastAnalysisEnabled) {
+        m_iMaxSamplesToProcess = mixxx::kFastAnalysisSecondsToAnalyze * m_iSampleRate * mixxx::kAnalysisChannels;
+    } else {
+        m_iMaxSamplesToProcess = m_iTotalSamples;
+    }
     m_iCurrentSample = 0;
 
     // if we can't load a stored track reanalyze it
@@ -113,13 +117,12 @@ void AnalyzerKey::process(const CSAMPLE *pIn, const int iLen) {
     if (!m_pPlugin) {
         return;
     }
+
     m_iCurrentSample += iLen;
-    // In fast analysis mode, skip processing after
-    // kFastAnalysisSecondsToAnalyze seconds are analyzed.
-    const int maxSamples = kFastAnalysisSecondsToAnalyze * m_iSampleRate * kAnalyzerNumChannels;
-    if (m_bPreferencesFastAnalysisEnabled && m_iCurrentSample > maxSamples) {
+    if (m_iCurrentSample > m_iMaxSamplesToProcess) {
         return;
     }
+
     bool success = m_pPlugin->process(pIn, iLen);
     if (!success) {
         m_pPlugin.reset();

diff --git a/src/analyzer/analyzerkey.h b/src/analyzer/analyzerkey.h
@@ -34,6 +34,7 @@ class AnalyzerKey : public Analyzer {
     QString m_pluginId;
     int m_iSampleRate;
     int m_iTotalSamples;
+    int m_iMaxSamplesToProcess;
     int m_iCurrentSample;
 
     bool m_bPreferencesKeyDetectionEnabled;