Commit cfc6a9bf authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

ALSA: refine buffer / period parameters

We really need at least two periods: with only one period we could hit
a buffer underrun after a buffer overrun (a REALLY dumb failure...).
Then we have a favorite buffer size. Then we pick the least number of
periods to reduce wakeups (but at least 2 anyway).
(cherry picked from commit 2dd544eb847556972c6bdd49e1eb0c281122f448)
parent d31ca17b
...@@ -437,26 +437,32 @@ static int Open (vlc_object_t *obj) ...@@ -437,26 +437,32 @@ static int Open (vlc_object_t *obj)
msg_Dbg (aout, "resampling from %d Hz to %d Hz", msg_Dbg (aout, "resampling from %d Hz to %d Hz",
aout->format.i_rate, rate); aout->format.i_rate, rate);
/* Set number of periods (at least two) */
param = 2;
val = snd_pcm_hw_params_set_periods_min (pcm, hw, &param, NULL);
if (val)
{
msg_Err (aout, "cannot set minimum of %u periods: %s", param,
snd_strerror (val));
goto error;
}
/* Set buffer size */ /* Set buffer size */
param = AOUT_MAX_ADVANCE_TIME; param = AOUT_MAX_ADVANCE_TIME;
val = snd_pcm_hw_params_set_buffer_time_near (pcm, hw, &param, NULL); val = snd_pcm_hw_params_set_buffer_time_near (pcm, hw, &param, NULL);
if (val) if (val)
msg_Warn (aout, "cannot set buffer duration near %u us: %s", {
param, snd_strerror (val)); msg_Err (aout, "cannot set buffer duration near %u us: %s",
val = snd_pcm_hw_params_set_buffer_time_last (pcm, hw, &param, NULL); param, snd_strerror (val));
if (val) goto error;
msg_Warn (aout, "cannot set buffer duration: %s", snd_strerror (val)); }
/* Set number of periods (at least two) */
param = 2;
val = snd_pcm_hw_params_set_periods_min (pcm, hw, &param, NULL);
if (val)
msg_Warn (aout, "cannot set minimum of %u periods: %s", param,
snd_strerror (val));
val = snd_pcm_hw_params_set_periods_first (pcm, hw, &param, NULL); val = snd_pcm_hw_params_set_periods_first (pcm, hw, &param, NULL);
if (val) if (val)
msg_Warn (aout, "cannot set periods count near %u: %s", param, {
snd_strerror (val)); msg_Err (aout, "cannot select periods: %s", snd_strerror (val));
goto error;
}
/* Commit hardware parameters */ /* Commit hardware parameters */
val = snd_pcm_hw_params (pcm, hw); val = snd_pcm_hw_params (pcm, hw);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment