X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=b30abaa1f13cd14f2a019fd8aea862c43e1c4790;hp=6f416182f927db1e19e3e04643d0a9afa2d4abf3;hb=74c88020bd325865fe26ed25ea8ad0ace0924136;hpb=f4199ba97f6a12b0af8b6f71d47392919edb6db9

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 6f416182..b30abaa1 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-2013 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,27 +174,32 @@ out:
 		pod->converted = 0;
 		fn->min_iqs = 0;
 		pod->vf = vf;
+		pod->have_more = true;
 	}
 	return ret;
 }
 
-static void ogg_pre_select(__a_unused struct sched *s, struct task *t)
+#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)
+static int 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;
@@ -202,8 +208,16 @@ 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) {
+		if (ret != -E_BTR_EOF) /* fatal error */
+			goto out;
+		if (fn->min_iqs == 0 && !pod->have_more) /* EOF */
+			goto out;
+		/* last ov_read() returned OV_HOLE */
+	} else if (ret == 0 && !pod->have_more) /* nothing to do */
 		goto out;
+	if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE)
+		return 0;
 	if (!pod->vf) {
 		if (ret <= 0)
 			goto out;
@@ -230,19 +244,22 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 		buf = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
 		have = 0;
 	}
-	if (have > 0)
+	pod->have_more = (ret > 0);
+	if (have > 0) {
+		if (have < OGGDEC_OUTPUT_CHUNK_SIZE)
+			buf = para_realloc(buf, have);
 		btr_add_output(buf, have, btrn);
-	else
+	} else
 		free(buf);
 	if (ret == OV_HOLE) /* avoid buffer underruns */
 		fn->min_iqs = 9000;
 	if (ret >= 0 || ret == OV_HOLE)
-		return;
+		return 0;
 	ret = -E_OGGDEC_BADLINK;
 out:
-	t->error = ret;
 	if (ret < 0)
-		btr_remove_node(btrn);
+		btr_remove_node(&fn->btrn);
+	return ret;
 }
 
 /**
@@ -255,6 +272,6 @@ void oggdec_filter_init(struct filter *f)
 	f->open = ogg_open;
 	f->close = ogg_close;
 	f->pre_select = ogg_pre_select;
-	f->post_select = ogg_post_select;
+	f->new_post_select = ogg_post_select;
 	f->execute = oggdec_execute;
 }