Merge pull request #4129 from Holzhaus/assert-cleanup

Assert fixes
mixxxdj · Jul 21, 2021 · 2a5b95e · 2a5b95e
2 parents f48c276 + 04d1b3c
commit 2a5b95e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/sources/soundsourceffmpeg.cpp b/src/sources/soundsourceffmpeg.cpp
@@ -968,9 +968,9 @@ const CSAMPLE* SoundSourceFFmpeg::resampleDecodedAVFrame() {
 #if VERBOSE_DEBUG_LOG
         avTrace("Received resampled frame", *m_pavResampledFrame);
 #endif
-        DEBUG_ASSERT(m_pavDecodedFrame->pts = m_pavResampledFrame->pts);
-        DEBUG_ASSERT(m_pavDecodedFrame->nb_samples =
-                             m_pavResampledFrame->nb_samples);
+        DEBUG_ASSERT(m_pavResampledFrame->pts == AV_NOPTS_VALUE ||
+                m_pavResampledFrame->pts == m_pavDecodedFrame->pts);
+        DEBUG_ASSERT(m_pavResampledFrame->nb_samples == m_pavDecodedFrame->nb_samples);
         return reinterpret_cast<const CSAMPLE*>(
                 m_pavResampledFrame->extended_data[0]);
     } else {

diff --git a/src/util/db/fwdsqlquery.cpp b/src/util/db/fwdsqlquery.cpp
@@ -121,7 +121,7 @@ inline bool boolFromQVariantInt(const QVariant& variant) {
                 << value;
     }
     // C-style conversion from int to bool
-    DEBUG_ASSERT(kBooleanFalse == 0);
+    static_assert(kBooleanFalse == 0);
     return value != kBooleanFalse;
 }