X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=0824640b9560d72a1eb886a355c3f07e5271681f;hp=a7539ba4623f5352d5216cb0b73688acba8d7db6;hb=aa4a8d9c0f08687618dfcf96bc0c553ef17fbc1d;hpb=43491f2e4c1a858ca439095b9f5d3215c7f42f03 diff --git a/alsa_write.c b/alsa_write.c index a7539ba4..0824640b 100644 --- a/alsa_write.c +++ b/alsa_write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Andre Noll + * Copyright (C) 2005-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -15,8 +15,6 @@ #include #include #include -#include -#include #include "para.h" #include "fd.h" @@ -36,10 +34,6 @@ struct private_alsa_write_data { snd_pcm_t *handle; /** 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. */ - snd_pcm_uframes_t buffer_frames; /** * The sample rate given by command line option or the decoder * of the writer node group. @@ -76,84 +70,122 @@ 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 start_threshold, stop_threshold; - snd_pcm_uframes_t period_size; - snd_output_t *log; - int err; + snd_pcm_uframes_t buffer_size, period_size; + snd_output_t *output_log; + unsigned buffer_time; + int ret; + const char *msg; PARA_INFO_LOG("opening %s\n", conf->device_arg); - err = snd_pcm_open(&pad->handle, conf->device_arg, + msg = "unable to open pcm"; + ret = snd_pcm_open(&pad->handle, conf->device_arg, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK); - if (err < 0) - return -E_PCM_OPEN; - + if (ret < 0) + goto fail; snd_pcm_hw_params_alloca(&hwparams); - snd_pcm_sw_params_alloca(&swparams); - if (snd_pcm_hw_params_any(pad->handle, hwparams) < 0) - return -E_BROKEN_CONF; - 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, - 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->sample_rate, NULL) < 0) - return -E_SET_RATE; - err = snd_pcm_hw_params_get_buffer_time_max(hwparams, - &pad->buffer_time, NULL); - if (err < 0 || !pad->buffer_time) - return -E_GET_BUFFER_TIME; - if (snd_pcm_hw_params_set_buffer_time_near(pad->handle, hwparams, - &pad->buffer_time, NULL) < 0) - return -E_SET_BUFFER_TIME; - if (snd_pcm_hw_params(pad->handle, hwparams) < 0) - return -E_HW_PARAMS; + msg = "Broken alsa configuration"; + ret = snd_pcm_hw_params_any(pad->handle, hwparams); + if (ret < 0) + goto fail; + msg = "access type not available"; + ret = snd_pcm_hw_params_set_access(pad->handle, hwparams, + SND_PCM_ACCESS_RW_INTERLEAVED); + if (ret < 0) + goto fail; + msg = "sample format not available"; + ret = snd_pcm_hw_params_set_format(pad->handle, hwparams, + pad->sample_format); + if (ret < 0) + goto fail; + msg = "channels count not available"; + ret = snd_pcm_hw_params_set_channels(pad->handle, hwparams, + pad->channels); + if (ret < 0) + goto fail; + msg = "could not set sample rate"; + ret = snd_pcm_hw_params_set_rate_near(pad->handle, hwparams, + &pad->sample_rate, NULL); + if (ret < 0) + goto fail; + msg = "unable to get buffer time"; + ret = snd_pcm_hw_params_get_buffer_time_max(hwparams, &buffer_time, + NULL); + if (ret < 0 || buffer_time == 0) + goto fail; + /* buffer at most 500 milliseconds */ + buffer_time = PARA_MIN(buffer_time, 500U * 1000U); + msg = "could not set buffer time"; + ret = snd_pcm_hw_params_set_buffer_time_near(pad->handle, hwparams, + &buffer_time, NULL); + if (ret < 0) + goto fail; + msg = "unable to install hw params"; + ret = snd_pcm_hw_params(pad->handle, hwparams); + if (ret < 0) + goto fail; snd_pcm_hw_params_get_period_size(hwparams, &period_size, NULL); - snd_pcm_hw_params_get_buffer_size(hwparams, &pad->buffer_frames); - if (period_size == pad->buffer_frames) - return -E_BAD_PERIOD; + snd_pcm_hw_params_get_buffer_size(hwparams, &buffer_size); + msg = "period size equals buffer size"; + if (period_size == buffer_size) + goto fail; + + /* software parameter setup */ + snd_pcm_sw_params_alloca(&swparams); snd_pcm_sw_params_current(pad->handle, swparams); snd_pcm_sw_params_set_avail_min(pad->handle, swparams, period_size); - if (pad->buffer_frames < 1) + if (buffer_size < 1) start_threshold = 1; else - start_threshold = PARA_MIN(pad->buffer_frames, + start_threshold = PARA_MIN(buffer_size, (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 = 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(pad->sample_format) - * pad->channels / 8; - if (pad->bytes_per_frame <= 0) - return -E_PHYSICAL_WIDTH; - if (snd_pcm_nonblock(pad->handle, 1)) - PARA_ERROR_LOG("failed to set nonblock mode\n"); - err = snd_output_buffer_open(&log); - if (err == 0) { - char *buf; + msg = "could not set start threshold"; + ret = snd_pcm_sw_params_set_start_threshold(pad->handle, swparams, + start_threshold); + if (ret < 0) + goto fail; + stop_threshold = buffer_size; + msg = "could not set stop threshold"; + ret = snd_pcm_sw_params_set_stop_threshold(pad->handle, swparams, + stop_threshold); + if (ret < 0) + goto fail; + msg = "unable to install sw params"; + ret = snd_pcm_sw_params(pad->handle, swparams); + if (ret < 0) + goto fail; + msg = "unable to determine bytes per frame"; + ret = snd_pcm_format_physical_width(pad->sample_format); + if (ret <= 0) + goto fail; + pad->bytes_per_frame = ret * pad->channels / 8; + msg = "failed to set alsa handle to nonblock mode"; + ret = snd_pcm_nonblock(pad->handle, 1); + if (ret < 0) + goto fail; + ret = snd_output_buffer_open(&output_log); + if (ret == 0) { + char *buf, *p; + size_t sz; PARA_INFO_LOG("dumping alsa configuration\n"); - snd_pcm_dump(pad->handle, log); - snd_output_buffer_string(log, &buf); - for (;;) { - char *p = strchr(buf, '\n'); - if (!p) /* omit last output line, it's empty */ + snd_pcm_dump(pad->handle, output_log); + sz = snd_output_buffer_string(output_log, &buf); + for (p = buf; p < buf + sz;) { + char *q = memchr(p, '\n', buf + sz - p); + if (!q) break; - *p = '\0'; - PARA_INFO_LOG("%s\n", buf); - buf = p + 1; + *q = '\0'; + PARA_INFO_LOG("%s\n", p); + p = q + 1; } - snd_output_close(log); + snd_output_close(output_log); } return 1; +fail: + if (ret < 0) + PARA_ERROR_LOG("%s: %s\n", msg, snd_strerror(-ret)); + else + PARA_ERROR_LOG("%s\n", msg); + return -E_ALSA; } static void alsa_write_pre_select(struct sched *s, struct task *t) @@ -177,8 +209,8 @@ static void alsa_write_pre_select(struct sched *s, struct task *t) } ret = snd_pcm_poll_descriptors(pad->handle, &pfd, 1); if (ret < 0) { - PARA_ERROR_LOG("%s\n", snd_strerror(-ret)); - t->error = -E_ALSA_POLL_FDS; + PARA_ERROR_LOG("could not get alsa poll fd: %s\n", + snd_strerror(-ret)); return; } pad->poll_fd = pfd.fd; @@ -203,7 +235,7 @@ static void alsa_close(struct writer_node *wn) free(pad); } -static void alsa_write_post_select(__a_unused struct sched *s, +static int alsa_write_post_select(__a_unused struct sched *s, struct task *t) { struct writer_node *wn = container_of(t, struct writer_node, task); @@ -214,11 +246,13 @@ static void alsa_write_post_select(__a_unused struct sched *s, snd_pcm_sframes_t frames; int ret; + ret = task_get_notification(t); + if (ret < 0) + goto err; again: - t->error = 0; ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF); if (ret == 0) - return; + return 0; btr_merge(btrn, wn->min_iqs); bytes = btr_next_buffer(btrn, &data); if (ret < 0 || bytes < wn->min_iqs) { /* eof */ @@ -231,17 +265,17 @@ again: PARA_DEBUG_LOG("waiting for device to drain\n"); tv_add(now, &(struct timeval)EMBRACE(0, 200 * 1000), &pad->drain_barrier); - return; + return 0; } if (tv_diff(now, &pad->drain_barrier, NULL) > 0) goto err; - return; + return 0; } if (!pad) { int32_t val; if (bytes == 0) /* no data available */ - return; + return 0; pad = para_calloc(sizeof(*pad)); get_btr_sample_rate(btrn, &val); pad->sample_rate = val; @@ -262,7 +296,7 @@ again: goto again; } if (pad->poll_fd < 0 || !FD_ISSET(pad->poll_fd, &s->rfds)) - return; + return 0; frames = bytes / pad->bytes_per_frame; frames = snd_pcm_writei(pad->handle, data, frames); if (frames == 0 || frames == -EAGAIN) { @@ -276,7 +310,7 @@ again: char buf[100]; if (read(pad->poll_fd, buf, 100)) do_nothing; - return; + return 0; } if (frames > 0) { btr_consume(btrn, frames * pad->bytes_per_frame); @@ -285,28 +319,28 @@ again: if (frames == -EPIPE) { PARA_WARNING_LOG("underrun (tried to write %zu bytes)\n", bytes); snd_pcm_prepare(pad->handle); - return; + return 0; } - PARA_WARNING_LOG("%s\n", snd_strerror(-frames)); - ret = -E_ALSA_WRITE; + PARA_ERROR_LOG("alsa write error: %s\n", snd_strerror(-frames)); + ret = -E_ALSA; err: assert(ret < 0); - btr_remove_node(btrn); - t->error = ret; + btr_remove_node(&wn->btrn); + return ret; } -__malloc static void *alsa_parse_config_or_die(const char *options) +__malloc static void *alsa_parse_config_or_die(int argc, char **argv) { struct alsa_write_args_info *conf = para_calloc(sizeof(*conf)); /* exits on errors */ - alsa_cmdline_parser_string(options, conf, "alsa_write"); + alsa_write_cmdline_parser(argc, argv, conf); return conf; } static void alsa_free_config(void *conf) { - alsa_cmdline_parser_free(conf); + alsa_write_cmdline_parser_free(conf); } /** @@ -320,16 +354,12 @@ void alsa_write_init(struct writer *w) { struct alsa_write_args_info dummy; - alsa_cmdline_parser_init(&dummy); + alsa_write_cmdline_parser_init(&dummy); w->close = alsa_close; 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) { - .short_help = alsa_write_args_info_help, - .detailed_help = alsa_write_args_info_detailed_help - }; - alsa_cmdline_parser_free(&dummy); + w->help = (struct ggo_help)DEFINE_GGO_HELP(alsa_write); + alsa_write_cmdline_parser_free(&dummy); }