X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=be726108818b826ebc4a7f17ac773eb31a1786b8;hp=1f72293273f32cac61b39ad669af2b0310b146ff;hb=5d5132e5bf39298739737d75aafb66a7405978a3;hpb=13e495610a45d1cacdf9fa375472b302d30cd23e

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 1f722932..be726108 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <regex.h>
 #include <sys/select.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
@@ -72,7 +71,9 @@ struct private_wmadec_data {
 	int use_exp_vlc;
 	/** Whether perceptual noise is added. */
 	int use_noise_coding;
+	/** Depends on number of the bits per second and the frame length. */
 	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];
@@ -142,15 +143,15 @@ struct private_wmadec_data {
 };
 
 #define EXPVLCBITS 8
-#define EXPMAX ((19 + EXPVLCBITS - 1) / EXPVLCBITS)
+#define EXPMAX DIV_ROUND_UP(19, EXPVLCBITS)
 
 #define HGAINVLCBITS 9
-#define HGAINMAX ((13 + HGAINVLCBITS - 1) / HGAINVLCBITS)
+#define HGAINMAX DIV_ROUND_UP(13, HGAINVLCBITS)
 
 #define VLCBITS 9
-#define VLCMAX ((22 + VLCBITS - 1) / VLCBITS)
+#define VLCMAX DIV_ROUND_UP(22, VLCBITS)
 
-#define SINE_WINDOW(x) float sine_ ## x[x] __a_aligned(16)
+#define SINE_WINDOW(x) static float sine_ ## x[x] __a_aligned(16)
 
 SINE_WINDOW(128);
 SINE_WINDOW(256);
@@ -503,9 +504,8 @@ static int wma_decode_init(char *initial_buf, int len, struct private_wmadec_dat
 
 	if (pwd->use_exp_vlc) {
 		PARA_INFO_LOG("using exp_vlc\n");
-		init_vlc(&pwd->exp_vlc, EXPVLCBITS,
-		sizeof(wma_scale_huffbits), wma_scale_huffbits,
-		wma_scale_huffcodes, 4);
+		init_vlc(&pwd->exp_vlc, EXPVLCBITS, sizeof(wma_scale_huffbits),
+			wma_scale_huffbits, wma_scale_huffcodes, 4);
 	} else {
 		PARA_INFO_LOG("using curve\n");
 		wma_lsp_to_curve_init(pwd, pwd->frame_len);
@@ -769,7 +769,6 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd,
 				*coefs++ = 0.0;
 			continue;
 		}
-		mult1 = mult;
 		n1 = pwd->exponent_high_sizes[bsize];
 		/* compute power of high bands */
 		exponents = pwd->exponents[ch] +
@@ -803,8 +802,7 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd,
 				mult1 = sqrt(exp_power[j]
 					/ exp_power[last_high_band]);
 				/* XXX: use a table */
-				mult1 = mult1 * pow(10,
-					pwd->high_band_values[ch][j] * 0.05);
+				mult1 *= pow(10, pwd->high_band_values[ch][j] * 0.05);
 				mult1 /= (pwd->max_exponent[ch] * pwd->noise_mult);
 				mult1 *= mdct_norm;
 				for (i = 0; i < n; i++) {
@@ -1012,7 +1010,6 @@ next:
 	for (ch = 0; ch < pwd->ahi.channels; ch++) {
 		int n4, idx;
 
-		n = pwd->block_len;
 		n4 = pwd->block_len / 2;
 		if (pwd->channel_coded[ch])
 			imdct(pwd->mdct_ctx[bsize], pwd->output, pwd->coefs[ch]);