From 4e3398db5c74fa5f6df32dc746390a5ddeaeedae Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Wed, 8 Sep 2021 11:18:01 +0200 Subject: [PATCH 1/3] BeatUtils: Use QVector::isEmpty() instead of !size() to check emptiness --- src/track/beatutils.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/track/beatutils.cpp b/src/track/beatutils.cpp index b98cfa67fa0..a434317ac60 100644 --- a/src/track/beatutils.cpp +++ b/src/track/beatutils.cpp @@ -72,8 +72,7 @@ QVector BeatUtils::retrieveConstRegions( // Than we start with the region from the found beat to the end. QVector constantRegions; - if (!coarseBeats.size()) { - // no beats + if (coarseBeats.isEmpty()) { return constantRegions; } From ef72d532b5fc6091e49e5c3c9c8d8e3e37c97d0f Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Wed, 8 Sep 2021 11:19:38 +0200 Subject: [PATCH 2/3] BeatUtils: Use QVector::last() instead of QVector::[QVector::size() - 1] --- src/track/beatutils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/track/beatutils.cpp b/src/track/beatutils.cpp index a434317ac60..c8dc0d378e0 100644 --- a/src/track/beatutils.cpp +++ b/src/track/beatutils.cpp @@ -134,7 +134,7 @@ QVector BeatUtils::retrieveConstRegions( } // Add a final region with zero length to mark the end. - constantRegions.append({coarseBeats[coarseBeats.size() - 1], 0}); + constantRegions.append({coarseBeats.last(), 0}); return constantRegions; } From c788690f570961c81d20dfc83f5249e892a2f131 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Wed, 8 Sep 2021 11:20:55 +0200 Subject: [PATCH 3/3] BeatUtils: Rename constant to kMaxOutliersCount for consistency --- src/track/beatutils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/track/beatutils.cpp b/src/track/beatutils.cpp index c8dc0d378e0..68bece8da9e 100644 --- a/src/track/beatutils.cpp +++ b/src/track/beatutils.cpp @@ -17,7 +17,7 @@ constexpr double kMaxSecsPhaseError = 0.025; // This is set to avoid to use a constant region during an offset shift. // That happens for instance when the beat instrument changes. constexpr double kMaxSecsPhaseErrorSum = 0.1; -constexpr int kMaxOutlierCount = 1; +constexpr int kMaxOutliersCount = 1; constexpr int kMinRegionBeatCount = 16; } // namespace @@ -96,7 +96,7 @@ QVector BeatUtils::retrieveConstRegions( phaseErrorSum += phaseError; if (fabs(phaseError) > maxPhaseError) { outliersCount++; - if (outliersCount > kMaxOutlierCount || + if (outliersCount > kMaxOutliersCount || i == leftIndex + 1) { // the first beat must not be an outlier. // region is not const. break;