X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=79716a36c2e1c5a2f94e30b1212bfa58c3e75ed8;hp=44d299feaf5c67c4a4c78e192e61a4267881e568;hb=88c5dc601a5d1b194da3102566a3fb97947a6aee;hpb=dd98d31d017bbbe16bf6711e0343b267dd6cfe89

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 44d299fe..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)
@@ -92,29 +93,25 @@ static const ov_callbacks ovc = {
 
 static void ogg_open(struct filter_node *fn)
 {
-	struct private_oggdec_data *pod = para_calloc(
-		sizeof(struct private_oggdec_data));
-
-	fn->private_data = pod;
+	fn->private_data = para_calloc(sizeof(struct private_oggdec_data));
 	fn->min_iqs = 8000;
 }
 
 static void ogg_close(struct filter_node *fn)
 {
 	struct private_oggdec_data *pod = fn->private_data;
-	if (pod->vf) {
+
+	if (pod && pod->vf) {
 		PARA_DEBUG_LOG("ov_clearing %p, pod = %p\n", pod->vf, pod);
 		ov_clear(pod->vf);
 		free(pod->vf);
 		pod->vf = NULL;
 	} else
 		PARA_DEBUG_LOG("nothing to close\n");
-	free(fn->private_data);
+	free(pod);
 	fn->private_data = NULL;
 }
 
-#define OGGDEC_OUTPUT_CHUNK_SIZE (640 * 1024)
-
 static int oggdec_execute(struct btr_node *btrn, const char *cmd, char **result)
 {
 	struct filter_node *fn = btr_context(btrn);
@@ -177,21 +174,29 @@ 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);
 }
 
 static void ogg_post_select(__a_unused struct sched *s, struct task *t)
@@ -199,58 +204,54 @@ 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;
-	int ret, ns;
-	char *out;
-	ssize_t read_ret, have;
+	int ret, have;
+	char *buf;
 
-	pod->converted = 0;
-	t->error = 0;
-	ret = ns = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
-	if (ret <= 0)
+	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
+	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)
 			goto out;
 		btr_merge(btrn, fn->min_iqs);
 		ret = ogg_init(fn);
-		if (ret <= 0)
-			goto out;
+		goto out;
 	}
-	out = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
-	for (have = 0;;) {
-		read_ret = ov_read(pod->vf, out + have,
-			OGGDEC_OUTPUT_CHUNK_SIZE - have,
+	have = 0;
+	buf = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
+	for (;;) {
+		ret = ov_read(pod->vf, buf + have, OGGDEC_OUTPUT_CHUNK_SIZE - have,
 			ENDIAN, 2 /* 16 bit */, 1 /* signed */, NULL);
 		btr_consume(btrn, pod->converted);
 		pod->converted = 0;
-		if (read_ret <= 0)
-			break;
-		have += read_ret;
-		if (have >= OGGDEC_OUTPUT_CHUNK_SIZE)
+		if (ret <= 0)
 			break;
-	}
-	if (have == 0)
-		free(out);
-	else if (have < OGGDEC_OUTPUT_CHUNK_SIZE)
-		out = para_realloc(out, have);
-	if (have > 0) {
-		btr_add_output(out, have, btrn);
 		fn->min_iqs = 0;
+		have += ret;
+		if (have < OGGDEC_OUTPUT_CHUNK_SIZE)
+			continue;
+		if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE)
+			break;
+		btr_add_output(buf, have, btrn);
+		buf = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
+		have = 0;
 	}
-	ret = ns;
-	if (read_ret == OV_HOLE) /* avoid buffer underruns */
+	pod->have_more = (ret > 0);
+	if (have > 0)
+		btr_add_output(buf, have, btrn);
+	else
+		free(buf);
+	if (ret == OV_HOLE) /* avoid buffer underruns */
 		fn->min_iqs = 9000;
-	if (read_ret == 0 || read_ret == OV_HOLE)
-		goto out;
+	if (ret >= 0 || ret == OV_HOLE)
+		return;
 	ret = -E_OGGDEC_BADLINK;
-	if (read_ret < 0)
-		goto out;
-	ret = 0;
 out:
-	if (ret < 0) {
-		t->error = ret;
+	t->error = ret;
+	if (ret < 0)
 		btr_remove_node(btrn);
-	}
 }
 
 /**