Remove some unused error codes.
[paraslash.git] / alsa_write.c
index 67ab59ad357127dbc3b065b73f1a250ee91b22b4..7a4b868d251f0ee780647f72457b1c3162549bf0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -16,6 +16,8 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <alsa/asoundlib.h>
+#include <sys/time.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "fd.h"
@@ -23,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"
 
@@ -39,7 +43,7 @@ struct private_alsa_write_data {
        /** 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.
@@ -50,6 +54,7 @@ struct private_alsa_write_data {
         * decoder of the writer node group.
         */
        unsigned channels;
+       struct timeval drain_barrier;
 };
 
 /* Install PCM software and hardware configuration. */
@@ -58,10 +63,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)
@@ -93,22 +99,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;
@@ -121,42 +127,31 @@ 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)
 {
-       struct alsa_write_args_info *conf = wn->conf;
-       struct writer_node_group *wng = wn->wng;
-       struct private_alsa_write_data *pad = para_calloc(sizeof(*pad));
-
-       wn->private_data = pad;
-       if (!conf->samplerate_given && wng->samplerate)
-               pad->samplerate = *wng->samplerate;
-       else
-               pad->samplerate = conf->samplerate_arg;
-       if (!conf->channels_given && wng->channels)
-               pad->channels = *wng->channels;
-       else
-               pad->channels = conf->channels_arg;
-       PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels, pad->samplerate);
+       wn->private_data = para_calloc(sizeof(struct private_alsa_write_data));
        return 1;
 }
 
-static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
+static void alsa_write_pre_select(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 writer_node_group *wng = wn->wng;
        struct timeval tv;
        snd_pcm_sframes_t avail, underrun;
+       int ret;
 
        if (!pad->handle)
-               return 1;
-       if (*wng->loaded - wn->written < pad->bytes_per_frame)
-               return 1;
+               return;
+       ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
+       if (ret < 0)
+               sched_request_timeout_ms(20, s);
+       if (ret <= 0)
+               return;
        /*
         * Data is available to be written to the alsa handle.  Compute number
         * of milliseconds until next buffer underrun would occur.
@@ -178,49 +173,6 @@ 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;
-       return 1;
-}
-
-static int alsa_write_post_select(__a_unused struct sched *s,
-               struct writer_node *wn)
-{
-       struct private_alsa_write_data *pad = wn->private_data;
-       struct writer_node_group *wng = wn->wng;
-       size_t bytes = *wng->loaded - wn->written;
-       unsigned char *data = (unsigned char*)*wng->bufp + wn->written;
-       snd_pcm_sframes_t ret, frames, avail;
-
-       if (*wng->input_error < 0 && (!pad->handle || bytes < pad->bytes_per_frame)) {
-               wn->written = *wng->loaded;
-               return *wng->input_error;
-       }
-       if (!bytes) /* no data available */
-               return 0;
-       if (!pad->handle) {
-               int err = alsa_init(pad, wn->conf);
-               if (err < 0)
-                       return err;
-       }
-       frames = bytes / pad->bytes_per_frame;
-       if (!frames) /* less than a single frame available */
-               return 0;
-       avail = snd_pcm_avail_update(pad->handle);
-       if (avail <= 0)
-               return 0;
-       frames = PARA_MIN(frames, avail);
-       ret = snd_pcm_writei(pad->handle, data, frames);
-       if (ret >= 0) {
-               wn->written += ret * pad->bytes_per_frame;
-               return 1;
-       }
-       PARA_WARNING_LOG("%s\n", snd_strerror(-ret));
-       if (ret == -EPIPE) {
-               snd_pcm_prepare(pad->handle);
-               return 0;
-       }
-       if (ret == -EAGAIN)
-               return 0;
-       return -E_ALSA_WRITE;
 }
 
 static void alsa_close(struct writer_node *wn)
@@ -229,6 +181,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();
@@ -236,6 +193,84 @@ static void alsa_close(struct writer_node *wn)
        free(pad);
 }
 
+static void alsa_write_post_select(__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;
+       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 */
+               if (pad->drain_barrier.tv_sec == 0) {
+                       PARA_DEBUG_LOG("waiting for device to drain\n");
+                       tv_add(now, &(struct timeval)EMBRACE(0, 200 * 1000),
+                               &pad->drain_barrier);
+                       return;
+               }
+               if (tv_diff(now, &pad->drain_barrier, NULL) > 0)
+                       goto err;
+               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 = 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) {
+               PARA_WARNING_LOG("underrun (tried to write %zu bytes)\n", bytes);
+               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;
@@ -253,12 +288,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 struct \ref writer.
  */
 void alsa_write_init(struct writer *w)
 {
@@ -271,6 +311,7 @@ void alsa_write_init(struct writer *w)
        w->post_select = alsa_write_post_select;
        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