Kill afhi->header_offset.
[paraslash.git] / alsa_write.c
index 030a5ec..d649341 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 #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
 
 /** Data specific to the alsa writer. */
 struct private_alsa_write_data {
        /** The alsa handle */
        snd_pcm_t *handle;
-       /** Determined and set by alsa_open(). */
+       /** Determined and set by alsa_init(). */
        int bytes_per_frame;
        /** 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
+        * The sample rate given by command line option or the decoder
         * of the writer node group.
         */
-       unsigned samplerate;
+       unsigned sample_rate;
+       snd_pcm_format_t sample_format;
        /**
         * The number of channels, given by command line option or the
         * decoder of the writer node group.
         */
        unsigned channels;
+       struct timeval drain_barrier;
 };
 
+static snd_pcm_format_t get_alsa_pcm_format(enum sample_format sf)
+{
+       switch (sf) {
+       case SF_S8: return SND_PCM_FORMAT_S8;
+       case SF_U8: return SND_PCM_FORMAT_U8;
+       case SF_S16_LE: return SND_PCM_FORMAT_S16_LE;
+       case SF_S16_BE: return SND_PCM_FORMAT_S16_BE;
+       case SF_U16_LE: return SND_PCM_FORMAT_U16_LE;
+       case SF_U16_BE: return SND_PCM_FORMAT_U16_BE;
+       default: return SND_PCM_FORMAT_S16_LE;
+       }
+}
+
 /* Install PCM software and hardware configuration. */
 static int alsa_init(struct private_alsa_write_data *pad,
                struct alsa_write_args_info *conf)
 {
        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)
@@ -77,13 +91,14 @@ static int alsa_init(struct private_alsa_write_data *pad,
        if (snd_pcm_hw_params_set_access(pad->handle, hwparams,
                        SND_PCM_ACCESS_RW_INTERLEAVED) < 0)
                return -E_ACCESS_TYPE;
-       if (snd_pcm_hw_params_set_format(pad->handle, hwparams, FORMAT) < 0)
+       if (snd_pcm_hw_params_set_format(pad->handle, hwparams,
+                       pad->sample_format) < 0)
                return -E_SAMPLE_FORMAT;
        if (snd_pcm_hw_params_set_channels(pad->handle, hwparams,
                        pad->channels) < 0)
                return -E_CHANNEL_COUNT;
        if (snd_pcm_hw_params_set_rate_near(pad->handle, hwparams,
-                       &pad->samplerate, NULL) < 0)
+                       &pad->sample_rate, NULL) < 0)
                return -E_SET_RATE;
        err = snd_pcm_hw_params_get_buffer_time_max(hwparams,
                &pad->buffer_time, NULL);
@@ -96,135 +111,49 @@ 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,
-                       (snd_pcm_uframes_t)pad->samplerate);
+               start_threshold = PARA_MIN(pad->buffer_frames,
+                       (snd_pcm_uframes_t)pad->sample_rate);
        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;
        if (snd_pcm_sw_params(pad->handle, swparams) < 0)
                PARA_WARNING_LOG("unable to install sw params\n");
-       pad->bytes_per_frame = snd_pcm_format_physical_width(FORMAT)
+       pad->bytes_per_frame = snd_pcm_format_physical_width(pad->sample_format)
                * pad->channels / 8;
        if (pad->bytes_per_frame <= 0)
                return -E_PHYSICAL_WIDTH;
        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_nobtr(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);
        return 1;
 }
 
-static int alsa_open_btr(struct writer_node *wn)
+static void alsa_write_pre_select(struct sched *s, struct task *t)
 {
-       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 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 = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
-       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;
-       } else {
-               if (*wng->loaded - wn->written < pad->bytes_per_frame)
-                       return 1;
-       }
+       if (ret == 0)
+               return;
+       if (ret < 0 || !pad)
+               return sched_min_delay(s);
        /*
         * Data is available to be written to the alsa handle.  Compute number
         * of milliseconds until next buffer underrun would occur.
@@ -244,190 +173,137 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
                underrun = 50;
        underrun -= 50;
        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);
+       sched_request_timeout(&tv, s);
 }
 
-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)
+static void alsa_close(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;
+       PARA_INFO_LOG("closing writer node %p\n", wn);
 
-       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;
-       }
-       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;
+       if (!pad)
+               return;
+       /*
+        * 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,
+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, avail;
+       snd_pcm_sframes_t frames;
        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) {
+       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 < wn->min_iqs) { /* eof */
+               assert(btr_no_parent(btrn));
+               ret = -E_ALSA_EOF;
+               if (!pad)
+                       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) {
+               int32_t val;
+
+               pad = para_calloc(sizeof(*pad));
+               wn->private_data = pad;
                if (bytes == 0) /* no data available */
                        return;
-               PARA_CRIT_LOG("alsa init\n");
+               get_btr_sample_rate(btrn, &val);
+               pad->sample_rate = val;
+               get_btr_channels(btrn, &val);
+               pad->channels = val;
+               get_btr_sample_format(btrn, &val);
+               pad->sample_format = get_alsa_pcm_format(val);
+
+               PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels,
+                       pad->sample_rate);
                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;
+               goto again;
        }
        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);
+               btr_consume(btrn, frames * pad->bytes_per_frame);
                goto again;
        }
        if (frames == -EPIPE) {
-               xrun(pad->handle);
+               PARA_WARNING_LOG("underrun (tried to write %zu bytes)\n", bytes);
                snd_pcm_prepare(pad->handle);
                return;
        }
-       PARA_WARNING_LOG("%s\n", snd_strerror(-frames));
        if (frames == -EAGAIN)
                return;
+       PARA_WARNING_LOG("%s\n", snd_strerror(-frames));
        ret = -E_ALSA_WRITE;
 err:
        assert(ret < 0);
-       btr_del_node(wn->btrn);
-       wn->btrn = NULL;
+       btr_remove_node(btrn);
        t->error = ret;
 }
 
-static void alsa_close(struct writer_node *wn)
+__malloc static void *alsa_parse_config_or_die(const char *options)
 {
-       struct private_alsa_write_data *pad = wn->private_data;
-       PARA_INFO_LOG("closing writer node %p\n", wn);
+       struct alsa_write_args_info *conf = para_calloc(sizeof(*conf));
 
-       if (pad->handle) {
-               snd_pcm_drain(pad->handle);
-               snd_pcm_close(pad->handle);
-               snd_config_update_free_global();
-       }
-       free(pad);
+       PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
+       /* exits on errors */
+       alsa_cmdline_parser_string(options, conf, "alsa_write");
+       return conf;
 }
 
-__malloc static void *alsa_parse_config(const char *options)
+static void alsa_free_config(void *conf)
 {
-       int ret;
-       struct alsa_write_args_info *conf
-               = para_calloc(sizeof(struct alsa_write_args_info));
-
-       PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
-       ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
-       if (ret)
-               goto err_out;
-       PARA_INFO_LOG("help given: %d\n", conf->help_given);
-       return conf;
-err_out:
-       free(conf);
-       return NULL;
+       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)
 {
        struct alsa_write_args_info dummy;
 
        alsa_cmdline_parser_init(&dummy);
-       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->parse_config_or_die = alsa_parse_config_or_die;
        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