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

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 0fa56f11..04be7020 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 Andre Noll <maan@tuebingen.mpg.de>
  *
  * 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)
@@ -135,14 +136,13 @@ open:
 		0, /* no initial bytes */
 		ovc); /* the ov_open_callbacks */
 	if (oret == OV_ENOTVORBIS || oret == OV_EBADHEADER) {
-		/* this might be due to the input buffer being too small */
+		/* maybe the input buffer is too small */
 		if (!btr_no_parent(btrn)) {
 			fn->min_iqs += 1000;
 			iqs = btr_get_input_queue_size(btrn);
 			ret = 0;
 			if (iqs < fn->min_iqs)
 				goto out;
-			PARA_CRIT_LOG("iqs: %zu\n", iqs);
 			btr_merge(btrn, fn->min_iqs);
 			pod->converted = 0;
 			goto open;
@@ -162,7 +162,7 @@ open:
 		goto out;
 	pod->channels = ov_info(vf, 0)->channels;
 	pod->sample_rate = ov_info(vf, 0)->rate;
-	PARA_NOTICE_LOG("%d channels, %d Hz\n", pod->channels,
+	PARA_NOTICE_LOG("%u channels, %u Hz\n", pod->channels,
 		pod->sample_rate);
 	ret = 1;
 out:
@@ -173,37 +173,58 @@ out:
 		pod->converted = 0;
 		fn->min_iqs = 0;
 		pod->vf = vf;
+		pod->have_more = true;
 	}
 	return ret;
 }
 
-static void ogg_pre_select(struct sched *s, struct task *t)
+/** Suspend decoding if output queue size is larger than that. */
+#define OGGDEC_MAX_OUTPUT_SIZE (96 * 1024)
+
+/**
+  * Allocate chunks of this size and produce at most one chunk of output per
+  * ->post_select() invocation. If the buffer could only be filled partially
+  * due to insufficient input being available, it is shrunk to the real output
+  * size and the resized buffer is fed into the output queue.
+  */
+#define OGGDEC_OUTPUT_CHUNK_SIZE (32 * 1024)
+
+static void ogg_pre_select(struct sched *s, void *context)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
+	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, void *context)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
 	struct private_oggdec_data *pod = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
 	int ret, have;
 	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;
@@ -222,27 +243,25 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 			break;
 		fn->min_iqs = 0;
 		have += ret;
-		if (have < OGGDEC_OUTPUT_CHUNK_SIZE)
-			continue;
-		if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE)
+		if (have >= OGGDEC_OUTPUT_CHUNK_SIZE)
 			break;
-		btr_add_output(buf, have, btrn);
-		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;
 }
 
 /**