/*
- * Copyright (C) 2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2010 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
struct timeval barrier;
};
-static ssize_t prebuffer_convert(char *inbuf, size_t inbuf_len,
- struct filter_node *fn)
-{
- struct private_prebuffer_data *ppd = fn->private_data;
- struct prebuffer_filter_args_info *conf = ppd->conf;
-
- if (inbuf_len == 0) {
- if (*fn->fc->input_error < 0 && ppd->prebuffered >= 0)
- goto prebuffer_end;
- return 0;
- }
- if (ppd->prebuffered < 0) {
- size_t copy = PARA_MIN(inbuf_len, fn->bufsize - fn->loaded);
- memcpy(fn->buf + fn->loaded, inbuf, copy);
- fn->loaded += copy;
- return copy;
- }
- if (ppd->prebuffered + inbuf_len > fn->bufsize) {
- fn->bufsize = PARA_MAX(2 * fn->bufsize,
- ppd->prebuffered + inbuf_len);
- fn->buf = para_realloc(fn->buf, fn->bufsize);
- }
- memcpy(fn->buf + ppd->prebuffered, inbuf, inbuf_len);
- if (ppd->prebuffered == 0) {
- struct timeval tv;
- PARA_INFO_LOG("prebuffer period %dms\n",
- conf->duration_arg);
- ms2tv(conf->duration_arg, &tv);
- tv_add(&tv, now, &ppd->barrier);
- }
- ppd->prebuffered += inbuf_len;
- PARA_DEBUG_LOG("%d bytes prebuffered\n", ppd->prebuffered);
- if (*fn->fc->input_error >= 0) {
- struct timeval diff;
- if (tv_diff(now, &ppd->barrier, &diff) < 0)
- goto out;
- if (ppd->prebuffered < conf->size_arg)
- goto out;
- }
-prebuffer_end:
- fn->loaded = ppd->prebuffered;
- ppd->prebuffered = -1;
-out:
- return inbuf_len;
-}
-
static void prebuffer_pre_select(struct sched *s, struct task *t)
{
struct filter_node *fn = container_of(t, struct filter_node, task);
tv_add(&tv, now, &ppd->barrier);
}
if (tv_diff(&ppd->barrier, now, &diff) < 0)
- goto min_delay;
- if (tv_diff(&diff, &s->timeout, NULL) < 0)
- s->timeout = diff;
- return;
-min_delay:
- s->timeout.tv_sec = 0;
- s->timeout.tv_usec = 1;
+ return sched_min_delay(s);
+ sched_request_timeout(&diff, s);
}
static void prebuffer_close(struct filter_node *fn)
{
free(fn->private_data);
- free(fn->buf);
}
static void prebuffer_post_select(__a_unused struct sched *s, struct task *t)
if (iqs < conf->size_arg)
return;
btr_splice_out_node(btrn);
- prebuffer_close(fn);
t->error = -E_PREBUFFER_SUCCESS;
}
ppd->conf = fn->conf;
fn->private_data = ppd;
- fn->bufsize = 8192; /* gets increased on demand */
- fn->buf = para_malloc(fn->bufsize);
+}
+
+static void prebuffer_free_config(void *conf)
+{
+ prebuffer_cmdline_parser_free(conf);
}
/**
prebuffer_cmdline_parser_init(&dummy);
f->open = prebuffer_open;
f->close = prebuffer_close;
- f->convert = prebuffer_convert;
f->parse_config = prebuffer_parse_config;
+ f->free_config = prebuffer_free_config;
f->pre_select = prebuffer_pre_select;
f->post_select = prebuffer_post_select;
f->help = (struct ggo_help) {