X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=6a5df98e9b832ad1b2b43c76716817e73944f2e8;hp=525ed3150cda5affb9b479029b7e9aa5f461a0aa;hb=8e48e706ab1acc7dff83d5ceb446dccd75d9abdc;hpb=764e71ceb1e188086c08e38dfd52d45b67dc15ba

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 525ed315..6a5df98e 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -159,23 +159,6 @@ static void sine_window_init(float *window, int n)
 		window[i] = sinf((i + 0.5) * (M_PI / (2.0 * n)));
 }
 
-static void wmadec_cleanup(struct private_wmadec_data *pwd)
-{
-	int i;
-
-	for (i = 0; i < pwd->nb_block_sizes; i++)
-		imdct_end(pwd->mdct_ctx[i]);
-	if (pwd->ahi.use_exp_vlc)
-		free_vlc(&pwd->exp_vlc);
-	if (pwd->use_noise_coding)
-		free_vlc(&pwd->hgain_vlc);
-	for (i = 0; i < 2; i++) {
-		free_vlc(&pwd->coef_vlc[i]);
-		free(pwd->run_table[i]);
-		free(pwd->level_table[i]);
-	}
-}
-
 static void init_coef_vlc(struct vlc *vlc, uint16_t **prun_table,
 		uint16_t **plevel_table, const struct coef_vlc_table *vlc_table)
 {
@@ -581,7 +564,7 @@ static int decode_exp_vlc(struct private_wmadec_data *pwd, int ch)
 	last_exp = 36;
 
 	while (q < q_end) {
-		code = get_vlc(&pwd->gb, pwd->exp_vlc.table, EXPVLCBITS);
+		code = get_vlc(&pwd->gb, &pwd->exp_vlc);
 		if (code < 0)
 			return code;
 		/* NOTE: this offset is the same as MPEG4 AAC ! */
@@ -708,8 +691,7 @@ static int compute_high_band_values(struct private_wmadec_data *pwd,
 			if (val == (int)0x80000000)
 				val = get_bits(&pwd->gb, 7) - 19;
 			else {
-				int code = get_vlc(&pwd->gb,
-					pwd->hgain_vlc.table, HGAINVLCBITS);
+				int code = get_vlc(&pwd->gb, &pwd->hgain_vlc);
 				if (code < 0)
 					return code;
 				val += code - 18;
@@ -940,7 +922,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
 		eptr = ptr + nb_coefs[ch];
 		memset(ptr, 0, pwd->block_len * sizeof(int16_t));
 		for (;;) {
-			code = get_vlc(&pwd->gb, coef_vlc->table, VLCBITS);
+			code = get_vlc(&pwd->gb, coef_vlc);
 			if (code < 0)
 				return code;
 			if (code == 1) /* EOB */
@@ -1174,10 +1156,21 @@ fail:
 static void wmadec_close(struct filter_node *fn)
 {
 	struct private_wmadec_data *pwd = fn->private_data;
+	int i;
 
 	if (!pwd)
 		return;
-	wmadec_cleanup(pwd);
+	for (i = 0; i < pwd->nb_block_sizes; i++)
+		imdct_end(pwd->mdct_ctx[i]);
+	if (pwd->ahi.use_exp_vlc)
+		free_vlc(&pwd->exp_vlc);
+	if (pwd->use_noise_coding)
+		free_vlc(&pwd->hgain_vlc);
+	for (i = 0; i < 2; i++) {
+		free_vlc(&pwd->coef_vlc[i]);
+		free(pwd->run_table[i]);
+		free(pwd->level_table[i]);
+	}
 	free(fn->private_data);
 	fn->private_data = NULL;
 }