Intro/Outro cues and silence detection

build/depends.py

@@ -792,6 +792,7 @@ def sources(self, build):
                    "analyzer/analyzerwaveform.cpp",
                    "analyzer/analyzergain.cpp",
                    "analyzer/analyzerebur128.cpp",
+                   "analyzer/analyzersilence.cpp",
 
                    "controllers/controller.cpp",
                    "controllers/controllerdebug.cpp",
@@ -984,7 +985,6 @@ def sources(self, build):
                    "library/scanner/recursivescandirectorytask.cpp",
 
                    "library/dao/cuedao.cpp",
-                   "library/dao/cue.cpp",
                    "library/dao/trackdao.cpp",
                    "library/dao/playlistdao.cpp",
                    "library/dao/libraryhashdao.cpp",
@@ -1079,6 +1079,7 @@ def sources(self, build):
                    "track/beatutils.cpp",
                    "track/beats.cpp",
                    "track/bpm.cpp",
+                   "track/cue.cpp",
                    "track/keyfactory.cpp",
                    "track/keys.cpp",
                    "track/keyutils.cpp",

res/schema.xml

@@ -426,4 +426,13 @@ METADATA
       ALTER TABLE cues ADD COLUMN color INTEGER DEFAULT 4294901760 NOT NULL;
     </sql>
   </revision>
+  <revision version="28" min_compatible="3">
+    <description>
+      Add source to cue. Default is MANUAL.
+      See library/dao/cue.h.
+    </description>
+    <sql>
+      ALTER TABLE cues ADD COLUMN source INTEGER DEFAULT 2 NOT NULL;
+    </sql>
+  </revision>
 </schema>

res/skins/LateNight/waveform.xml

@@ -74,6 +74,20 @@
 					<Color>#FF001C</Color>
 					<TextColor>#FFFFFF</TextColor>
 				</Mark>
+				<Mark>
+					<Control>autodj_start_position</Control>
+					<Text>BEGIN</Text>
+					<Align>left|vcenter</Align>
+					<Color>#00FF00</Color>
+					<TextColor>#FFFFFF</TextColor>
+				</Mark>
+				<Mark>
+					<Control>autodj_end_position</Control>
+					<Text>END</Text>
+					<Align>right|vcenter</Align>
+					<Color>#00FF00</Color>
+					<TextColor>#FFFFFF</TextColor>
+				</Mark>
 			</Visual>
 		</Children>
 	</WidgetGroup>

src/analyzer/analyzerqueue.cpp

@@ -7,6 +7,7 @@
 #include "analyzer/analyzergain.h"
 #include "analyzer/analyzerebur128.h"
 #include "analyzer/analyzerwaveform.h"
+#include "analyzer/analyzersilence.h"
 #include "library/dao/analysisdao.h"
 #include "engine/engine.h"
 #include "mixer/playerinfo.h"
@@ -60,6 +61,7 @@ AnalyzerQueue::AnalyzerQueue(
     }
     m_pAnalyzers.push_back(std::make_unique<AnalyzerGain>(pConfig));
     m_pAnalyzers.push_back(std::make_unique<AnalyzerEbur128>(pConfig));
+    m_pAnalyzers.push_back(std::make_unique<AnalyzerSilence>(pConfig));
 #ifdef __VAMP__
     m_pAnalyzers.push_back(std::make_unique<AnalyzerBeats>(pConfig));
     m_pAnalyzers.push_back(std::make_unique<AnalyzerKey>(pConfig));

src/analyzer/analyzersilence.cpp

@@ -0,0 +1,114 @@
+#include "analyzer/analyzersilence.h"
+#include "engine/engine.h"
+
+namespace {
+    const mixxx::AudioSignal::ChannelCount kChannelCount = mixxx::kEngineChannelCount;
+    const float kSilenceThresholdDb = -60.0f;
+}  // anonymous namespace
+
+AnalyzerSilence::AnalyzerSilence(UserSettingsPointer pConfig)
+    : m_pConfig(pConfig),
+      m_fThreshold(db2ratio(kSilenceThresholdDb)),
+      m_iFramesProcessed(0),
+      m_bPrevSilence(true),
+      m_iSignalBegin(-1),
+      m_iSignalEnd(-1) {
+}
+
+AnalyzerSilence::~AnalyzerSilence() {
+}
+
+bool AnalyzerSilence::initialize(TrackPointer tio, int sampleRate, int totalSamples) {
+    Q_UNUSED(sampleRate);
+    Q_UNUSED(totalSamples);
+
+    m_iFramesProcessed = 0;
+    m_bPrevSilence = true;
+    m_iSignalBegin = -1;
+    m_iSignalEnd = -1;
+
+    m_pTrack = tio;
+
+    m_pBeginCue = tio->findCueByType(Cue::BEGIN);
+    if (!m_pBeginCue) {
+        m_pBeginCue = tio->createAndAddCue();
+        m_pBeginCue->setType(Cue::BEGIN);
+        m_pBeginCue->setSource(Cue::AUTOMATIC);
+        m_pBeginCue->setPosition(-1.0);
+    }
+
+    m_pEndCue = tio->findCueByType(Cue::END);
+    if (!m_pEndCue) {
+        m_pEndCue = tio->createAndAddCue();
+        m_pEndCue->setType(Cue::END);
+        m_pEndCue->setSource(Cue::AUTOMATIC);
+        m_pEndCue->setPosition(-1.0);
+    }
+
+    return !isDisabledOrLoadStoredSuccess(tio);
+}
+
+bool AnalyzerSilence::isDisabledOrLoadStoredSuccess(TrackPointer tio) const {
+    return tio->getCuePointSource() == Cue::MANUAL &&
+            m_pBeginCue->getSource() == Cue::MANUAL &&
+            m_pEndCue->getSource() == Cue::MANUAL;
+}
+
+void AnalyzerSilence::process(const CSAMPLE* pIn, const int iLen) {
+    for (int i = 0; i < iLen; i += kChannelCount) {
+        // Compute max of channels in this sample frame
+        CSAMPLE fMax = CSAMPLE_ZERO;
+        for (SINT ch = 0; ch < kChannelCount; ++ch) {
+            CSAMPLE fAbs = fabs(pIn[i + ch]);
+            fMax = math_max(fMax, fAbs);
+        }
+
+        bool bSilence = fMax < m_fThreshold;
+
+        if (m_bPrevSilence && !bSilence) {
+            if (m_iSignalBegin < 0) {
+                m_iSignalBegin = m_iFramesProcessed + i / kChannelCount;
+
+                if (m_pTrack->getCuePointSource() != Cue::MANUAL) {
+                    double position = m_iFramesProcessed * kChannelCount + i;
+                    m_pTrack->setCuePoint(position, Cue::AUTOMATIC);
+                }
+            }
+        } else if (!m_bPrevSilence && bSilence) {
+            m_iSignalEnd = m_iFramesProcessed + i / kChannelCount;
+        }
+
+        m_bPrevSilence = bSilence;
+    }
+
+    m_iFramesProcessed += iLen / kChannelCount;
+}
+
+void AnalyzerSilence::cleanup(TrackPointer tio) {
+    Q_UNUSED(tio);
+}
+
+void AnalyzerSilence::finalize(TrackPointer tio) {
+    Q_UNUSED(tio);
+
+    if (m_iSignalBegin < 0) {
+        m_iSignalBegin = 0;
+    }
+    if (m_iSignalEnd < 0) {
+        m_iSignalEnd = m_iFramesProcessed;
+    }
+
+    // If track didn't end with silence, place signal end marker
+    // on the end of the track.
+    if (!m_bPrevSilence) {
+        m_iSignalEnd = m_iFramesProcessed;
+    }
+
+    if (m_pBeginCue->getSource() != Cue::MANUAL) {
+        m_pBeginCue->setPosition(kChannelCount * m_iSignalBegin);
+    }
+
+    if (m_pEndCue->getSource() != Cue::MANUAL) {
+        m_pEndCue->setPosition(kChannelCount * m_iSignalEnd);
+    }
+}

src/analyzer/analyzersilence.h

@@ -0,0 +1,33 @@
+#ifndef ANALYZER_ANALYZERSILENCE_H
+#define ANALYZER_ANALYZERSILENCE_H
+
+#include "analyzer/analyzer.h"
+#include "preferences/usersettings.h"
+
+class CuePointer;
+
+class AnalyzerSilence : public Analyzer {
+  public:
+    AnalyzerSilence(UserSettingsPointer pConfig);
+    virtual ~AnalyzerSilence() override;
+
+    bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
+    bool isDisabledOrLoadStoredSuccess(TrackPointer tio) const override;
+    void process(const CSAMPLE* pIn, const int iLen) override;
+    void finalize(TrackPointer tio) override;
+    void cleanup(TrackPointer tio) override;
+
+  private:
+    UserSettingsPointer m_pConfig;
+    float m_fThreshold;
+    int m_iFramesProcessed;
+    bool m_bPrevSilence;
+    int m_iSignalBegin;
+    int m_iSignalEnd;
+
+    TrackPointer m_pTrack;
+    CuePointer m_pBeginCue;
+    CuePointer m_pEndCue;
+};
+
+#endif // ANALYZER_ANALYZERSILENCE_H

src/database/mixxxdb.cpp

@@ -11,7 +11,7 @@
 const QString MixxxDb::kDefaultSchemaFile(":/schema.xml");
 
 //static
-const int MixxxDb::kRequiredSchemaVersion = 27;
+const int MixxxDb::kRequiredSchemaVersion = 28;
 
 namespace {