/*
- * Copyright (C) 2005-2007 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 "ggo.h"
#include "write.h"
-
-#include <alsa/asoundlib.h>
-
#include "alsa_write.cmdline.h"
#include "error.h"
/**
* 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
{
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;
struct private_alsa_write_data *pad = para_calloc(sizeof(struct
private_alsa_write_data));
pad->channels = conf->channels_arg;
PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels, pad->samplerate);
w->private_data = pad;
- snd_pcm_info_alloca(&info);
err = snd_pcm_open(&pad->handle, conf->device_arg,
SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
if (err < 0)
return -E_PCM_OPEN;
- if ((err = snd_pcm_info(pad->handle, info)) < 0)
- return -E_SND_PCM_INFO;
snd_pcm_hw_params_alloca(&hwparams);
snd_pcm_sw_params_alloca(&swparams);
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;
+ PARA_WARNING_LOG("unable to install sw params\n");
pad->bytes_per_frame = snd_pcm_format_physical_width(FORMAT)
* pad->channels / 8;
+ PARA_INFO_LOG("bytes per frame: %zu\n", pad->bytes_per_frame);
if (snd_pcm_nonblock(pad->handle, 1))
- PARA_ERROR_LOG("%s\n", "failed to set nonblock mode");
- return period_size * pad->bytes_per_frame;
+ PARA_ERROR_LOG("failed to set nonblock mode\n");
+ tv_add(now, &(struct timeval ){0, 100 * 1000}, &pad->next_chunk);
+ return 1;
}
static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
// 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);
- tv_add(now, &tv, &pad->next_chunk);
- wn->written += ret * pad->bytes_per_frame;
+ if (ret == -EAGAIN)
+ PARA_DEBUG_LOG("EAGAIN\n");
+ else
+ wn->written += ret * pad->bytes_per_frame;
+ if (ret == frames) /* we wrote everything, try again immediately */
+ pad->next_chunk = *now;
+ else {
+ ms2tv(pad->buffer_time / pad->bytes_per_frame / 1000, &tv);
+ tv_add(now, &tv, &pad->next_chunk);
+ }
return 1;
}
__malloc static void *alsa_parse_config(const char *options)
{
+ int ret;
struct alsa_write_args_info *conf
= para_calloc(sizeof(struct alsa_write_args_info));
+
PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
- int ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
+ ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
if (ret)
goto err_out;
PARA_INFO_LOG("help given: %d\n", conf->help_given);
*/
void alsa_write_init(struct writer *w)
{
+ struct alsa_write_args_info dummy;
+
+ alsa_cmdline_parser_init(&dummy);
w->open = alsa_open;
w->close = alsa_close;
w->pre_select = alsa_write_pre_select;
w->post_select = alsa_write_post_select;
w->parse_config = alsa_parse_config;
w->shutdown = NULL; /* nothing to do */
+ w->help = (struct ggo_help) {
+ .short_help = alsa_write_args_info_help,
+ .detailed_help = alsa_write_args_info_detailed_help
+ };
}
projects / paraslash.git / blobdiff