X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=49f69b54d7601168ef195c938ae800a229f5ba19;hp=7681a762115317f0c6c01c7a7759734110c07ed4;hb=3010ef96e10cb15d423eef8f9802fbed78744393;hpb=4c537cd0770d81fc3c3937010b75a67f18370d84;ds=sidebyside

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 7681a762..49f69b54 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -1225,53 +1225,39 @@ static int wmadec_execute(struct btr_node *btrn, const char *cmd, char **result)
 	return -ERRNO_TO_PARA_ERROR(ENOTSUP);
 }
 
-#define WMADEC_MAX_PENDING (640 * 1024)
-
-static void wmadec_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) > WMADEC_MAX_PENDING)
-		return; /* FIXME, should use reasonable bound on timeout */
-	s->timeout.tv_sec = 0;
-	s->timeout.tv_usec = 1;
-}
-
 #define WMA_OUTPUT_BUFFER_SIZE (128 * 1024)
 
 static void wmadec_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
-	int ret, converted = 0;
+	int ret, converted;
 	struct private_wmadec_data *pwd = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
-	size_t len, min_len;
+	size_t len;
 	char *in;
 
-	min_len = pwd? WMA_FRAME_SKIP + pwd->ahi.block_align : 8192;
 next_buffer:
+	converted = 0;
 	t->error = 0;
-	ret = prepare_filter_node(btrn, min_len);
+	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0)
 		goto err;
 	if (ret == 0)
 		return;
+	btr_merge(btrn, fn->min_iqs);
 	len = btr_next_buffer(btrn, (char **)&in);
 	ret = -E_WMADEC_EOF;
-	if (len < min_len)
+	if (len < fn->min_iqs)
 		goto err;
 	if (!pwd) {
 		ret = wma_decode_init(in, len, &pwd);
 		if (ret < 0)
 			goto err;
 		if (ret == 0) {
-			min_len += 4096;
+			fn->min_iqs += 4096;
 			goto next_buffer;
 		}
+		fn->min_iqs = WMA_FRAME_SKIP + pwd->ahi.block_align;
 		fn->private_data = pwd;
 		converted = pwd->ahi.header_len;
 		goto success;
@@ -1279,7 +1265,7 @@ next_buffer:
 	for (;;) {
 		char *out;
 		int out_size = WMA_OUTPUT_BUFFER_SIZE;
-		if (converted + WMA_FRAME_SKIP + pwd->ahi.block_align > len)
+		if (converted + fn->min_iqs > len)
 			break;
 		out = para_malloc(WMA_OUTPUT_BUFFER_SIZE);
 		ret = wma_decode_superframe(pwd, out,
@@ -1297,9 +1283,8 @@ success:
 	goto next_buffer;
 err:
 	assert(ret < 0);
-	wmadec_close(fn);
 	t->error = ret;
-	btr_del_node(btrn);
+	btr_remove_node(btrn);
 }
 
 static ssize_t wmadec_convert(char *inbuffer, size_t len,
@@ -1343,6 +1328,7 @@ static void wmadec_open(struct filter_node *fn)
 	fn->buf = para_malloc(fn->bufsize);
 	fn->private_data = NULL;
 	fn->loaded = 0;
+	fn->min_iqs = 4096;
 }
 
 /**
@@ -1356,6 +1342,6 @@ void wmadec_filter_init(struct filter *f)
 	f->close = wmadec_close;
 	f->convert = wmadec_convert;
 	f->execute = wmadec_execute;
-	f->pre_select = wmadec_pre_select;
+	f->pre_select = generic_filter_pre_select;
 	f->post_select = wmadec_post_select;
 }