X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=f24e117be072a757af58f57349e9f26e0e689ef4;hp=7362c42bdaefe57ae485fa7ec202212eaa6cfa12;hb=1c859dfc274c592eca267197131d6497b650b24c;hpb=7041d795b5af3661daf332ef13c50517b5b9716b diff --git a/alsa_write.c b/alsa_write.c index 7362c42b..f24e117b 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. */ @@ -45,15 +45,16 @@ 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; /** * The number of channels, given by command line option or the * decoder of the writer node group. */ unsigned channels; + struct timeval drain_barrier; }; /* Install PCM software and hardware configuration. */ @@ -85,7 +86,7 @@ static int alsa_init(struct private_alsa_write_data *pad, 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 +110,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; @@ -136,7 +137,7 @@ static int alsa_open(struct writer_node *wn) 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; @@ -174,23 +175,6 @@ static void alsa_write_pre_select_btr(struct sched *s, struct task *t) 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)); -} - static void alsa_close(struct writer_node *wn) { struct private_alsa_write_data *pad = wn->private_data; @@ -209,7 +193,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 +201,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,30 +217,30 @@ 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); + ret = get_btr_sample_rate(btrn, &val); + if (ret < 0) + goto err; + pad->sample_rate = val; + ret = get_btr_channels(btrn, &val); + if (ret < 0) + goto err; + pad->channels = 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; @@ -269,7 +253,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; } @@ -310,7 +294,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,8 +303,8 @@ 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->pre_select = alsa_write_pre_select; + 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;