X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=20186667e2f383880538275d61d1607203ed2b8a;hp=85357f9379f01c70244754f3c717f23d78864231;hb=7eaf2faf618705c97c77750371e177108aaa5897;hpb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0 diff --git a/oss_write.c b/oss_write.c index 85357f93..20186667 100644 --- a/oss_write.c +++ b/oss_write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2012 Andre Noll + * Copyright (C) 2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,7 +8,6 @@ #include #include -#include #include #include "para.h" @@ -31,6 +30,29 @@ struct private_oss_write_data { int bytes_per_frame; }; +/* + * We keep one bit of static storage to make sure only one instance of the oss + * writer is running at any given time. + */ +static bool sound_device_busy; + +static bool sound_device_is_busy(void) +{ + return sound_device_busy; +} + +static void set_sound_device_busy(void) +{ + assert(!sound_device_busy); + sound_device_busy = true; +} + +static void set_sound_device_idle(void) +{ + assert(sound_device_busy); + sound_device_busy = false; +} + static int get_oss_format(enum sample_format sf) { switch (sf) { @@ -44,13 +66,13 @@ static int get_oss_format(enum sample_format sf) } } -static void oss_pre_select(struct sched *s, struct task *t) +static void oss_pre_select(struct sched *s, void *context) { - struct writer_node *wn = container_of(t, struct writer_node, task); + struct writer_node *wn = context; struct private_oss_write_data *powd = wn->private_data; int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF); - if (ret == 0) + if (ret == 0 || (sound_device_is_busy() && !powd)) return; if (ret < 0 || !powd) return sched_min_delay(s); @@ -65,6 +87,7 @@ static void oss_close(struct writer_node *wn) return; close(powd->fd); free(powd); + set_sound_device_idle(); } /* @@ -123,7 +146,7 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate, * Set sampling rate * * If we request a higher sampling rate than is supported by the - * device, the the highest possible speed is automatically used. The + * device, the highest possible speed is automatically used. The * value actually used is returned as the new value of the argument. */ rate = sample_rate; @@ -142,7 +165,7 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate, ret = -E_BAD_SAMPLERATE; if (100 * max > 110 * min) /* more than 10% deviation */ goto err; - PARA_NOTICE_LOG("using %dHz rather than %dHz\n", rate, + PARA_NOTICE_LOG("using %uHz rather than %uHz\n", rate, sample_rate); } wn->min_iqs = powd->bytes_per_frame; @@ -152,32 +175,40 @@ err: close(powd->fd); err_free: free(powd); + PARA_ERROR_LOG("failed to init %s: %s\n", conf->device_arg, + para_strerror(-ret)); return ret; } -static void oss_post_select(__a_unused struct sched *s, - struct task *t) +static int oss_post_select(__a_unused struct sched *s, void *context) { - struct writer_node *wn = container_of(t, struct writer_node, task); + struct writer_node *wn = context; struct private_oss_write_data *powd = wn->private_data; struct btr_node *btrn = wn->btrn; size_t frames, bytes; - int ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF); + int ret; char *data; + audio_buf_info abi; + ret = task_get_notification(wn->task); if (ret < 0) goto out; - if (ret == 0) - return; + ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF); + if (ret <= 0) + goto out; if (!powd) { int32_t rate, ch, format; + + if (sound_device_is_busy()) + return 0; get_btr_sample_rate(btrn, &rate); get_btr_channels(btrn, &ch); get_btr_sample_format(btrn, &format); ret = oss_init(wn, rate, ch, format); if (ret < 0) goto out; - return; + set_sound_device_busy(); + return 0; } btr_merge(btrn, wn->min_iqs); bytes = btr_next_buffer(btrn, &data); @@ -189,29 +220,38 @@ static void oss_post_select(__a_unused struct sched *s, ret = 0; if (!FD_ISSET(powd->fd, &s->wfds)) goto out; - ret = write_nonblock(powd->fd, data, frames * powd->bytes_per_frame); + /* get maximal number of bytes that can be written */ + ret = ioctl(powd->fd, SNDCTL_DSP_GETOSPACE, &abi); + if (ret >= 0) { + size_t max_frames = abi.bytes / powd->bytes_per_frame; + if (max_frames == 0) + goto out; + /* cap number of frames to avoid sound artefacts */ + frames = PARA_MIN(frames, max_frames); + } + ret = xwrite(powd->fd, data, frames * powd->bytes_per_frame); if (ret < 0) goto out; btr_consume(btrn, ret); ret = 0; out: - t->error = ret; if (ret < 0) - btr_remove_node(btrn); + btr_remove_node(&wn->btrn); + return ret; } -__malloc static void *oss_parse_config_or_die(const char *options) +__malloc static void *oss_parse_config_or_die(int argc, char **argv) { struct oss_write_args_info *conf = para_calloc(sizeof(*conf)); /* exits on errors */ - oss_cmdline_parser_string(options, conf, "oss_write"); + oss_write_cmdline_parser(argc, argv, conf); return conf; } static void oss_free_config(void *conf) { - oss_cmdline_parser_free(conf); + oss_write_cmdline_parser_free(conf); } /** @@ -225,16 +265,12 @@ void oss_write_init(struct writer *w) { struct oss_write_args_info dummy; - oss_cmdline_parser_init(&dummy); + oss_write_cmdline_parser_init(&dummy); w->close = oss_close; w->pre_select = oss_pre_select; w->post_select = oss_post_select; w->parse_config_or_die = oss_parse_config_or_die; w->free_config = oss_free_config; - w->shutdown = NULL; - w->help = (struct ggo_help) { - .short_help = oss_write_args_info_help, - .detailed_help = oss_write_args_info_detailed_help - }; - oss_cmdline_parser_free(&dummy); + w->help = (struct ggo_help)DEFINE_GGO_HELP(oss_write); + oss_write_cmdline_parser_free(&dummy); }