From 78c1629aebdda5281f9a4f9836d2a1812321c18c Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Fri, 5 Feb 2010 11:45:17 -0800 Subject: [PATCH] Disable ALSA's resampler when no specific output rate is requested --- Alc/alsa.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Alc/alsa.c b/Alc/alsa.c index b56d0537..bf3afc83 100644 --- a/Alc/alsa.c +++ b/Alc/alsa.c @@ -67,6 +67,7 @@ MAKE_FUNC(snd_pcm_hw_params_set_channels); MAKE_FUNC(snd_pcm_hw_params_set_periods_near); MAKE_FUNC(snd_pcm_hw_params_set_rate_near); MAKE_FUNC(snd_pcm_hw_params_set_rate); +MAKE_FUNC(snd_pcm_hw_params_set_rate_resample); MAKE_FUNC(snd_pcm_hw_params_set_buffer_size_near); MAKE_FUNC(snd_pcm_hw_params_set_period_size_near); MAKE_FUNC(snd_pcm_hw_params_set_buffer_size_min); @@ -161,6 +162,7 @@ LOAD_FUNC(snd_pcm_hw_params_set_channels); LOAD_FUNC(snd_pcm_hw_params_set_periods_near); LOAD_FUNC(snd_pcm_hw_params_set_rate_near); LOAD_FUNC(snd_pcm_hw_params_set_rate); +LOAD_FUNC(snd_pcm_hw_params_set_rate_resample); LOAD_FUNC(snd_pcm_hw_params_set_buffer_size_near); LOAD_FUNC(snd_pcm_hw_params_set_buffer_size_min); LOAD_FUNC(snd_pcm_hw_params_set_period_size_near); @@ -615,6 +617,12 @@ static ALCboolean alsa_reset_playback(ALCdevice *device) err = "set channels"; } } + if(i >= 0 && !ConfigValueExists(NULL, "frequency") && + (i=psnd_pcm_hw_params_set_rate_resample(data->pcmHandle, p, 0)) < 0) + { + AL_PRINT("Failed to disable ALSA resampler\n"); + i = 0; + } /* set rate (implicitly constrains period/buffer parameters) */ if(i >= 0 && (i=psnd_pcm_hw_params_set_rate_near(data->pcmHandle, p, &rate, NULL)) < 0) err = "set rate near"; -- 2.11.4.GIT