Clear the channel's resampler when disabling the channelkc/cdda-pop-1

2 files changed, 17 insertions, 0 deletions

diff --git a/include/mixer.h b/include/mixer.h
index 106ffde1b..a17c376b9 100644
--- a/include/mixer.h
+++ b/include/mixer.h
@@ -242,6 +242,7 @@ private:
 	                    std::vector<float> &out);
 
 	void ConfigureResampler();
+	void ClearResampler();
 	void UpdateZOHUpsamplerState();
 
 	AudioFrame ApplyCrossfeed(const AudioFrame &frame) const;
diff --git a/src/hardware/mixer.cpp b/src/hardware/mixer.cpp
index 3317c22b0..535896a37 100644
--- a/src/hardware/mixer.cpp
+++ b/src/hardware/mixer.cpp
@@ -621,6 +621,10 @@ void MixerChannel::Enable(const bool should_enable)
 
 		prev_frame = {0.0f, 0.0f};
 		next_frame = {0.0f, 0.0f};
+
+		if (do_resampler) {
+			ClearResampler();
+		}
 	}
 	is_enabled = should_enable;
 
@@ -655,6 +659,18 @@ void MixerChannel::ConfigureResampler()
 	//              out_rate);
 }
 
+// Clear the resampler and prime its input queue with zeros
+void MixerChannel::ClearResampler()
+{
+	assert(resampler.state);
+	speex_resampler_reset_mem(resampler.state);
+	speex_resampler_skip_zeros(resampler.state);
+
+	// DEBUG_LOG_MSG("%s: Resampler cleared and primed %d-frame input queue",
+	//               name.c_str(),
+	//               speex_resampler_get_input_latency(resampler.state));
+}
+
 void MixerChannel::SetSampleRate(const int rate)
 {
 	if (rate) {