X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec_filter.c;h=1e074a7e8104075b2963a64beb55aa9c720590a4;hp=c3f21f126ad7911a67e82903bb0ac12cdb49c13e;hb=764e787bc065694b2e9b05159a92104d585f59eb;hpb=4bd379f56960bddd9623f78b80f40b1dc9337a99

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index c3f21f12..1e074a7e 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -94,23 +94,6 @@ static int handle_decode_error(struct private_mp3dec_data *pmd, size_t len)
 	return 1;
 }
 
-/** 640K ought to be enough for everybody ;) */
-#define MP3DEC_MAX_PENDING (640 * 1024)
-
-static void mp3dec_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 <= fn->min_iqs)
-		return;
-	if (btr_bytes_pending(fn->btrn) > MP3DEC_MAX_PENDING)
-		return; /* FIXME, should use reasonable bound on timeout */
-	s->timeout.tv_sec = 0;
-	s->timeout.tv_usec = 1;
-}
-
 static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
 {
 	int i, ret;
@@ -215,7 +198,7 @@ next_buffer:
 	iqs = btr_get_input_queue_size(btrn);
 	if (need_bad_data_delay(pmd, iqs))
 		return;
-	ret = prepare_filter_node(btrn, fn->min_iqs);
+	ret = prepare_filter_node(fn);
 	if (ret < 0)
 		goto err;
 	if (ret == 0)
@@ -350,7 +333,7 @@ void mp3dec_filter_init(struct filter *f)
 	f->convert = mp3dec;
 	f->close = mp3dec_close;
 	f->parse_config = mp3dec_parse_config;
-	f->pre_select = mp3dec_pre_select;
+	f->pre_select = generic_filter_pre_select;
 	f->post_select = mp3dec_post_select;
 	f->execute = mp3dec_execute;
 	f->help = (struct ggo_help) {