X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=wmadec_filter.c;h=214ceb1b2851cab7a368d4b2001ad976d958644f;hb=aa3c8a3f067dafda3e2f4c45b43e58246d0eb587;hp=87de6b44aef35bd78c42bd469b2a36c167750d06;hpb=4bd379f56960bddd9623f78b80f40b1dc9337a99;p=paraslash.git

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 87de6b44..214ceb1b 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -1225,22 +1225,6 @@ 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)
@@ -1254,7 +1238,7 @@ static void wmadec_post_select(__a_unused struct sched *s, struct task *t)
 
 next_buffer:
 	t->error = 0;
-	ret = prepare_filter_node(btrn, fn->min_iqs);
+	ret = prepare_filter_node(fn);
 	if (ret < 0)
 		goto err;
 	if (ret == 0)
@@ -1357,6 +1341,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;
 }