X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=44d299feaf5c67c4a4c78e192e61a4267881e568;hp=94c284a7039c193d45927fa970498a9408a59698;hb=75d545612d8fb51b7e6b2f8a7349b54502004cfa;hpb=058d91940d3cc131a6cf222cd79fe5c5e38c9dbd

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 94c284a7..44d299fe 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -113,7 +113,7 @@ 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)
 {
@@ -200,6 +200,8 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 	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;
@@ -214,27 +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 == 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;
-		btr_add_output(out, read_ret, btrn);
+			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;
-		if (btr_get_output_queue_size(btrn) > 128 * 1024)
-			return; /* enough data for the moment */
 	}
+	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;