X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=e1c5ce312e6ce8f6af6d81c9070b5899e40f1398;hp=67ab59ad357127dbc3b065b73f1a250ee91b22b4;hb=cc2a6158eef6957769fd5739446916d3e5413ae1;hpb=5c07b5c17b25240495a0acee24ca6b03c8d81e72 diff --git a/alsa_write.c b/alsa_write.c index 67ab59ad..e1c5ce31 100644 --- a/alsa_write.c +++ b/alsa_write.c @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include "para.h" #include "fd.h" @@ -23,6 +25,7 @@ #include "list.h" #include "sched.h" #include "ggo.h" +#include "buffer_tree.h" #include "write.h" #include "alsa_write.cmdline.h" #include "error.h" @@ -127,7 +130,7 @@ static int alsa_init(struct private_alsa_write_data *pad, } /* Open an instance of the alsa writer. */ -static int alsa_open(struct writer_node *wn) +static int alsa_open_nobtr(struct writer_node *wn) { struct alsa_write_args_info *conf = wn->conf; struct writer_node_group *wng = wn->wng; @@ -146,8 +149,66 @@ static int alsa_open(struct writer_node *wn) 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; +} +static int alsa_open(struct writer_node *wn) +{ + struct alsa_write_args_info *conf = wn->conf; + + if (conf->buffer_tree_given) + return alsa_open_btr(wn); + else + 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; @@ -155,8 +216,14 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn) if (!pad->handle) return 1; - if (*wng->loaded - wn->written < pad->bytes_per_frame) - return 1; + if (conf->buffer_tree_given) { + size_t sz = btr_get_input_queue_size(wn->btrn); + if (sz < pad->bytes_per_frame) + return 1; + } else { + if (*wng->loaded - wn->written < pad->bytes_per_frame) + return 1; + } /* * Data is available to be written to the alsa handle. Compute number * of milliseconds until next buffer underrun would occur. @@ -178,9 +245,33 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn) ms2tv(underrun, &tv); if (tv_diff(&s->timeout, &tv, NULL) > 0) s->timeout = tv; + //PARA_CRIT_LOG("timout: %lu\n", tv2ms(&s->timeout)); return 1; } +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); +} + +static void xrun(snd_pcm_t *handle) +{ + snd_pcm_status_t *status; + int ret; + struct timeval tv, diff; + + snd_pcm_status_alloca(&status); + ret = snd_pcm_status(handle, status); + if (ret < 0) + return; + if (snd_pcm_status_get_state(status) != SND_PCM_STATE_XRUN) + return; + snd_pcm_status_get_trigger_tstamp(status, &tv); + tv_diff(now, &tv, &diff); + PARA_WARNING_LOG("underrun: %lums\n", tv2ms(&diff)); +} + static int alsa_write_post_select(__a_unused struct sched *s, struct writer_node *wn) { @@ -213,11 +304,12 @@ static int alsa_write_post_select(__a_unused struct sched *s, wn->written += ret * pad->bytes_per_frame; return 1; } - PARA_WARNING_LOG("%s\n", snd_strerror(-ret)); if (ret == -EPIPE) { + xrun(pad->handle); snd_pcm_prepare(pad->handle); return 0; } + PARA_WARNING_LOG("%s\n", snd_strerror(-ret)); if (ret == -EAGAIN) return 0; return -E_ALSA_WRITE; @@ -236,6 +328,69 @@ static void alsa_close(struct writer_node *wn) 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; + 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; + if (!pad->handle) { + if (bytes == 0) /* no data available */ + return; + PARA_CRIT_LOG("alsa init\n"); + 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); + } + frames = bytes / pad->bytes_per_frame; + avail = snd_pcm_avail_update(pad->handle); + if (avail <= 0) + return; + frames = PARA_MIN(frames, avail); + //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); + goto again; + } + if (frames == -EPIPE) { + xrun(pad->handle); + snd_pcm_prepare(pad->handle); + return; + } + PARA_WARNING_LOG("%s\n", snd_strerror(-frames)); + if (frames == -EAGAIN) + return; + ret = -E_ALSA_WRITE; +err: + assert(ret < 0); + alsa_close(wn); + btr_del_node(wn->btrn); + wn->btrn = NULL; + t->error = ret; +} + __malloc static void *alsa_parse_config(const char *options) { int ret; @@ -268,7 +423,9 @@ void alsa_write_init(struct writer *w) w->open = alsa_open; w->close = alsa_close; w->pre_select = alsa_write_pre_select; + w->pre_select_btr = alsa_write_pre_select_btr; w->post_select = alsa_write_post_select; + w->post_select_btr = alsa_write_post_select_btr; w->parse_config = alsa_parse_config; w->shutdown = NULL; /* nothing to do */ w->help = (struct ggo_help) {