X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=prebuffer_filter.c;h=e1b0390c8a0f1c7a76b1f1c4fd26b1d1ae106b4a;hp=f23e4e578e1409fbe00891aa2521e01f119ce739;hb=87c857765884b6d05a2b090fa9509e90d220a2f8;hpb=f948a91c447ac2fa070c0b7a6c57b83b7dfdd56c

diff --git a/prebuffer_filter.c b/prebuffer_filter.c
index f23e4e57..e1b0390c 100644
--- a/prebuffer_filter.c
+++ b/prebuffer_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,12 +7,14 @@
 /** \file prebuffer_filter.c Paraslash's prebuffering filter. */
 
 #include <regex.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "prebuffer_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "filter.h"
 #include "string.h"
 #include "error.h"
@@ -27,56 +29,52 @@ struct private_prebuffer_data {
 	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, struct task *t)
 {
+	struct filter_node *fn = container_of(t, struct filter_node, task);
+	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) {
+	t->error = 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 void prebuffer_post_select(__a_unused struct sched *s, struct task *t)
+{
+	struct filter_node *fn = container_of(t, struct filter_node, task);
+	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;
+
+	t->error = 0;
+	if (ppd->barrier.tv_sec == 0)
+		return;
+	if (tv_diff(now, &ppd->barrier, NULL) < 0)
+		return;
+	if (iqs < conf->size_arg)
+		return;
+	btr_splice_out_node(btrn);
+	t->error = -E_PREBUFFER_SUCCESS;
 }
 
 static int prebuffer_parse_config(int argc, char **argv, void **config)
@@ -107,8 +105,11 @@ static void prebuffer_open(struct filter_node *fn)
 
 	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);
 }
 
 /**
@@ -123,8 +124,10 @@ void prebuffer_filter_init(struct filter *f)
 	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) {
 		.short_help = prebuffer_filter_args_info_help,
 		.detailed_help = prebuffer_filter_args_info_detailed_help