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

Avoid any smoothing when setting initial ratio

Browse Source
This commit is contained in:
Chris Cannam
2020-11-16 09:11:12 +00:00
parent 9798ac0be0
commit 897bd14b8e
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/dsp/Resampler.cpp
View File

@@ -578,6 +578,7 @@ protected:
int m_iinsize; int m_iinsize;
int m_ioutsize; int m_ioutsize;
double m_prevRatio; double m_prevRatio;
bool m_ratioUnset;
int m_debugLevel; int m_debugLevel;
}; };
@@ -590,6 +591,7 @@ D_SRC::D_SRC(Resampler::Quality quality, int channels, double,
m_iinsize(0), m_iinsize(0),
m_ioutsize(0), m_ioutsize(0),
m_prevRatio(1.0), m_prevRatio(1.0),
m_ratioUnset(true),
m_debugLevel(debugLevel) m_debugLevel(debugLevel)
{ {
if (m_debugLevel > 0) { if (m_debugLevel > 0) {
@@ -680,7 +682,14 @@ D_SRC::resampleInterleaved(float *const R__ out,
outcount = int(ceil(incount * ratio) + 5); outcount = int(ceil(incount * ratio) + 5);
} }
if (ratio != m_prevRatio) { if (m_ratioUnset) {
// The first time we set a ratio, we want to do it directly
src_set_ratio(m_src, ratio);
m_ratioUnset = false;
m_prevRatio = ratio;
} else if (ratio != m_prevRatio) {
// If we are processing a block of appreciable length, turn it // If we are processing a block of appreciable length, turn it
// into two recursive calls, one for the short smoothing block // into two recursive calls, one for the short smoothing block
@@ -736,6 +745,7 @@ void
D_SRC::reset() D_SRC::reset()
{ {
src_reset(m_src); src_reset(m_src);
m_ratioUnset = true;
} }
#endif /* HAVE_LIBSAMPLERATE */ #endif /* HAVE_LIBSAMPLERATE */