X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=708a27e52b68c1c2add01a3b3fe39f721485e39f;hp=b405f869ebf4e9af697a87b0fd4a1736e44098ce;hb=HEAD;hpb=3879481ddabc38236b9eee979a090c2a9bfa74d3

diff --git a/oggdec_filter.c b/oggdec_filter.c
index b405f869..b1aec4bc 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file oggdec_filter.c Paraslash's ogg vorbis decoder. */
 
@@ -12,7 +8,6 @@
 #include "para.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "error.h"
@@ -93,7 +88,7 @@ static const ov_callbacks ovc = {
 
 static void ogg_open(struct filter_node *fn)
 {
-	fn->private_data = para_calloc(sizeof(struct private_oggdec_data));
+	fn->private_data = zalloc(sizeof(struct private_oggdec_data));
 	fn->min_iqs = 8000;
 }
 
@@ -126,7 +121,7 @@ static int ogg_init(struct filter_node *fn)
 	struct btr_node *btrn = fn->btrn;
 	int ret, oret;
 	size_t iqs;
-	struct OggVorbis_File *vf = para_malloc(sizeof(*vf));
+	struct OggVorbis_File *vf = alloc(sizeof(*vf));
 
 	PARA_NOTICE_LOG("iqs: %zu, min_iqs: %zu, opening ov callbacks\n",
 		btr_get_input_queue_size(btrn), fn->min_iqs);
@@ -136,14 +131,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 +157,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 +173,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_monitor() 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_monitor(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 +201,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_monitor(__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;
@@ -209,7 +211,7 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0) {
-		if (ret != -E_BTR_EOF) /* fatal error */
+		if (ret != -E_EOF) /* fatal error */
 			goto out;
 		if (fn->min_iqs == 0 && !pod->have_more) /* EOF */
 			goto out;
@@ -217,7 +219,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;
@@ -226,7 +228,7 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 		goto out;
 	}
 	have = 0;
-	buf = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
+	buf = alloc(OGGDEC_OUTPUT_CHUNK_SIZE);
 	for (;;) {
 		ret = ov_read(pod->vf, buf + have, OGGDEC_OUTPUT_CHUNK_SIZE - have,
 			ENDIAN, 2 /* 16 bit */, 1 /* signed */, NULL);
@@ -236,13 +238,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,24 +251,18 @@ 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;
 }
 
-/**
- * The init function of the ogg vorbis decoder.
- *
- * \param f Its fields are filled in by the function.
- */
-void oggdec_filter_init(struct filter *f)
-{
-	f->open = ogg_open;
-	f->close = ogg_close;
-	f->pre_select = ogg_pre_select;
-	f->post_select = ogg_post_select;
-	f->execute = oggdec_execute;
-}
+const struct filter lsg_filter_cmd_com_oggdec_user_data = {
+	.open = ogg_open,
+	.close = ogg_close,
+	.pre_monitor = ogg_pre_monitor,
+	.post_monitor = ogg_post_monitor,
+	.execute = oggdec_execute
+};