X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=67c845d3957c6cde30929b2b045569097a38941d;hp=9d99c8e91af6c4c78e402f9efde4ce00e40cb785;hb=d0f36435b0f81368a778fda33f3a7df86830f5ac;hpb=fae6ed3cc6d240eefcc111bdd04f637e3cda5dd0 diff --git a/alsa_write.c b/alsa_write.c index 9d99c8e9..67c845d3 100644 --- a/alsa_write.c +++ b/alsa_write.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "para.h" #include "fd.h" @@ -24,7 +25,9 @@ #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" @@ -36,11 +39,11 @@ struct private_alsa_write_data { /** 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. @@ -59,7 +62,7 @@ static int alsa_init(struct private_alsa_write_data *pad, { 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; @@ -94,22 +97,22 @@ static int alsa_init(struct private_alsa_write_data *pad, 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; @@ -122,13 +125,11 @@ static int alsa_init(struct private_alsa_write_data *pad, 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; } /* 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; @@ -147,6 +148,21 @@ static int alsa_open(struct writer_node *wn) return 1; } +static int alsa_open_btr(struct writer_node *wn) +{ + struct private_alsa_write_data *pad = para_calloc(sizeof(*pad)); + + sprintf(wn->task.status, "alsa writer"); + wn->private_data = pad; + return 1; +} +static int alsa_open(struct writer_node *wn) +{ + if (wn->btrn) + return alsa_open_btr(wn); + return alsa_open_nobtr(wn); +} + static int alsa_write_pre_select(struct sched *s, struct writer_node *wn) { struct private_alsa_write_data *pad = wn->private_data; @@ -156,8 +172,18 @@ 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 (wn->btrn) { + int ret = btr_node_status(wn->btrn, wn->min_iqs); + if (ret == 0) + return 1; + if (ret < 0) { + underrun = 10; + goto timeout; + } + } 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. @@ -176,12 +202,20 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn) if (underrun < 50) underrun = 50; underrun -= 50; +timeout: 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); + alsa_write_pre_select(s, wn); +} + static void xrun(snd_pcm_t *handle) { snd_pcm_status_t *status; @@ -248,13 +282,117 @@ static void alsa_close(struct writer_node *wn) 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(); } + alsa_cmdline_parser_free(wn->conf); 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: + t->error = 0; + ret = btr_node_status(btrn, wn->min_iqs); + if (ret == 0) + return; + btr_merge(btrn, wn->min_iqs); + bytes = btr_next_buffer(btrn, &data); + if (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; + return; + } + if (!pad->handle) { + char *buf; + 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 */ + /* ask parent btr nodes */ + buf = NULL; + ret = btr_exec_up(btrn, "samplerate", &buf); + PARA_CRIT_LOG("ret: %d\n", ret); + if (ret >= 0) { + int32_t rate; + + ret = para_atoi32(buf, &rate); + free(buf); + if (ret < 0) /* should not happen */ + goto err; + pad->samplerate = rate; + } + } + if (!conf->channels_given) { + buf = NULL; + ret = btr_exec_up(btrn, "channels", &buf); + if (ret >= 0) { + int32_t ch; + + ret = para_atoi32(buf, &ch); + freep(&buf); + 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; + wn->min_iqs = pad->bytes_per_frame; + } + 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(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); + t->error = ret; +} + __malloc static void *alsa_parse_config(const char *options) { int ret; @@ -287,7 +425,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) {