Fix and enable multi-threaded analysis

mixxxdj · Oct 30, 2018 · c236956 · c236956
1 parent db7fe92
commit c236956
Show file tree

Hide file tree

Showing 38 changed files with 1,718 additions and 861 deletions.
diff --git a/build/depends.py b/build/depends.py
@@ -772,7 +772,8 @@ def sources(self, build):
                    "src/engine/cachingreaderchunk.cpp",
                    "src/engine/cachingreaderworker.cpp",
 
-                   "src/analyzer/analyzerqueue.cpp",
+                   "src/analyzer/trackanalysisscheduler.cpp",
+                   "src/analyzer/analyzerthread.cpp",
                    "src/analyzer/analyzerwaveform.cpp",
                    "src/analyzer/analyzergain.cpp",
                    "src/analyzer/analyzerebur128.cpp",
@@ -982,7 +983,7 @@ def sources(self, build):
                    "src/library/bpmdelegate.cpp",
                    "src/library/previewbuttondelegate.cpp",
                    "src/library/coverartdelegate.cpp",
-				   "src/library/tableitemdelegate.cpp",
+                   "src/library/tableitemdelegate.cpp",
 
                    "src/library/treeitemmodel.cpp",
                    "src/library/treeitem.cpp",
@@ -1153,6 +1154,8 @@ def sources(self, build):
                    "src/util/indexrange.cpp",
                    "src/util/desktophelper.cpp",
                    "src/util/widgetrendertimer.cpp",
+                   "src/util/workerthread.cpp",
+                   "src/util/workerthreadscheduler.cpp",
                    ]
 
         proto_args = {

diff --git a/src/analyzer/analyzerebur128.h b/src/analyzer/analyzerebur128.h
@@ -11,6 +11,10 @@ class AnalyzerEbur128 : public Analyzer {
     AnalyzerEbur128(UserSettingsPointer pConfig);
     virtual ~AnalyzerEbur128();
 
+    static bool isEnabled(const ReplayGainSettings& rgSettings) {
+        return rgSettings.isAnalyzerEnabled(2);
+    }
+
     bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
     bool isDisabledOrLoadStoredSuccess(TrackPointer tio) const override;
     void process(const CSAMPLE* pIn, const int iLen) override;

diff --git a/src/analyzer/analyzergain.h b/src/analyzer/analyzergain.h
@@ -18,6 +18,10 @@ class AnalyzerGain : public Analyzer {
     AnalyzerGain(UserSettingsPointer pConfig);
     virtual ~AnalyzerGain();
 
+    static bool isEnabled(const ReplayGainSettings& rgSettings) {
+        return rgSettings.isAnalyzerEnabled(1);
+    }
+
     bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
     bool isDisabledOrLoadStoredSuccess(TrackPointer tio) const override;
     void process(const CSAMPLE* pIn, const int iLen) override;

diff --git a/src/analyzer/analyzerprogress.h b/src/analyzer/analyzerprogress.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "util/math.h"
+
+
+typedef double AnalyzerProgress;
+
+constexpr AnalyzerProgress kAnalyzerProgressUnknown    = -1.0;
+constexpr AnalyzerProgress kAnalyzerProgressNone       =  0.0;  //   0.0 %
+constexpr AnalyzerProgress kAnalyzerProgressHalf       =  0.5;  //  50.0 %
+constexpr AnalyzerProgress kAnalyzerProgressFinalizing =  0.95; //  95.0 %
+constexpr AnalyzerProgress kAnalyzerProgressDone       =  1.0;  // 100.0%
+
+Q_DECLARE_METATYPE(AnalyzerProgress);
+
+// Integer [0, 100]
+inline
+int analyzerProgressPercent(AnalyzerProgress analyzerProgress) {
+    DEBUG_ASSERT(analyzerProgress >= kAnalyzerProgressNone);
+    return int((100 * (math_min(analyzerProgress, kAnalyzerProgressDone) - kAnalyzerProgressNone)) /
+            (kAnalyzerProgressDone - kAnalyzerProgressNone));
+}