X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=ad3ef60f637fbdc3239970d4b5a0f76a42614e93;hp=f41150f2638c62d4dd48fc23f9705f1dcf94ac4d;hb=0c94435d0018260181e425c633c4d2cf8eed0f13;hpb=e065f3eec9be99d82da855bf3da38d8e86752fef

diff --git a/oggdec_filter.c b/oggdec_filter.c
index f41150f2..ad3ef60f 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-2014 Andre Noll <maan@systemlinux.org>
  *
  * 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;
@@ -184,7 +183,7 @@ out:
 
 static void ogg_pre_select(struct sched *s, struct task *t)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = task_context(t);
 	struct private_oggdec_data *pod = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
 	int ret;
@@ -201,7 +200,7 @@ static void ogg_pre_select(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 filter_node *fn = task_context(t);
 	struct private_oggdec_data *pod = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
 	int ret, have;
@@ -236,13 +235,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) {