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

Fix calculation of recovery value now that divergence is recalculated afresh on each update

Browse Source
This commit is contained in:
Chris Cannam
2021-05-14 08:46:37 +01:00
parent d06b4efc16
commit 478d9233fe
5 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.hgignore
View File

@@ -24,4 +24,5 @@ Release/
Debug/
build
build_*
build-*
UpgradeLog*

54
src/StretchCalculator.cpp
View File

@@ -41,8 +41,6 @@ StretchCalculator::StretchCalculator(size_t sampleRate,
m_sampleRate(sampleRate),
m_increment(inputIncrement),
m_prevDf(0),
m_divergence(0),
m_recovery(0),
m_prevRatio(1.0),
m_prevTimeRatio(1.0),
m_transientAmnesty(0),
@@ -417,10 +415,11 @@ StretchCalculator::calculateSingle(double timeRatio,
(m_inFrameCounter + analysisWindowSize/4, timeRatio);
int64_t projected = int64_t
(round(m_outFrameCounter + (synthesisWindowSize/4 * effectivePitchRatio)));
m_divergence = projected - intended;
int64_t divergence = projected - intended;
if (m_debugLevel > 2) {
std::cerr << "for current frame + quarter frame: intended " << intended << ", projected " << projected << ", divergence " << m_divergence << std::endl;
std::cerr << "for current frame + quarter frame: intended " << intended << ", projected " << projected << ", divergence " << divergence << std::endl;
}
// In principle, the threshold depends on chunk size: larger chunk
@@ -462,37 +461,36 @@ StretchCalculator::calculateSingle(double timeRatio,
m_transientAmnesty =
lrint(ceil(double(m_sampleRate) / (20 * double(increment))));
m_recovery = m_divergence / ((m_sampleRate / 10.0) / increment);
outIncrement = increment;
} else {
if (ratioChanged) {
m_recovery = m_divergence / ((m_sampleRate / 10.0) / increment);
double recovery = 0.0;
if (divergence > 1000 || divergence < -1000) {
recovery = divergence / ((m_sampleRate / 10.0) / increment);
} else if (divergence > 100 || divergence < -100) {
recovery = divergence / ((m_sampleRate / 25.0) / increment);
} else {
recovery = divergence / 4.0;
}
int incr = lrint(outIncrement - m_recovery);
if (m_debugLevel > 2 || (m_debugLevel > 1 && m_divergence != 0)) {
std::cerr << "divergence = " << m_divergence << ", recovery = " << m_recovery << ", incr = " << incr << ", ";
}
if (incr < lrint((increment * ratio) / 2)) {
incr = lrint((increment * ratio) / 2);
} else if (incr > lrint(increment * ratio * 2)) {
incr = lrint(increment * ratio * 2);
int incr = lrint(outIncrement - recovery);
if (m_debugLevel > 2 || (m_debugLevel > 1 && divergence != 0)) {
std::cerr << "divergence = " << divergence << ", recovery = " << recovery << ", incr = " << incr << ", ";
}
double divdiff = (increment * ratio) - incr;
if (m_debugLevel > 2 || (m_debugLevel > 1 && m_divergence != 0)) {
std::cerr << "possibly clamped to " << incr << ", divdiff = " << divdiff << std::endl;
int minIncr = lrint(increment * ratio * 0.5);
int maxIncr = lrint(increment * ratio * 2);
if (incr < minIncr) {
incr = minIncr;
} else if (incr > maxIncr) {
incr = maxIncr;
}
double prevDivergence = m_divergence;
m_divergence -= divdiff;
if ((prevDivergence < 0 && m_divergence > 0) ||
(prevDivergence > 0 && m_divergence < 0)) {
m_recovery = m_divergence / ((m_sampleRate / 10.0) / increment);
if (m_debugLevel > 2 || (m_debugLevel > 1 && divergence != 0)) {
std::cerr << "clamped into [" << minIncr << ", " << maxIncr
<< "] becomes " << incr << std::endl;
}
if (incr < 0) {
@@ -524,9 +522,11 @@ void
StretchCalculator::reset()
{
m_prevDf = 0;
m_divergence = 0;
m_recovery = 0;
m_prevRatio = 1.0;
m_prevTimeRatio = 1.0;
m_inFrameCounter = 0;
m_frameCheckpoint = std::pair<int64_t, int64_t>(0, 0);
m_outFrameCounter = 0.0;
m_transientAmnesty = 0;
m_keyFrameMap.clear();
}

2
src/StretchCalculator.h
View File

@@ -108,8 +108,6 @@ protected:
size_t m_sampleRate;
size_t m_increment;
float m_prevDf;
double m_divergence;
double m_recovery;
double m_prevRatio;
double m_prevTimeRatio;
int m_transientAmnesty; // only in RT mode; handled differently offline

4
src/StretcherImpl.cpp
View File

@@ -685,7 +685,7 @@ RubberBandStretcher::Impl::configure()
}
params.maxBufferSize = 4096 * 16;
params.debugLevel = m_debugLevel;
params.debugLevel = (m_debugLevel > 0 ? m_debugLevel-1 : 0);
m_channelData[c]->resampler = new Resampler(params, 1);
@@ -837,7 +837,7 @@ RubberBandStretcher::Impl::reconfigure()
params.dynamism = Resampler::RatioOftenChanging;
params.ratioChange = Resampler::SmoothRatioChange;
params.maxBufferSize = m_sWindowSize;
params.debugLevel = m_debugLevel;
params.debugLevel = (m_debugLevel > 0 ? m_debugLevel-1 : 0);
m_channelData[c]->resampler = new Resampler(params, 1);

4
src/StretcherProcess.cpp
View File

@@ -189,6 +189,8 @@ RubberBandStretcher::Impl::consumeChannel(size_t c,
if (resampling) {
Profiler profiler2("RubberBandStretcher::Impl::resample");
toWrite = int(ceil(samples / m_pitchScale));
if (writable < toWrite) {
samples = int(floor(writable * m_pitchScale));
@@ -1077,6 +1079,8 @@ RubberBandStretcher::Impl::writeChunk(size_t channel, size_t shiftIncrement, boo
(m_pitchScale != 1.0 || m_options & OptionPitchHighConsistency) &&
cd.resampler) {
Profiler profiler2("RubberBandStretcher::Impl::resample");
size_t reqSize = int(ceil(si / m_pitchScale));
if (reqSize > cd.resamplebufSize) {
// This shouldn't normally happen -- the buffer is