/*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
{
snd_pcm_hw_params_t *hwparams;
snd_pcm_sw_params_t *swparams;
- snd_pcm_uframes_t buffer_size, xfer_align, start_threshold,
- stop_threshold;
+ snd_pcm_uframes_t buffer_size, start_threshold, stop_threshold;
int err;
snd_pcm_info_t *info;
snd_pcm_uframes_t period_size;
if (period_size == buffer_size)
return -E_BAD_PERIOD;
snd_pcm_sw_params_current(pad->handle, swparams);
- err = snd_pcm_sw_params_get_xfer_align(swparams, &xfer_align);
- if (err < 0 || !xfer_align)
- return -E_GET_XFER;
snd_pcm_sw_params_set_avail_min(pad->handle, swparams, period_size);
- /* round to closest transfer boundary */
- start_threshold = (buffer_size / xfer_align) * xfer_align;
- if (start_threshold < 1)
+ if (buffer_size < 1)
start_threshold = 1;
+ else
+ start_threshold = buffer_size;
if (snd_pcm_sw_params_set_start_threshold(pad->handle, swparams,
start_threshold) < 0)
return -E_START_THRESHOLD;
if (snd_pcm_sw_params_set_stop_threshold(pad->handle, swparams,
stop_threshold) < 0)
return -E_STOP_THRESHOLD;
- if (snd_pcm_sw_params_set_xfer_align(pad->handle, swparams,
- xfer_align) < 0)
- return -E_SET_XFER;
if (snd_pcm_sw_params(pad->handle, swparams) < 0)
return -E_SW_PARAMS;
pad->bytes_per_frame = snd_pcm_format_physical_width(FORMAT)
// PARA_INFO_LOG("%zd frames\n", frames);
if (!frames) {
- if (*wng->input_eof)
+ if (*wng->input_error)
wn->written = *wng->loaded;
return 1;
}
snd_pcm_prepare(pad->handle);
return 1;
}
- if (ret < 0) {
+ if (ret < 0 && ret != -EAGAIN) {
PARA_WARNING_LOG("alsa error (%zu frames, ret = %d\n",
frames, (int)ret);
return -E_ALSA_WRITE;
}
- ms2tv(pad->buffer_time / 4000, &tv);
-// ms2tv(1, &tv);
+ if (ret == -EAGAIN) { /* try again in 5ms */
+ PARA_WARNING_LOG("EAGAIN\n");
+ ms2tv(5, &tv);
+ } else {
+ wn->written += ret * pad->bytes_per_frame;
+ ms2tv(pad->buffer_time / 4000, &tv);
+ }
tv_add(now, &tv, &pad->next_chunk);
- wn->written += ret * pad->bytes_per_frame;
return 1;
}