david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Better reporting of soft peaks (time sync points)

Browse Source
This commit is contained in:
Chris Cannam
2007-11-07 22:34:30 +00:00
parent d2f4833a0a
commit 5863e9070b
7 changed files with 61 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/StretchCalculator.cpp
View File

@@ -85,7 +85,8 @@ StretchCalculator::calculate(double ratio, size_t inputDuration,
assert(lockDf.size() == stretchDf.size());
std::vector<Peak> peaks = findPeaks(lockDf);
m_lastPeaks = findPeaks(lockDf);
std::vector<Peak> &peaks = m_lastPeaks;
size_t totalCount = lockDf.size();
std::vector<int> increments;
@@ -434,12 +435,14 @@ StretchCalculator::findPeaks(const std::vector<float> &rawDf)
//locate the lock). For hard peaks we need to lock in
//time to preserve the shape of the transient (unless some
//option is set to soft mode), for soft peaks we just want
//to avoid phase drift so we build up to the lock at the
//exact peak moment.
//to avoid poor timing positioning so we build up to the
//lock at the exact peak moment.
// size_t peak = i + maxindex - mediansize;
size_t peak = i + maxindex - middle;
std::cerr << "i = " << i << ", maxindex = " << maxindex << ", middle = " << middle << ", so peak at " << peak << std::endl;
// if (peak > 0) --peak; //!!! that's a fudge
if (softPeakCandidates.empty() || lastSoftPeak != peak) {