X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=0071337f38427cc98f341404a6819ee683352ecc;hp=e58754f5f5658886f8e4d9c238b5093db1980dbe;hb=7df87a748fae6a9f20d337d79ec83978856f0c48;hpb=128c594f32be41d928df432298a013a168891ab7

diff --git a/wmadec_filter.c b/wmadec_filter.c
index e58754f5..0071337f 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];
@@ -151,6 +149,8 @@ struct private_wmadec_data {
 #define VLCBITS 9
 #define VLCMAX DIV_ROUND_UP(22, VLCBITS)
 
+/** \cond sine_winows */
+
 #define SINE_WINDOW(x) static float sine_ ## x[x] __a_aligned(16)
 
 SINE_WINDOW(128);
@@ -163,6 +163,7 @@ SINE_WINDOW(4096);
 static float *sine_windows[6] = {
 	sine_128, sine_256, sine_512, sine_1024, sine_2048, sine_4096
 };
+/** \endcond sine_windows */
 
 /* Generate a sine window. */
 static void sine_window_init(float *window, int n)
@@ -229,8 +230,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 +247,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 +264,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 +272,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,7 +1213,7 @@ 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, out_size;
@@ -1222,12 +1224,11 @@ static void wmadec_post_select(__a_unused struct sched *s, struct task *t)
 
 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;
@@ -1263,11 +1264,11 @@ next_buffer:
 	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)