#include "list.h"
#include "sched.h"
#include "ggo.h"
+#include "buffer_tree.h"
#include "write.h"
+#include "write_common.h"
#include "alsa_write.cmdline.h"
#include "error.h"
-#include "buffer_tree.h"
/** always use 16 bit little endian */
#define FORMAT SND_PCM_FORMAT_S16_LE
/** The alsa handle */
snd_pcm_t *handle;
/** Determined and set by alsa_open(). */
- int bytes_per_frame;
+ int bytes_per_frame; /* TODO: Kill this after btr switch */
/** The approximate maximum buffer duration in us. */
unsigned buffer_time;
/* Number of frames that fit into the buffer. */
- unsigned buffer_frames;
+ snd_pcm_uframes_t buffer_frames;
/**
* The samplerate given by command line option or the decoder
* of the writer node group.
{
snd_pcm_hw_params_t *hwparams;
snd_pcm_sw_params_t *swparams;
- snd_pcm_uframes_t buffer_size, start_threshold, stop_threshold;
+ snd_pcm_uframes_t start_threshold, stop_threshold;
snd_pcm_uframes_t period_size;
int err;
+ PARA_INFO_LOG("opening %s\n", conf->device_arg);
err = snd_pcm_open(&pad->handle, conf->device_arg,
SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
if (err < 0)
if (snd_pcm_hw_params(pad->handle, hwparams) < 0)
return -E_HW_PARAMS;
snd_pcm_hw_params_get_period_size(hwparams, &period_size, NULL);
- snd_pcm_hw_params_get_buffer_size(hwparams, &buffer_size);
- PARA_INFO_LOG("buffer size: %lu, period_size: %lu\n", buffer_size,
+ snd_pcm_hw_params_get_buffer_size(hwparams, &pad->buffer_frames);
+ PARA_INFO_LOG("buffer size: %lu, period_size: %lu\n", pad->buffer_frames,
period_size);
- if (period_size == buffer_size)
+ if (period_size == pad->buffer_frames)
return -E_BAD_PERIOD;
snd_pcm_sw_params_current(pad->handle, swparams);
snd_pcm_sw_params_set_avail_min(pad->handle, swparams, period_size);
- if (buffer_size < 1)
+ if (pad->buffer_frames < 1)
start_threshold = 1;
else
- start_threshold = PARA_MIN(buffer_size,
+ start_threshold = PARA_MIN(pad->buffer_frames,
(snd_pcm_uframes_t)pad->samplerate);
if (snd_pcm_sw_params_set_start_threshold(pad->handle, swparams,
start_threshold) < 0)
return -E_START_THRESHOLD;
- stop_threshold = buffer_size;
+ stop_threshold = pad->buffer_frames;
if (snd_pcm_sw_params_set_stop_threshold(pad->handle, swparams,
stop_threshold) < 0)
return -E_STOP_THRESHOLD;
PARA_INFO_LOG("bytes per frame: %d\n", pad->bytes_per_frame);
if (snd_pcm_nonblock(pad->handle, 1))
PARA_ERROR_LOG("failed to set nonblock mode\n");
- pad->buffer_frames = 1000 * pad->buffer_time / pad->samplerate;
- PARA_INFO_LOG("max buffered frames: %d\n", pad->buffer_frames);
return 1;
}
static int alsa_open_btr(struct writer_node *wn)
{
- struct alsa_write_args_info *conf = wn->conf;
struct private_alsa_write_data *pad = para_calloc(sizeof(*pad));
- int ret;
- char *buf = NULL;
- sprintf(wn->task.status, "alsa writer");
wn->private_data = pad;
-
- /* defaults */
- pad->samplerate = conf->samplerate_arg;
- pad->channels = conf->channels_arg;
-
- if (!conf->samplerate_given) { /* config option trumps btr_exec */
- /* ask parent btr nodes */
- ret = btr_exec_up(wn->btrn, "samplerate", &buf);
- if (ret >= 0) {
- int32_t rate;
- ret = para_atoi32(buf, &rate);
- if (ret < 0) /* should not happen */
- goto out;
- pad->samplerate = rate;
- }
- freep(&buf);
- }
-
- if (!conf->channels_given) {
- ret = btr_exec_up(wn->btrn, "channels", &buf);
- if (ret >= 0) {
- int32_t ch;
- ret = para_atoi32(buf, &ch);
- if (ret < 0)
- goto out;
- pad->channels = ch;
- }
- freep(&buf);
- }
- PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels, pad->samplerate);
- ret = 1;
-out:
- freep(&buf);
- if (ret < 0)
- free(pad);
- return ret;
+ return 1;
}
static int alsa_open(struct writer_node *wn)
{
- struct alsa_write_args_info *conf = wn->conf;
-
- if (conf->buffer_tree_given)
+ if (wn->btrn)
return alsa_open_btr(wn);
- else
- return alsa_open_nobtr(wn);
-
+ return alsa_open_nobtr(wn);
}
static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
{
- struct alsa_write_args_info *conf = wn->conf;
struct private_alsa_write_data *pad = wn->private_data;
struct writer_node_group *wng = wn->wng;
struct timeval tv;
if (!pad->handle)
return 1;
- if (conf->buffer_tree_given) {
- size_t sz = btr_get_input_queue_size(wn->btrn);
- //PARA_CRIT_LOG("input queue: %zu\n", sz);
- //if (sz < pad->bytes_per_frame)
- // return 1;
+ if (wn->btrn) {
+ int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
+ if (ret == 0)
+ return 1;
+ if (ret < 0) {
+ underrun = 10;
+ goto timeout;
+ }
} else {
if (*wng->loaded - wn->written < pad->bytes_per_frame)
return 1;
if (underrun < 50)
underrun = 50;
underrun -= 50;
+timeout:
ms2tv(underrun, &tv);
if (tv_diff(&s->timeout, &tv, NULL) > 0)
s->timeout = tv;
static void alsa_write_pre_select_btr(struct sched *s, struct task *t)
{
struct writer_node *wn = container_of(t, struct writer_node, task);
- t->error = alsa_write_pre_select(s, wn);
+ alsa_write_pre_select(s, wn);
}
static void xrun(snd_pcm_t *handle)
return -E_ALSA_WRITE;
}
+static void alsa_close(struct writer_node *wn)
+{
+ struct private_alsa_write_data *pad = wn->private_data;
+ PARA_INFO_LOG("closing writer node %p\n", wn);
+
+ if (pad->handle) {
+ /*
+ * It's OK to have a blocking operation here because we already
+ * made sure that the PCM output buffer is (nearly) empty.
+ */
+ snd_pcm_nonblock(pad->handle, 0);
+ snd_pcm_drain(pad->handle);
+ snd_pcm_close(pad->handle);
+ snd_config_update_free_global();
+ }
+ free(pad);
+}
+
static void alsa_write_post_select_btr(__a_unused struct sched *s,
struct task *t)
{
struct writer_node *wn = container_of(t, struct writer_node, task);
struct private_alsa_write_data *pad = wn->private_data;
+ struct btr_node *btrn = wn->btrn;
char *data;
size_t bytes;
snd_pcm_sframes_t frames, avail;
int ret;
again:
- bytes = btr_next_buffer(wn->btrn, &data);
- //PARA_CRIT_LOG("have: %zu\n", bytes);
t->error = 0;
- ret = -E_ALSA_ORPHAN;
- if (btr_no_parent(wn->btrn) && (!pad->handle || bytes < pad->bytes_per_frame))
- goto err;
+ ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
+ if (ret == 0)
+ return;
+ btr_merge(btrn, wn->min_iqs);
+ bytes = btr_next_buffer(btrn, &data);
+ if (ret < 0 || bytes < pad->bytes_per_frame) { /* eof */
+ assert(btr_no_parent(btrn));
+ ret = -E_ALSA_EOF;
+ if (!pad->handle)
+ goto err;
+ /* wait until pending frames are played */
+ avail = snd_pcm_avail_update(pad->handle);
+ if (avail + 1000 > pad->buffer_frames)
+ goto err;
+ PARA_DEBUG_LOG("waiting for device to drain\n");
+ return;
+ }
if (!pad->handle) {
+ struct alsa_write_args_info *conf = wn->conf;
if (bytes == 0) /* no data available */
return;
- PARA_CRIT_LOG("alsa init\n");
+ /* defaults */
+ pad->samplerate = conf->samplerate_arg;
+ pad->channels = conf->channels_arg;
+ if (!conf->samplerate_given) { /* config option trumps btr_exec */
+ int32_t rate;
+ ret = get_btr_samplerate(btrn, &rate);
+ if (ret < 0)
+ goto err;
+ pad->samplerate = rate;
+ }
+ if (!conf->channels_given) {
+ int32_t ch;
+ ret = get_btr_channels(btrn, &ch);
+ if (ret < 0)
+ goto err;
+ pad->channels = ch;
+ }
+ PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels, pad->samplerate);
+ ret = 1;
ret = alsa_init(pad, wn->conf);
if (ret < 0)
goto err;
- }
- for (;;) {
- if (bytes == 0)
- return;
- if (bytes >= pad->bytes_per_frame)
- break;
- /* should not be possible to reach this */
- PARA_CRIT_LOG("dropping %zu byte buffer\n", bytes);
- btr_consume(wn->btrn, bytes);
- bytes = btr_next_buffer(wn->btrn, &data);
+ wn->min_iqs = pad->bytes_per_frame;
}
frames = bytes / pad->bytes_per_frame;
avail = snd_pcm_avail_update(pad->handle);
//PARA_CRIT_LOG("writing %ld frames\n", frames);
frames = snd_pcm_writei(pad->handle, data, frames);
if (frames >= 0) {
- btr_consume(wn->btrn, frames * pad->bytes_per_frame);
+ btr_consume(btrn, frames * pad->bytes_per_frame);
goto again;
}
if (frames == -EPIPE) {
ret = -E_ALSA_WRITE;
err:
assert(ret < 0);
- btr_del_node(wn->btrn);
- wn->btrn = NULL;
t->error = ret;
}
-static void alsa_close(struct writer_node *wn)
-{
- struct private_alsa_write_data *pad = wn->private_data;
- PARA_INFO_LOG("closing writer node %p\n", wn);
-
- if (pad->handle) {
- snd_pcm_drain(pad->handle);
- snd_pcm_close(pad->handle);
- snd_config_update_free_global();
- }
- free(pad);
-}
-
__malloc static void *alsa_parse_config(const char *options)
{
int ret;
return NULL;
}
+static void alsa_free_config(void *conf)
+{
+ alsa_cmdline_parser_free(conf);
+}
+
/**
- * the init function of the alsa writer
+ * The init function of the alsa writer.
*
- * \param w pointer to the writer to initialize
+ * \param w Pointer to the writer to initialize.
*
- * \sa struct writer
+ * \sa \ref struct writer.
*/
void alsa_write_init(struct writer *w)
{
w->post_select_btr = alsa_write_post_select_btr;
w->parse_config = alsa_parse_config;
w->shutdown = NULL; /* nothing to do */
+ w->free_config = alsa_free_config;
w->help = (struct ggo_help) {
.short_help = alsa_write_args_info_help,
.detailed_help = alsa_write_args_info_detailed_help
projects / paraslash.git / blobdiff