Use src_set_ratio to fix artifacts within Sample playback (LMMS#7321

)
tresf · Jun 15, 2024 · 01ffa95 · 01ffa95
1 parent 68ea3f5
commit 01ffa95
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/include/AudioResampler.h b/include/AudioResampler.h
@@ -52,6 +52,7 @@ class LMMS_EXPORT AudioResampler
 	auto resample(const float* in, long inputFrames, float* out, long outputFrames, double ratio) -> ProcessResult;
 	auto interpolationMode() const -> int { return m_interpolationMode; }
 	auto channels() const -> int { return m_channels; }
+	void setRatio(double ratio);
 
 private:
 	int m_interpolationMode = -1;

diff --git a/src/core/AudioResampler.cpp b/src/core/AudioResampler.cpp
@@ -61,4 +61,9 @@ auto AudioResampler::resample(const float* in, long inputFrames, float* out, lon
 	return {src_process(m_state, &data), data.input_frames_used, data.output_frames_gen};
 }
 
+void AudioResampler::setRatio(double ratio)
+{
+	src_set_ratio(m_state, ratio);
+}
+
 } // namespace lmms
diff --git a/src/core/Sample.cpp b/src/core/Sample.cpp
@@ -134,6 +134,8 @@ bool Sample::play(sampleFrame* dst, PlaybackState* state, size_t numFrames, floa
 	auto playBuffer = std::vector<sampleFrame>(numFrames / resampleRatio + marginSize);
 	playRaw(playBuffer.data(), playBuffer.size(), state, loopMode);
 
+	state->resampler().setRatio(resampleRatio);
+
 	const auto resampleResult
 		= state->resampler().resample(&playBuffer[0][0], playBuffer.size(), &dst[0][0], numFrames, resampleRatio);
 	advance(state, resampleResult.inputFramesUsed, loopMode);