X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=12cf8b69bef2a7a189425df8ed15604f5cf10220;hp=2d820d33e8e8bbccd313af6659ecf42d6d5280b9;hb=1ada5f286b031bde90d5cdaf8f85311cbfa7db6b;hpb=d56a8447f418cf9046077e743772a416b6f7b826 diff --git a/oss_write.c b/oss_write.c index 2d820d33..12cf8b69 100644 --- a/oss_write.c +++ b/oss_write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2010 Andre Noll + * Copyright (C) 2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,10 +8,7 @@ #include #include -#include -#include #include -#include #include "para.h" #include "fd.h" @@ -33,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) { @@ -46,26 +66,28 @@ 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); - t->error = 0; - if (ret < 0) - sched_min_delay(s); - else if (ret > 0) - para_fd_set(powd->fd, &s->wfds, &s->max_fileno); + if (ret == 0 || (sound_device_is_busy() && !powd)) + return; + if (ret < 0 || !powd) + return sched_min_delay(s); + para_fd_set(powd->fd, &s->wfds, &s->max_fileno); } static void oss_close(struct writer_node *wn) { struct private_oss_write_data *powd = wn->private_data; - if (powd->fd >= 0) - close(powd->fd); + if (!powd) + return; + close(powd->fd); free(powd); + set_sound_device_idle(); } /* @@ -85,12 +107,12 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate, int ret, format; unsigned ch, rate; struct oss_write_args_info *conf = wn->conf; - struct private_oss_write_data *powd = wn->private_data; + struct private_oss_write_data *powd = para_calloc(sizeof(*powd)); PARA_INFO_LOG("opening %s\n", conf->device_arg); ret = para_open(conf->device_arg, O_WRONLY, 0); if (ret < 0) - return ret; + goto err_free; powd->fd = ret; ret = mark_fd_nonblocking(powd->fd); if (ret < 0) @@ -124,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; @@ -147,78 +169,89 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate, sample_rate); } wn->min_iqs = powd->bytes_per_frame; + wn->private_data = powd; return 1; err: close(powd->fd); - powd->fd = -1; +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; - if (powd->fd < 0) { + 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); frames = bytes / powd->bytes_per_frame; if (!frames) { /* eof and less than a single frame available */ - ret = -E_OSS_EOF; + ret = -E_WRITE_COMMON_EOF; goto out; } 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); -} - -static void oss_open(struct writer_node *wn) -{ - struct private_oss_write_data *powd = para_calloc(sizeof(*powd)); - - powd->fd = -1; - wn->private_data = powd; + 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); } /** @@ -232,17 +265,12 @@ void oss_write_init(struct writer *w) { struct oss_write_args_info dummy; - oss_cmdline_parser_init(&dummy); - w->open = oss_open; + 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); }