AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-06-26 16:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Much more realistic period size for ALSA buffering

Browse Source
This commit is contained in:
Jack Andersen 2017-11-10 11:04:19 -10:00
parent 165314b817
commit a9d16fff83
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/audiodev/ALSA.cpp
View File

@ -201,14 +201,10 @@ struct ALSAAudioVoiceEngine : BaseAudioVoiceEngine
if (!snd_pcm_hw_params_test_rate(m_pcm, hwParams, 96000, 0)) if (!snd_pcm_hw_params_test_rate(m_pcm, hwParams, 96000, 0))
{ {
bestRate = 96000; bestRate = 96000;
m_mixInfo.m_sampleRate = 96000.0;
m_5msFrames = 96000 * 5 / 1000;
} }
else if (!snd_pcm_hw_params_test_rate(m_pcm, hwParams, 48000, 0)) else if (!snd_pcm_hw_params_test_rate(m_pcm, hwParams, 48000, 0))
{ {
bestRate = 48000; bestRate = 48000;
m_mixInfo.m_sampleRate = 48000.0;
m_5msFrames = 48000 * 5 / 1000;
} }
else else
{ {
@ -228,18 +224,9 @@ struct ALSAAudioVoiceEngine : BaseAudioVoiceEngine
return; return;
} }
m_mixInfo.m_sampleRate = bestRate; m_mixInfo.m_sampleRate = bestRate;
m_5msFrames = bestRate * 5 / 1000;
snd_pcm_uframes_t bufSz = m_5msFrames * 3; snd_pcm_uframes_t periodSz = m_5msFrames * 4;
if ((errr = snd_pcm_hw_params_set_buffer_size_near(m_pcm, hwParams, &bufSz)))
{
snd_pcm_hw_params_free(hwParams);
snd_pcm_close(m_pcm);
m_pcm = nullptr;
Log.report(logvisor::Error, "Can't set buffer size. %s\n", snd_strerror(errr));
return;
}
snd_pcm_uframes_t periodSz = bufSz / 2;
if ((errr = snd_pcm_hw_params_set_period_size_near(m_pcm, hwParams, &periodSz, 0))) if ((errr = snd_pcm_hw_params_set_period_size_near(m_pcm, hwParams, &periodSz, 0)))
{ {
snd_pcm_hw_params_free(hwParams); snd_pcm_hw_params_free(hwParams);
@ -249,6 +236,16 @@ struct ALSAAudioVoiceEngine : BaseAudioVoiceEngine
return; return;
} }
snd_pcm_uframes_t bufSz = periodSz * 2;
if ((errr = snd_pcm_hw_params_set_buffer_size_near(m_pcm, hwParams, &bufSz)))
{
snd_pcm_hw_params_free(hwParams);
snd_pcm_close(m_pcm);
m_pcm = nullptr;
Log.report(logvisor::Error, "Can't set buffer size. %s\n", snd_strerror(errr));
return;
}
/* Write parameters */ /* Write parameters */
if ((errr = snd_pcm_hw_params(m_pcm, hwParams))) if ((errr = snd_pcm_hw_params(m_pcm, hwParams)))
{ {