X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=3428def83076b9f8b89fc4c1e41bd0c921e54fbb;hp=7362c42bdaefe57ae485fa7ec202212eaa6cfa12;hb=2ef39ae4d1e6b0d95991d2b980621fb152211444;hpb=7041d795b5af3661daf332ef13c50517b5b9716b diff --git a/alsa_write.c b/alsa_write.c index 7362c42b..3428def8 100644 --- a/alsa_write.c +++ b/alsa_write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2010 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -31,9 +31,6 @@ #include "alsa_write.cmdline.h" #include "error.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 */ @@ -45,17 +42,32 @@ struct private_alsa_write_data { /* Number of frames that fit into the buffer. */ 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) @@ -79,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); @@ -109,7 +122,7 @@ static int alsa_init(struct private_alsa_write_data *pad, start_threshold = 1; else start_threshold = PARA_MIN(pad->buffer_frames, - (snd_pcm_uframes_t)pad->samplerate); + (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; @@ -119,7 +132,7 @@ static int alsa_init(struct private_alsa_write_data *pad, 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; @@ -130,27 +143,23 @@ 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 void alsa_open(struct writer_node *wn) { wn->private_data = para_calloc(sizeof(struct private_alsa_write_data)); - return 1; } -static void alsa_write_pre_select_btr(struct sched *s, struct task *t) +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 timeval tv; snd_pcm_sframes_t avail, underrun; - int ret; + int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF); - if (!pad->handle) - 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) + if (ret == 0) return; + if (ret < 0 || !pad->handle) + 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. @@ -170,25 +179,7 @@ static void alsa_write_pre_select_btr(struct sched *s, struct task *t) underrun = 50; underrun -= 50; ms2tv(underrun, &tv); - if (tv_diff(&s->timeout, &tv, NULL) > 0) - s->timeout = tv; -} - -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)); + sched_request_timeout(&tv, s); } static void alsa_close(struct writer_node *wn) @@ -209,7 +200,7 @@ static void alsa_close(struct writer_node *wn) 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); @@ -217,7 +208,7 @@ static void alsa_write_post_select_btr(__a_unused struct sched *s, 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: @@ -233,34 +224,35 @@ again: if (!pad->handle) goto err; /* wait until pending frames are played */ - avail = snd_pcm_avail_update(pad->handle); - if (avail + 1000 > pad->buffer_frames) + 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; - PARA_DEBUG_LOG("waiting for device to drain\n"); return; } if (!pad->handle) { - struct alsa_write_args_info *conf = wn->conf; + int32_t val; + 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); + 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; wn->min_iqs = pad->bytes_per_frame; + goto again; } frames = bytes / pad->bytes_per_frame; frames = snd_pcm_writei(pad->handle, data, frames); @@ -269,7 +261,7 @@ again: 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; } @@ -283,21 +275,14 @@ err: t->error = ret; } -__malloc static void *alsa_parse_config(const char *options) +__malloc static void *alsa_parse_config_or_die(const char *options) { - int ret; - struct alsa_write_args_info *conf - = para_calloc(sizeof(struct alsa_write_args_info)); + struct alsa_write_args_info *conf = para_calloc(sizeof(*conf)); 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); + /* exits on errors */ + alsa_cmdline_parser_string(options, conf, "alsa_write"); return conf; -err_out: - free(conf); - return NULL; } static void alsa_free_config(void *conf) @@ -310,7 +295,7 @@ static void alsa_free_config(void *conf) * * \param w Pointer to the writer to initialize. * - * \sa \ref struct writer. + * \sa struct \ref writer. */ void alsa_write_init(struct writer *w) { @@ -319,9 +304,9 @@ void alsa_write_init(struct writer *w) alsa_cmdline_parser_init(&dummy); w->open = alsa_open; w->close = alsa_close; - w->pre_select_btr = alsa_write_pre_select_btr; - w->post_select_btr = alsa_write_post_select_btr; - w->parse_config = alsa_parse_config; + w->pre_select = alsa_write_pre_select; + w->post_select = alsa_write_post_select; + 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) {