X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=prebuffer_filter.c;h=207d33245947e1b4ef898d3906c8045d76081a9e;hp=f23e4e578e1409fbe00891aa2521e01f119ce739;hb=c282c836791cedf57c128555af90af37c7c01c05;hpb=e61e21f2aae608ff694c924cdeb2056ac1136b77

diff --git a/prebuffer_filter.c b/prebuffer_filter.c
index f23e4e57..207d3324 100644
--- a/prebuffer_filter.c
+++ b/prebuffer_filter.c
@@ -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"
@@ -73,12 +75,61 @@ 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);
+	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;
+
+	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);
+	}
+	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;
+}
+
 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);
+	prebuffer_close(fn);
+	t->error = -E_PREBUFFER_SUCCESS;
+}
+
 static int prebuffer_parse_config(int argc, char **argv, void **config)
 {
 	struct prebuffer_filter_args_info *prebuffer_conf
@@ -111,6 +162,11 @@ static void prebuffer_open(struct filter_node *fn)
 	fn->buf = para_malloc(fn->bufsize);
 }
 
+static void prebuffer_free_config(void *conf)
+{
+	prebuffer_cmdline_parser_free(conf);
+}
+
 /**
  * The init function of the prebuffer filter.
  *
@@ -125,6 +181,9 @@ void prebuffer_filter_init(struct filter *f)
 	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