/*
- * Copyright (C) 2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2014 Andre Noll <maan@tuebingen.mpg.de>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include "list.h"
#include "sched.h"
#include "ggo.h"
+#include "buffer_tree.h"
#include "filter.h"
#include "string.h"
#include "error.h"
struct timeval barrier;
};
-static ssize_t prebuffer_convert(char *inbuf, size_t inbuf_len,
- struct filter_node *fn)
+static void prebuffer_pre_select(struct sched *s, void *context)
{
+ struct filter_node *fn = context;
+ struct btr_node *btrn = fn->btrn;
+ size_t iqs = btr_get_input_queue_size(btrn);
struct private_prebuffer_data *ppd = fn->private_data;
struct prebuffer_filter_args_info *conf = ppd->conf;
+ struct timeval diff;
- 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) {
+ if (iqs == 0)
+ return;
+ if (ppd->barrier.tv_sec == 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;
+ if (tv_diff(&ppd->barrier, now, &diff) < 0)
+ 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 int prebuffer_post_select(__a_unused struct sched *s, void *context)
+{
+ struct filter_node *fn = context;
+ struct btr_node *btrn = fn->btrn;
+ size_t iqs = btr_get_input_queue_size(btrn);
+ struct private_prebuffer_data *ppd = fn->private_data;
+ struct prebuffer_filter_args_info *conf = ppd->conf;
+
+ if (ppd->barrier.tv_sec == 0)
+ return 0;
+ if (tv_diff(now, &ppd->barrier, NULL) < 0)
+ return 0;
+ if (iqs < conf->size_arg)
+ return 0;
+ btr_splice_out_node(&fn->btrn);
+ return -E_PREBUFFER_SUCCESS;
}
static int prebuffer_parse_config(int argc, char **argv, void **config)
{
- struct prebuffer_filter_args_info *prebuffer_conf
- = para_calloc(sizeof(*prebuffer_conf));
+ struct prebuffer_filter_args_info *conf = para_calloc(sizeof(*conf));
int ret = -E_PREBUFFER_SYNTAX;
- if (prebuffer_cmdline_parser(argc, argv, prebuffer_conf))
- goto err;
+ prebuffer_filter_cmdline_parser(argc, argv, conf);
ret = -ERRNO_TO_PARA_ERROR(EINVAL);
- if (prebuffer_conf->duration_arg < 0)
+ if (conf->duration_arg < 0)
goto err;
- if (prebuffer_conf->size_arg < 0)
+ if (conf->size_arg < 0)
goto err;
- PARA_NOTICE_LOG("prebuffering %ims, %i bytes\n",
- prebuffer_conf->duration_arg, prebuffer_conf->size_arg);
- *config = prebuffer_conf;
+ PARA_NOTICE_LOG("prebuffering %ims, %i bytes\n", conf->duration_arg,
+ conf->size_arg);
+ *config = conf;
return 1;
err:
- free(prebuffer_conf);
+ free(conf);
return ret;
}
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_filter_cmdline_parser_free(conf);
}
/**
{
struct prebuffer_filter_args_info dummy;
- prebuffer_cmdline_parser_init(&dummy);
+ prebuffer_filter_cmdline_parser_init(&dummy);
f->open = prebuffer_open;
f->close = prebuffer_close;
- f->convert = prebuffer_convert;
f->parse_config = prebuffer_parse_config;
- f->help = (struct ggo_help) {
- .short_help = prebuffer_filter_args_info_help,
- .detailed_help = prebuffer_filter_args_info_detailed_help
- };
+ f->free_config = prebuffer_free_config;
+ f->pre_select = prebuffer_pre_select;
+ f->post_select = prebuffer_post_select;
+ f->help = (struct ggo_help)DEFINE_GGO_HELP(prebuffer_filter);
}