X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=75fe6fae90bb6282b199ef3a659576ad152f0c42;hp=53c973844f6708604a5a58dbadf48a7abbe4329c;hb=49c897ce4cffb9ab355540043cd85d22d9a78299;hpb=8c5c975d5e8f209919283373793c2751a719699b diff --git a/alsa_write.c b/alsa_write.c index 53c97384..75fe6fae 100644 --- a/alsa_write.c +++ b/alsa_write.c @@ -12,9 +12,12 @@ * based on the vplay program by Michael Beck. */ +#include #include #include #include +#include +#include #include "para.h" #include "fd.h" @@ -22,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" @@ -34,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. @@ -57,10 +62,11 @@ 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; + 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) @@ -92,22 +98,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; @@ -120,13 +126,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; @@ -145,6 +149,20 @@ 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)); + + 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; @@ -154,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, BTR_NT_LEAF); + if (ret == 0) + return 1; + if (ret < 0) { + sched_request_timeout_ms(20, s); + return 42; + } + } 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. @@ -177,9 +205,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); + 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) { @@ -212,11 +264,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; @@ -228,6 +281,11 @@ 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(); @@ -235,6 +293,81 @@ 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; + 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, 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; + /* defaults */ + pad->samplerate = conf->samplerate_arg; + pad->channels = conf->channels_arg; + if (!conf->samplerate_given) { /* config option trumps btr_exec */ + int32_t rate; + if (get_btr_samplerate(btrn, &rate) >= 0) + pad->samplerate = rate; + } + if (!conf->channels_given) { + int32_t ch; + if (get_btr_channels(btrn, &ch) >= 0) + 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; + 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; + } + if (frames == -EAGAIN) + return; + PARA_WARNING_LOG("%s\n", snd_strerror(-frames)); + ret = -E_ALSA_WRITE; +err: + assert(ret < 0); + btr_remove_node(btrn); + t->error = ret; +} + __malloc static void *alsa_parse_config(const char *options) { int ret; @@ -252,12 +385,17 @@ err_out: 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) { @@ -267,9 +405,12 @@ 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->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