X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=44d299feaf5c67c4a4c78e192e61a4267881e568;hp=0130afd04989043430e5c1d70fc11800a6d1f311;hb=eb9722e8763a9b2a2ae99d98a9715bd932081c3c;hpb=f32c0776882e01913c64c8ccbf2d94e0fb4d6369

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 0130afd0..44d299fe 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -35,7 +35,7 @@ struct private_oggdec_data {
 	/** The number of channels of the current stream. */
 	unsigned int channels;
 	/** Current sample rate in Hz. */
-	unsigned int samplerate;
+	unsigned int sample_rate;
 };
 
 static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
@@ -113,26 +113,14 @@ static void ogg_close(struct filter_node *fn)
 	fn->private_data = NULL;
 }
 
-#define OGGDEC_OUTPUT_CHUNK_SIZE (64 * 1024)
+#define OGGDEC_OUTPUT_CHUNK_SIZE (640 * 1024)
 
 static int oggdec_execute(struct btr_node *btrn, const char *cmd, char **result)
 {
 	struct filter_node *fn = btr_context(btrn);
 	struct private_oggdec_data *pod = fn->private_data;
 
-	if (!strcmp(cmd, "samplerate")) {
-		if (pod->samplerate == 0)
-			return -E_BTR_NAVAIL;
-		*result = make_message("%u", pod->samplerate);
-		return 1;
-	}
-	if (!strcmp(cmd, "channels")) {
-		if (pod->channels == 0)
-			return -E_BTR_NAVAIL;
-		*result = make_message("%u", pod->channels);
-		return 1;
-	}
-	return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+	return decoder_execute(cmd, pod->sample_rate, pod->channels, result);
 }
 
 static int ogg_init(struct filter_node *fn)
@@ -141,12 +129,12 @@ 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));
 
-	pod->vf = para_malloc(sizeof(struct OggVorbis_File));
 	PARA_NOTICE_LOG("iqs: %zu, min_iqs: %zu, opening ov callbacks\n",
 		btr_get_input_queue_size(btrn), fn->min_iqs);
 open:
-	oret = ov_open_callbacks(fn, pod->vf,
+	oret = ov_open_callbacks(fn, vf,
 		NULL, /* no initial buffer */
 		0, /* no initial bytes */
 		ovc); /* the ov_open_callbacks */
@@ -176,33 +164,50 @@ open:
 	ret = -E_OGGDEC_FAULT;
 	if (oret < 0)
 		goto out;
-	pod->channels = ov_info(pod->vf, 0)->channels;
-	pod->samplerate = ov_info(pod->vf, 0)->rate;
+	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,
-		pod->samplerate);
+		pod->sample_rate);
 	ret = 1;
 out:
-	if (ret <= 0) {
-		free(pod->vf);
-		pod->vf = NULL;
-	} else {
+	if (ret <= 0)
+		free(vf);
+	else {
 		btr_consume(btrn, pod->converted);
 		pod->converted = 0;
 		fn->min_iqs = 0;
+		pod->vf = vf;
 	}
 	return ret;
 }
 
+static void ogg_pre_select(__a_unused struct sched *s, struct task *t)
+{
+	struct filter_node *fn = container_of(t, struct filter_node, task);
+	int ret;
+
+	t->error = 0;
+	ret = btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL);
+	if (ret != 0)
+		sched_min_delay(s);
+	else
+		sched_request_timeout_ms(100, s);
+}
+
 static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
 	struct private_oggdec_data *pod = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
 	int ret, ns;
+	char *out;
+	ssize_t read_ret, have;
 
 	pod->converted = 0;
 	t->error = 0;
 	ret = ns = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
+	if (ret <= 0)
+		goto out;
 	if (!pod->vf) {
 		if (ret <= 0)
 			goto out;
@@ -211,24 +216,36 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 		if (ret <= 0)
 			goto out;
 	}
-	for (;;) {
-		char *out = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
-		ssize_t read_ret = ov_read(pod->vf, out, OGGDEC_OUTPUT_CHUNK_SIZE,
+	out = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
+	for (have = 0;;) {
+		read_ret = ov_read(pod->vf, out + have,
+			OGGDEC_OUTPUT_CHUNK_SIZE - have,
 			ENDIAN, 2 /* 16 bit */, 1 /* signed */, NULL);
 		btr_consume(btrn, pod->converted);
 		pod->converted = 0;
 		if (read_ret <= 0)
-			free(out);
-		ret = ns;
-		if (read_ret == 0 || read_ret == OV_HOLE)
-			goto out;
-		ret = -E_OGGDEC_BADLINK;
-		if (read_ret < 0)
-			goto out;
-		btr_add_output(out, read_ret, btrn);
-		if (btr_get_output_queue_size(btrn) > 128 * 1024)
-			return; /* enough data for the moment */
+			break;
+		have += read_ret;
+		if (have >= OGGDEC_OUTPUT_CHUNK_SIZE)
+			break;
 	}
+	if (have == 0)
+		free(out);
+	else if (have < OGGDEC_OUTPUT_CHUNK_SIZE)
+		out = para_realloc(out, have);
+	if (have > 0) {
+		btr_add_output(out, have, btrn);
+		fn->min_iqs = 0;
+	}
+	ret = ns;
+	if (read_ret == OV_HOLE) /* avoid buffer underruns */
+		fn->min_iqs = 9000;
+	if (read_ret == 0 || read_ret == OV_HOLE)
+		goto out;
+	ret = -E_OGGDEC_BADLINK;
+	if (read_ret < 0)
+		goto out;
+	ret = 0;
 out:
 	if (ret < 0) {
 		t->error = ret;
@@ -245,7 +262,7 @@ void oggdec_filter_init(struct filter *f)
 {
 	f->open = ogg_open;
 	f->close = ogg_close;
-	f->pre_select = generic_filter_pre_select;
+	f->pre_select = ogg_pre_select;
 	f->post_select = ogg_post_select;
 	f->execute = oggdec_execute;
 }