X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=79716a36c2e1c5a2f94e30b1212bfa58c3e75ed8;hp=0fa56f1187294f1148b3672c74e1b2ccf9f8568d;hb=869f0e06ec4e15abc9230c1b2d7615da5250802e;hpb=5c3867cc94d45ed34667ee01098228656027e277

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 0fa56f11..79716a36 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <vorbis/vorbisfile.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -36,6 +35,8 @@ struct private_oggdec_data {
 	unsigned int channels;
 	/** Current sample rate in Hz. */
 	unsigned int sample_rate;
+	/** Whether everything was decoded during the previous iteration. */
+	bool have_more;
 };
 
 static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
@@ -173,26 +174,31 @@ out:
 		pod->converted = 0;
 		fn->min_iqs = 0;
 		pod->vf = vf;
+		pod->have_more = true;
 	}
 	return ret;
 }
 
+#define OGGDEC_MAX_OUTPUT_SIZE (96 * 1024)
+#define OGGDEC_OUTPUT_CHUNK_SIZE (32 * 1024)
+
 static void ogg_pre_select(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;
 	int ret;
 
-	t->error = 0;
-	ret = btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL);
+	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret != 0)
-		sched_min_delay(s);
-	else
-		sched_request_timeout_ms(100, s);
+		return sched_min_delay(s);
+	if (!pod->have_more)
+		return;
+	if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE)
+		return;
+	sched_min_delay(s);
 }
 
-#define OGGDEC_MAX_OUTPUT_SIZE (128 * 1024)
-#define OGGDEC_OUTPUT_CHUNK_SIZE (32 * 1024)
-
 static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
@@ -202,7 +208,9 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 	char *buf;
 
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
-	if (ret <= 0)
+	if (ret < 0 && ret != -E_BTR_EOF) /* fatal error */
+		goto out;
+	if (ret <= 0 && !pod->have_more) /* nothing to do */
 		goto out;
 	if (!pod->vf) {
 		if (ret <= 0)
@@ -230,6 +238,7 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 		buf = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
 		have = 0;
 	}
+	pod->have_more = (ret > 0);
 	if (have > 0)
 		btr_add_output(buf, have, btrn);
 	else