X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=4b801356075ba8b7f1ebb4280708aac94194912a;hp=b405f869ebf4e9af697a87b0fd4a1736e44098ce;hb=5ff39998bf0ce71bd8fc8d0f002ceb81b711992f;hpb=f652ce6afe7f6fd0e42814505234cbf4321a736e

diff --git a/oggdec_filter.c b/oggdec_filter.c
index b405f869..4b801356 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -136,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;
@@ -179,12 +178,20 @@ out:
 	return ret;
 }
 
+/** 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, struct task *t)
+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;
@@ -199,9 +206,9 @@ static void ogg_pre_select(struct sched *s, struct task *t)
 	sched_min_delay(s);
 }
 
-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;
@@ -217,7 +224,7 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 	} else if (ret == 0 && !pod->have_more) /* nothing to do */
 		goto out;
 	if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE)
-		return;
+		return 0;
 	if (!pod->vf) {
 		if (ret <= 0)
 			goto out;
@@ -236,13 +243,8 @@ 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;
 	}
 	pod->have_more = (ret > 0);
 	if (have > 0) {
@@ -254,12 +256,12 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 	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(&fn->btrn);
+	return ret;
 }
 
 /**