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

Further adjustments to reset, and ensure initial prev in/out hops are set the same way if ratios set after construction as they are if ratios set on construction. Plus tests

Browse Source
This commit is contained in:
Chris Cannam
2023-03-23 10:25:18 +00:00
parent 6c71159593
commit 99d2d4a080
3 changed files with 297 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/finer/R3Stretcher.cpp
View File

@@ -61,7 +61,13 @@ R3Stretcher::R3Stretcher(Parameters parameters,
m_mode(ProcessMode::JustCreated)
{
Profiler profiler("R3Stretcher::R3Stretcher");
initialise();
}
void
R3Stretcher::initialise()
{
m_log.log(1, "R3Stretcher::R3Stretcher: rate, options",
m_parameters.sampleRate, m_parameters.options);
m_log.log(1, "R3Stretcher::R3Stretcher: initial time ratio and pitch scale",
@@ -99,6 +105,8 @@ R3Stretcher::R3Stretcher(Parameters parameters,
int inRingBufferSize = getWindowSourceSize() * 16;
int outRingBufferSize = getWindowSourceSize() * 16;
m_channelData.clear();
for (int c = 0; c < m_parameters.channels; ++c) {
m_channelData.push_back(std::make_shared<ChannelData>
(segmenterParameters,
@@ -115,6 +123,8 @@ R3Stretcher::R3Stretcher(Parameters parameters,
(fftSize, m_guideConfiguration.longestFftSize);
}
}
m_scaleData.clear();
for (int b = 0; b < m_guideConfiguration.fftBandLimitCount; ++b) {
const auto &band = m_guideConfiguration.fftBandLimits[b];
@@ -141,9 +151,6 @@ R3Stretcher::R3Stretcher(Parameters parameters,
calculateHop();
m_prevInhop = m_inhop;
m_prevOuthop = int(round(m_inhop * getEffectiveRatio()));
if (!m_inhop.is_lock_free()) {
m_log.log(0, "R3Stretcher: WARNING: std::atomic<int> is not lock-free");
}
@@ -388,6 +395,11 @@ R3Stretcher::calculateHop()
m_log.log(1, "calculateHop: not using readahead, inhop too long for buffer in current configuration");
m_useReadahead = false;
}
if (m_mode == ProcessMode::JustCreated) {
m_prevInhop = m_inhop;
m_prevOuthop = int(round(m_inhop * getEffectiveRatio()));
}
}
void
@@ -532,6 +544,21 @@ R3Stretcher::getChannelCount() const
void
R3Stretcher::reset()
{
m_inhop = 1;
m_prevInhop = 1;
m_prevOuthop = 1;
m_unityCount = 0;
m_startSkip = 0;
m_studyInputDuration = 0;
m_suppliedInputDuration = 0;
m_totalTargetDuration = 0;
m_consumedInputDuration = 0;
m_lastKeyFrameSurpassed = 0;
m_totalOutputDuration = 0;
m_keyFrameMap.clear();
m_mode = ProcessMode::JustCreated;
m_calculator->reset();
if (m_resampler) {
@@ -546,24 +573,7 @@ R3Stretcher::reset()
cd->reset();
}
m_unityCount = 0;
m_studyInputDuration = 0;
m_suppliedInputDuration = 0;
m_totalTargetDuration = 0;
m_consumedInputDuration = 0;
m_lastKeyFrameSurpassed = 0;
m_totalOutputDuration = 0;
m_keyFrameMap.clear();
m_mode = ProcessMode::JustCreated;
m_prevInhop = 1;
m_prevOuthop = 1;
calculateHop();
m_prevInhop = m_inhop;
m_prevOuthop = int(round(m_inhop * getEffectiveRatio()));
}
void