X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec_filter.c;h=602df63ef7bd91520f426cbe35ea85cc7ae91fe0;hp=f41fe8b1215800bbff616c3a2efdc87c0b8fa649;hb=aa234b7afe223879a7bd7274ce05a3a315a2ec49;hpb=4c537cd0770d81fc3c3937010b75a67f18370d84

diff --git a/aacdec_filter.c b/aacdec_filter.c
index f41fe8b1..602df63e 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -58,22 +58,6 @@ struct private_aacdec_data {
 	unsigned int samplerate;
 };
 
-#define AACDEC_MAX_PENDING (640 * 1024)
-
-static void aacdec_pre_select(struct sched *s, struct task *t)
-{
-	struct filter_node *fn = container_of(t, struct filter_node, task);
-	size_t iqs = btr_get_input_queue_size(fn->btrn);
-
-	t->error = 0;
-	if (iqs == 0)
-		return;
-	if (btr_bytes_pending(fn->btrn) > AACDEC_MAX_PENDING)
-		return; /* FIXME, should use reasonable bound on timeout */
-	s->timeout.tv_sec = 0;
-	s->timeout.tv_usec = 1;
-}
-
 static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 {
 	struct private_aacdec_data *padd = fn->private_data;
@@ -209,6 +193,7 @@ static void aacdec_open(struct filter_node *fn)
 	fn->private_data = padd;
 	fn->bufsize = AAC_OUTBUF_SIZE;
 	fn->buf = para_calloc(fn->bufsize);
+	fn->min_iqs = 2048;
 	padd->handle = aac_open();
 }
 
@@ -235,11 +220,12 @@ static void aacdec_post_select(__a_unused struct sched *s, struct task *t)
 
 next_buffer:
 	t->error = 0;
-	ret = prepare_filter_node(btrn, 2048);
+	ret = btr_node_status(btrn, fn->min_iqs);
 	if (ret < 0)
 		goto err;
 	if (ret == 0)
 		return;
+	btr_merge(btrn, fn->min_iqs);
 	len = btr_next_buffer(btrn, (char **)&inbuf);
 	iqs = btr_get_input_queue_size(btrn);
 	if (!padd->initialized) {
@@ -340,9 +326,8 @@ out:
 	}
 err:
 	assert(ret < 0);
-	aacdec_close(fn);
 	t->error = ret;
-	btr_del_node(btrn);
+	btr_remove_node(btrn);
 }
 
 /**
@@ -357,8 +342,7 @@ void aacdec_filter_init(struct filter *f)
 	f->open = aacdec_open;
 	f->convert = aacdec;
 	f->close = aacdec_close;
-	f->pre_select = aacdec_pre_select;
-	f->post_select = aacdec_post_select;
+	f->pre_select = generic_filter_pre_select;
 	f->post_select = aacdec_post_select;
 	f->execute = aacdec_execute;
 }