X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=ccc42559eceef7eb81c2fea1bd4d80c99b183eb7;hp=fc03077bf4fc65505affd7db301f0b3dae4fd67c;hb=03683166610b241183b3cdb311069c96144fa53e;hpb=1e012cf40238883621692051a22fb9c7cad5e944

diff --git a/oggdec_filter.c b/oggdec_filter.c
index fc03077b..ccc42559 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -159,10 +159,8 @@ static void ogg_close(struct filter_node *fn)
 	fn->private_data = NULL;
 }
 
-#define OGGDEC_MAX_PENDING (640 * 1024)
 #define OGGDEC_OUTPUT_CHUNK_SIZE (64 * 1024)
 
-
 static int oggdec_execute(struct btr_node *btrn, const char *cmd, char **result)
 {
 	struct filter_node *fn = btr_context(btrn);
@@ -183,31 +181,24 @@ static int oggdec_execute(struct btr_node *btrn, const char *cmd, char **result)
 	return -ERRNO_TO_PARA_ERROR(ENOTSUP);
 }
 
-static void ogg_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) > OGGDEC_MAX_PENDING)
-		return; /* FIXME, should use reasonable bound on timeout */
-	s->timeout.tv_sec = 0;
-	s->timeout.tv_usec = 1;
-}
-
 static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
 	struct private_oggdec_data *pod = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
-	size_t iqs = btr_get_input_queue_size(btrn);
+	size_t iqs, len;
 	int ret;
+	char *in;
 
 	t->error = 0;
-	if (!pod->vf && iqs) {
-		struct oggdec_filter_args_info *conf = fn->conf;
+	ret = prepare_filter_node(fn);
+	if (ret < 0)
+		goto err;
+	if (ret == 0)
+		return;
+	len = btr_next_buffer(btrn, &in);
+	iqs = btr_get_input_queue_size(btrn);
+	if (!pod->vf) {
 		int oret;
 
 		pod->vf = para_malloc(sizeof(struct OggVorbis_File));
@@ -218,10 +209,10 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 			ovc); /* the ov_open_callbacks */
 		if (oret == OV_ENOTVORBIS || oret == OV_EBADHEADER) {
 			/* this might be due to the input buffer being too small */
-			int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
-			if (iqs < ib) {
+			if (!btr_no_parent(btrn)) {
 				free(pod->vf);
 				pod->vf = NULL;
+				fn->min_iqs = iqs + 1;
 				return;
 			}
 			ret = (oret == OV_ENOTVORBIS)?
@@ -383,7 +374,7 @@ void oggdec_filter_init(struct filter *f)
 	f->open = ogg_open;
 	f->close = ogg_close;
 	f->convert = ogg_convert;
-	f->pre_select = ogg_pre_select;
+	f->pre_select = generic_filter_pre_select;
 	f->post_select = ogg_post_select;
 	f->parse_config = oggdec_parse_config;
 	f->execute = oggdec_execute;