From 36f993b9a66bb677ae18f0beb69e218e4d75a133 Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Tue, 7 Jun 2022 14:13:24 +0100 Subject: [PATCH] Reduce p level for trough picker. The behaviour here is not what I'd hoped --- src/finer/Guide.h | 2 ++ src/finer/R3StretcherImpl.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/finer/Guide.h b/src/finer/Guide.h index 1541198..f2fa0d9 100644 --- a/src/finer/Guide.h +++ b/src/finer/Guide.h @@ -223,6 +223,8 @@ public: guidance.fftBands[0].f0 = 0.0; guidance.fftBands[0].f1 = lower; + +// std::cout << "x:" << lower << std::endl; guidance.fftBands[1].f0 = lower; guidance.fftBands[1].f1 = higher; diff --git a/src/finer/R3StretcherImpl.cpp b/src/finer/R3StretcherImpl.cpp index d2b078b..8deef82 100644 --- a/src/finer/R3StretcherImpl.cpp +++ b/src/finer/R3StretcherImpl.cpp @@ -654,7 +654,7 @@ R3StretcherImpl::analyseChannel(int c, int inhop, int prevInhop, int prevOuthop) cd->nextSegmentation = cd->segmenter->segment(cd->nextClassification.data()); m_troughPicker.findNearestAndNextPeaks - (classifyScale->mag.data(), 3, nullptr, + (classifyScale->mag.data(), 1, nullptr, classifyScale->troughs.data()); double instantaneousRatio = double(prevOuthop) / double(prevInhop);