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

diff --git a/oggdec_filter.c b/oggdec_filter.c
index b30abaa1..04be7020 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;
@@ -163,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:
@@ -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 int 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;
@@ -236,13 +243,8 @@ static int 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) {
@@ -272,6 +274,6 @@ void oggdec_filter_init(struct filter *f)
 	f->open = ogg_open;
 	f->close = ogg_close;
 	f->pre_select = ogg_pre_select;
-	f->new_post_select = ogg_post_select;
+	f->post_select = ogg_post_select;
 	f->execute = oggdec_execute;
 }