X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=8b751f04592eff0f7d6b3e5fe73ade1938c17382;hp=be726108818b826ebc4a7f17ac773eb31a1786b8;hb=63abcd1b2f6de6ce53d82962f5a2100c5a57e5d3;hpb=1d5d66070093bcac96de40dd6bced93ab7bc15a8

diff --git a/wmadec_filter.c b/wmadec_filter.c
index be726108..8b751f04 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -17,7 +17,6 @@
 
 #define _XOPEN_SOURCE 600
 
-#include <sys/time.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -75,7 +74,6 @@ struct private_wmadec_data {
 	int byte_offset_bits;
 	/** Only used if use_exp_vlc is true. */
 	struct vlc exp_vlc;
-	int exponent_sizes[BLOCK_NB_SIZES];
 	uint16_t exponent_bands[BLOCK_NB_SIZES][25];
 	/** The index of the first coef in high band. */
 	int high_band_start[BLOCK_NB_SIZES];
@@ -229,8 +227,9 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd,
 	const uint8_t *table;
 
 	for (k = 0; k < pwd->nb_block_sizes; k++) {
-		block_len = pwd->frame_len >> k;
+		int exponent_size;
 
+		block_len = pwd->frame_len >> k;
 		table = NULL;
 		a = pwd->frame_len_bits - BLOCK_MIN_BITS - k;
 		if (a < 3) {
@@ -245,7 +244,7 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd,
 			n = *table++;
 			for (i = 0; i < n; i++)
 				pwd->exponent_bands[k][i] = table[i];
-			pwd->exponent_sizes[k] = n;
+			exponent_size = n;
 		} else {
 			j = 0;
 			lpos = 0;
@@ -262,7 +261,7 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd,
 					break;
 				lpos = pos;
 			}
-			pwd->exponent_sizes[k] = j;
+			exponent_size = j;
 		}
 
 		/* max number of coefs */
@@ -270,7 +269,7 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd,
 		/* high freq computation */
 		pwd->high_band_start[k] = (int) ((block_len * 2 * high_freq)
 			/ ahi->sample_rate + 0.5);
-		n = pwd->exponent_sizes[k];
+		n = exponent_size;
 		j = 0;
 		pos = 0;
 		for (i = 0; i < n; i++) {
@@ -1211,23 +1210,22 @@ static int wmadec_execute(struct btr_node *btrn, const char *cmd, char **result)
 
 #define WMA_OUTPUT_BUFFER_SIZE (128 * 1024)
 
-static void wmadec_post_select(__a_unused struct sched *s, struct task *t)
+static int wmadec_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
-	int ret, converted;
+	int ret, converted, out_size;
 	struct private_wmadec_data *pwd = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
 	size_t len;
-	char *in;
+	char *in, *out;
 
 next_buffer:
 	converted = 0;
-	t->error = 0;
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0)
 		goto err;
 	if (ret == 0)
-		return;
+		return 0;
 	btr_merge(btrn, fn->min_iqs);
 	len = btr_next_buffer(btrn, (char **)&in);
 	ret = -E_WMADEC_EOF;
@@ -1247,29 +1245,27 @@ next_buffer:
 		goto success;
 	}
 	fn->min_iqs = WMA_FRAME_SKIP + pwd->ahi.block_align;
-	for (;;) {
-		char *out;
-		int out_size = WMA_OUTPUT_BUFFER_SIZE;
-		if (converted + fn->min_iqs > len)
-			break;
-		out = para_malloc(WMA_OUTPUT_BUFFER_SIZE);
-		ret = wma_decode_superframe(pwd, out,
-			&out_size, (uint8_t *)in + converted + WMA_FRAME_SKIP,
-			len - WMA_FRAME_SKIP);
-		if (ret < 0) {
-			free(out);
-			goto err;
-		}
-		btr_add_output(out, out_size, btrn);
-		converted += ret + WMA_FRAME_SKIP;
+	if (fn->min_iqs > len)
+		goto success;
+	out_size = WMA_OUTPUT_BUFFER_SIZE;
+	out = para_malloc(out_size);
+	ret = wma_decode_superframe(pwd, out, &out_size,
+		(uint8_t *)in + WMA_FRAME_SKIP, len - WMA_FRAME_SKIP);
+	if (ret < 0) {
+		free(out);
+		goto err;
 	}
+	out = para_realloc(out, out_size);
+	if (out_size > 0)
+		btr_add_output(out, out_size, btrn);
+	converted += ret + WMA_FRAME_SKIP;
 success:
 	btr_consume(btrn, converted);
-	return;
+	return 0;
 err:
 	assert(ret < 0);
-	t->error = ret;
-	btr_remove_node(btrn);
+	btr_remove_node(&fn->btrn);
+	return ret;
 }
 
 static void wmadec_open(struct filter_node *fn)