Merge pull request #2235 from daschuer/lp1839669

fix assertion in Lp1839669
mixxxdj · Dec 9, 2019 · 80ec75a · 80ec75a
2 parents da2e78f + 99033ef
commit 80ec75a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp
@@ -1207,15 +1207,24 @@ void EngineBuffer::postProcess(const int iBufferSize) {
 }
 
 void EngineBuffer::updateIndicators(double speed, int iBufferSize) {
-    VERIFY_OR_DEBUG_ASSERT(m_trackSampleRateOld && m_tempo_ratio_old) {
-        // no track loaded, function not called in this case
+    if (!m_trackSampleRateOld) {
+        // This happens if Deck Passthrough is active but no track is loaded.
+        // We skip indicator updates.
         return;
     }
 
     // Increase samplesCalculated by the buffer size
     m_iSamplesSinceLastIndicatorUpdate += iBufferSize;
 
     const double fFractionalPlaypos = fractionalPlayposFromAbsolute(m_filepos_play);
+
+    double ratio = m_tempo_ratio_old;
+    if (ratio == 0.0) {
+        // In case the track is slowed done to zero we will have INF remaining seconds.
+        // We jump back to a rate of 1.0 to show a useful time.
+        ratio = 1.0;
+    }
+
     const double tempoTrackSeconds = m_trackSamplesOld / kSamplesPerFrame
             / m_trackSampleRateOld / m_tempo_ratio_old;
     if(speed > 0 && fFractionalPlaypos == 1.0) {

diff --git a/src/test/durationutiltest.cpp b/src/test/durationutiltest.cpp
@@ -1,3 +1,5 @@
+#include <limits>
+
 #include <gtest/gtest.h>
 
 #include "util/duration.h"
@@ -9,15 +11,17 @@ namespace {
 class DurationUtilTest : public testing::Test {
   protected:
     static QString adjustPrecision(
-        QString withMilliseconds,
-        mixxx::Duration::Precision precision) {
-        switch (precision) {
-        case mixxx::Duration::Precision::SECONDS:
+            QString withMilliseconds,
+            mixxx::Duration::Precision precision) {
+        if (withMilliseconds == mixxx::DurationBase::kInvalidDurationString)
         {
+            return withMilliseconds;
+        }
+        switch (precision) {
+        case mixxx::Duration::Precision::SECONDS: {
             return withMilliseconds.left(withMilliseconds.length() - 4);
         }
-        case mixxx::Duration::Precision::CENTISECONDS:
-        {
+        case mixxx::Duration::Precision::CENTISECONDS: {
             return withMilliseconds.left(withMilliseconds.length() - 1);
         }
         default:
@@ -26,7 +30,6 @@ class DurationUtilTest : public testing::Test {
     }
 
     void formatTime(QString expectedMilliseconds, double dSeconds) {
-        ASSERT_LE(4, expectedMilliseconds.length()); // 3 digits + 1 decimal point
         const QString actualSeconds =
             mixxx::Duration::formatTime(dSeconds, mixxx::Duration::Precision::SECONDS);
         const QString expectedSeconds =
@@ -112,6 +115,8 @@ TEST_F(DurationUtilTest, formatTime) {
     formatTime("24:00:00.000", 24 * 3600);
     formatTime("24:00:01.000", 24 * 3600 + 1);
     formatTime("25:00:01.000", 25 * 3600 + 1);
+    formatTime("?", std::numeric_limits<double>::infinity());
+    formatTime("?", -1);
 }
 
 TEST_F(DurationUtilTest, formatSeconds) {

diff --git a/src/util/duration.cpp b/src/util/duration.cpp
@@ -5,6 +5,7 @@
 #include <QTime>
 
 #include "util/assert.h"
+#include "util/fpclassify.h"
 #include "util/math.h"
 
 namespace mixxx {
@@ -26,8 +27,9 @@ QChar DurationBase::kDecimalSeparator = QChar(0x002E);
 
 // static
 QString DurationBase::formatTime(double dSeconds, Precision precision) {
-    if (dSeconds < 0.0) {
-        // negative durations are not supported
+    if (dSeconds < 0.0 || !isfinite(dSeconds)
+            || dSeconds > std::numeric_limits<qint64>::max()) {
+        // negative durations and infinity or isNaN values are not supported
         return kInvalidDurationString;
     }