/*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file alsa_write.c paraslash's alsa output plugin */
* based on the vplay program by Michael Beck.
*/
+#include <sys/types.h>
+#include <dirent.h>
+#include <alsa/asoundlib.h>
+
#include "para.h"
#include "fd.h"
#include "string.h"
#include "list.h"
#include "sched.h"
#include "write.h"
-
-#include <alsa/asoundlib.h>
-
#include "alsa_write.cmdline.h"
#include "error.h"
-
+/** always use 16 bit little endian */
#define FORMAT SND_PCM_FORMAT_S16_LE
/** data specific to the alsa writer */
struct timeval next_chunk;
/** the return value of snd_pcm_hw_params_get_buffer_time_max() */
unsigned buffer_time;
+ /**
+ * the samplerate given by command line option or the decoder
+ * of the writer node group
+ */
unsigned samplerate;
+ /**
+ * the number of channels, also given by command line option or the
+ * decoder of the writer node group
+ */
unsigned channels;
};
{
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)
static int alsa_write_post_select(__a_unused struct sched *s,
struct writer_node *wn)
{
- struct private_alsa__write_data *pad = wn->private_data;
+ struct private_alsa_write_data *pad = wn->private_data;
struct writer_node_group *wng = wn->wng;
size_t frames = (*wng->loaded - wn->written) / pad->bytes_per_frame;
snd_pcm_sframes_t ret;
// PARA_INFO_LOG("%zd frames\n", frames);
if (!frames) {
- if (*wng->input_eof)
+ if (*wng->input_error)
wn->written = *wng->loaded;
return 1;
}
return 1;
ret = snd_pcm_writei(pad->handle, data, frames);
if (ret == -EPIPE) {
- PARA_WARNING_LOG("%s", "EPIPE\n");
+ PARA_WARNING_LOG("EPIPE\n");
snd_pcm_prepare(pad->handle);
return 1;
}
- if (ret < 0) {
- PARA_WARNING_LOG("%s", "ALSA ERROR\n");
+ 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;
}
free(pad);
}
-__malloc void *alsa_parse_config(char *options)
+__malloc static void *alsa_parse_config(const char *options)
{
struct alsa_write_args_info *conf
= para_calloc(sizeof(struct alsa_write_args_info));
- PARA_INFO_LOG("options: %s, %d\n", options, strcspn(options, " \t"));
+ PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
int ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
if (ret)
goto err_out;
return NULL;
}
-/** the init function of the alsa writer */
+/**
+ * the init function of the alsa writer
+ *
+ * \param w pointer to the writer to initialize
+ *
+ * \sa struct writer
+ */
void alsa_write_init(struct writer *w)
{
w->open = alsa_open;
projects / paraslash.git / blobdiff