X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=10a64497d58b9c024aa9d1097bd7976da3b79883;hp=c1717eb868cf6757e0aa447e9d6353273a47d89e;hb=de7b5b177b8ad295820bd14c00b049fd8a5ec21f;hpb=49c897ce4cffb9ab355540043cd85d22d9a78299 diff --git a/oss_write.c b/oss_write.c index c1717eb8..10a64497 100644 --- a/oss_write.c +++ b/oss_write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Andre Noll + * Copyright (C) 2009-2010 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -32,32 +32,11 @@ struct private_oss_write_data { /** The file handle of the device. */ int fd; - /** - * The samplerate given by command line option or the decoder - * of the writer node group. - */ - int samplerate; - /** - * The number of channels, given by command line option or the - * decoder of the writer node group. - */ - int channels; /** Four bytes for stereo streams, two bytes for mono streams. */ int bytes_per_frame; }; -static int oss_pre_select(struct sched *s, struct writer_node *wn) -{ - struct private_oss_write_data *powd = wn->private_data; - struct writer_node_group *wng = wn->wng; - - if (*wng->loaded - wn->written < powd->bytes_per_frame) - return 0; - para_fd_set(powd->fd, &s->wfds, &s->max_fileno); - return 1; -} - -static void oss_pre_select_btr(struct sched *s, struct task *t) +static void oss_pre_select(struct sched *s, struct task *t) { struct writer_node *wn = container_of(t, struct writer_node, task); struct private_oss_write_data *powd = wn->private_data; @@ -65,41 +44,9 @@ static void oss_pre_select_btr(struct sched *s, struct task *t) t->error = 0; if (ret < 0) - goto min_delay; - if (ret == 0) - return; - if (!powd) - goto min_delay; - para_fd_set(powd->fd, &s->wfds, &s->max_fileno); - return; -min_delay: - s->timeout.tv_sec = 0; - s->timeout.tv_usec = 1; -} - -static int oss_post_select(struct sched *s, struct writer_node *wn) -{ - int ret; - struct private_oss_write_data *powd = wn->private_data; - struct writer_node_group *wng = wn->wng; - size_t frames, bytes = *wng->loaded - wn->written; - char *data = *wng->bufp + wn->written; - - if (*wng->input_error < 0 && bytes < powd->bytes_per_frame) { - wn->written = *wng->loaded; - return *wng->input_error; - } - frames = bytes / powd->bytes_per_frame; - if (!frames) /* less than a single frame available */ - goto out; - if (!FD_ISSET(powd->fd, &s->wfds)) - goto out; - ret = write_nonblock(powd->fd, data, frames * powd->bytes_per_frame, 0); - if (ret < 0) - return ret; - wn->written += ret; -out: - return 1; + sched_min_delay(s); + else if (ret > 0) + para_fd_set(powd->fd, &s->wfds, &s->max_fileno); } static void oss_close(struct writer_node *wn) @@ -107,7 +54,6 @@ static void oss_close(struct writer_node *wn) struct private_oss_write_data *powd = wn->private_data; close(powd->fd); - oss_cmdline_parser_free(wn->conf); free(powd); } @@ -124,7 +70,8 @@ static void oss_close(struct writer_node *wn) */ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channels) { - int ret, format = FORMAT, ch, rate; + int ret, format = FORMAT; + unsigned ch, rate; struct oss_write_args_info *conf = wn->conf; struct private_oss_write_data *powd = wn->private_data; @@ -146,20 +93,17 @@ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channe if (format != FORMAT) goto err; /* set number of channels */ - if (!conf->channels_given && channels != 0) - ch = channels; - else - ch = conf->channels_arg; ret = -E_BAD_CHANNEL_COUNT; - if (ch == 0) + if (channels == 0) goto err; - powd->channels = ch; + ch = channels; ret = ioctl(powd->fd, SNDCTL_DSP_CHANNELS, &ch); if (ret < 0) { ret = -ERRNO_TO_PARA_ERROR(errno); goto err; } - if (powd->channels != ch) + ret = -E_BAD_CHANNEL_COUNT; + if (ch != channels) goto err; powd->bytes_per_frame = ch * 2; @@ -170,19 +114,15 @@ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channe * device, the the highest possible speed is automatically used. The * value actually used is returned as the new value of the argument. */ - if (!conf->samplerate_given && samplerate != 0) - rate = samplerate; - else - rate = conf->samplerate_arg; - powd->samplerate = rate; + rate = samplerate; ret = ioctl(powd->fd, SNDCTL_DSP_SPEED, &rate); if (ret < 0) { ret = -ERRNO_TO_PARA_ERROR(errno); goto err; } - if (rate != powd->samplerate) { - int min = PARA_MIN(rate, powd->samplerate), - max = PARA_MAX(rate, powd->samplerate); + if (rate != samplerate) { + unsigned min = PARA_MIN(rate, samplerate), + max = PARA_MAX(rate, samplerate); /* * Check whether the returned sample rate differs significantly * from the requested one. @@ -191,7 +131,7 @@ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channe if (100 * max > 110 * min) /* more than 10% deviation */ goto err; PARA_NOTICE_LOG("using %dHz rather than %dHz\n", rate, - powd->samplerate); + samplerate); } wn->min_iqs = powd->bytes_per_frame; return 1; @@ -201,7 +141,7 @@ err: return ret; } -static void oss_post_select_btr(__a_unused struct sched *s, +static void oss_post_select(__a_unused struct sched *s, struct task *t) { struct writer_node *wn = container_of(t, struct writer_node, task); @@ -255,16 +195,10 @@ out: static int oss_open(struct writer_node *wn) { - struct writer_node_group *wng; struct private_oss_write_data *powd; powd = para_calloc(sizeof(*powd)); wn->private_data = powd; - if (!wn->btrn) { - wng = wn->wng; - return oss_init(wn, wng->samplerate ? *wng->samplerate : 0, - wng->channels? *wng->channels : 0); - } powd->fd = -1; return 1; } @@ -274,7 +208,6 @@ __malloc static void *oss_parse_config(const char *options) int ret; struct oss_write_args_info *conf = para_calloc(sizeof(*conf)); - PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t")); ret = oss_cmdline_parser_string(options, conf, "oss_write"); if (ret) goto err_out; @@ -304,9 +237,7 @@ void oss_write_init(struct writer *w) w->open = oss_open; w->close = oss_close; w->pre_select = oss_pre_select; - w->pre_select_btr = oss_pre_select_btr; w->post_select = oss_post_select; - w->post_select_btr = oss_post_select_btr; w->parse_config = oss_parse_config; w->free_config = oss_free_config; w->shutdown = NULL;