X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=8c12c728e551035bd8eca071216e3c7e44060de5;hp=2dab8fe1543f9205d8d12d7fa9db85be60768df6;hb=c4bfb18b78b3935b8dbf68f70b219cfb2a192979;hpb=b9d2cfbf8415ecacfe57b8cb94d97b662d3a3352 diff --git a/alsa_write.c b/alsa_write.c index 2dab8fe1..8c12c728 100644 --- a/alsa_write.c +++ b/alsa_write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Andre Noll + * Copyright (C) 2005-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -16,7 +16,6 @@ #include #include #include -#include #include "para.h" #include "fd.h" @@ -73,46 +72,66 @@ static int alsa_init(struct private_alsa_write_data *pad, snd_pcm_sw_params_t *swparams; snd_pcm_uframes_t start_threshold, stop_threshold; snd_pcm_uframes_t buffer_size, period_size; - snd_output_t *log; + snd_output_t *output_log; unsigned buffer_time; - int err; + 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, + 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 (err < 0 || buffer_time == 0) - return -E_GET_BUFFER_TIME; - if (snd_pcm_hw_params_set_buffer_time_near(pad->handle, hwparams, - &buffer_time, NULL) < 0) - return -E_SET_BUFFER_TIME; - if (snd_pcm_hw_params(pad->handle, hwparams) < 0) - return -E_HW_PARAMS; + 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, &buffer_size); + msg = "period size equals buffer size"; if (period_size == buffer_size) - return -E_BAD_PERIOD; + 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 (buffer_size < 1) @@ -120,27 +139,36 @@ static int alsa_init(struct private_alsa_write_data *pad, else 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; + 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; - 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) { + 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; PARA_INFO_LOG("dumping alsa configuration\n"); - snd_pcm_dump(pad->handle, log); - snd_output_buffer_string(log, &buf); + snd_pcm_dump(pad->handle, output_log); + snd_output_buffer_string(output_log, &buf); for (;;) { char *p = strchr(buf, '\n'); if (!p) /* omit last output line, it's empty */ @@ -149,9 +177,15 @@ static int alsa_init(struct private_alsa_write_data *pad, PARA_INFO_LOG("%s\n", buf); buf = p + 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) @@ -175,8 +209,9 @@ 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)); + t->error = -E_ALSA; return; } pad->poll_fd = pfd.fd; @@ -285,8 +320,8 @@ again: snd_pcm_prepare(pad->handle); return; } - 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); @@ -323,7 +358,6 @@ void alsa_write_init(struct writer *w) 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,