ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix horrible latency when the alsa pulseaudio plugin is involved, see issue #2651 

The fix is asking alsa for a prefered "hardware" buffer size, so alsa does not fall
back to pulseaudios offering of ~1 minute. Additionally, alsa busy waits when pulseaudio
is used, sw:avail_min is set and hw:buffer_size is small.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5439 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
pierre 2010-05-07 23:14:40 +00:00
parent 7742e1a6dd
commit 39b17ca640
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Source/Core/AudioCommon/Src/AlsaSoundStream.cpp
View File

@ -88,6 +88,8 @@ bool AlsaSound::AlsaInit()
int dir;
snd_pcm_sw_params_t *swparams;
snd_pcm_hw_params_t *hwparams;
snd_pcm_uframes_t buffer_size;
unsigned int periods;
err = snd_pcm_open(&handle, "default", SND_PCM_STREAM_PLAYBACK, 0);
if (err < 0)
@ -133,6 +135,31 @@ bool AlsaSound::AlsaInit()
return false;
}
periods = 2;
err = snd_pcm_hw_params_set_periods_min(handle, hwparams, &periods, &dir);
if (err < 0)
{
ERROR_LOG(AUDIO, "Cannot set Minimum periods: %s\n", snd_strerror(err));
return false;
}
buffer_size = BUFFER_SIZE;
err = snd_pcm_hw_params_set_buffer_size_min(handle, hwparams, &buffer_size);
if (err < 0)
{
ERROR_LOG(AUDIO, "Cannot set minimum buffer size: %s\n", snd_strerror(err));
return false;
}
buffer_size = BUFFER_SIZE*2;
err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, &buffer_size);
if (err < 0)
{
ERROR_LOG(AUDIO, "Cannot set buffer size: %s\n", snd_strerror(err));
return false;
}
NOTICE_LOG(AUDIO, "ALSA gave us %d \"hardware\" buffers of %d samples.\n", periods, buffer_size);
err = snd_pcm_hw_params(handle, hwparams);
if (err < 0)
{
@ -149,13 +176,6 @@ bool AlsaSound::AlsaInit()
return false;
}
err = snd_pcm_sw_params_set_avail_min(handle, swparams, BUFFER_SIZE);
if (err < 0)
{
ERROR_LOG(AUDIO, "cannot set avail min: %s\n", snd_strerror(err));
return false;
}
err = snd_pcm_sw_params_set_start_threshold(handle, swparams, 0U);
if (err < 0)
{