X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=wmadec_filter.c;h=41dd51f96bb7fa49522a2749256802d45fa60de3;hb=c6dff555d7ed916d47b5739923613a265042c1a0;hp=c1f0c302960999704658c89560c1d1d7631808e4;hpb=9b12b292d9b523f44174fc2b6827ec2f519b9235;p=paraslash.git

diff --git a/wmadec_filter.c b/wmadec_filter.c
index c1f0c302..41dd51f9 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -88,8 +88,8 @@ struct private_wmadec_data {
 	int frame_len_bits;
 	/** Number of block sizes, one if !ahi->use_variable_block_len. */
 	int nb_block_sizes;
-	/* block info */
-	int reset_block_lengths;
+	/* Whether to update block lengths from getbit context. */
+	bool reset_block_lengths;
 	/** log2 of current block length. */
 	int block_len_bits;
 	/** log2 of next block length. */
@@ -391,7 +391,7 @@ static int wma_init(struct private_wmadec_data *pwd)
 		pwd->windows[i] = sine_windows[pwd->frame_len_bits - i - 7];
 	}
 
-	pwd->reset_block_lengths = 1;
+	pwd->reset_block_lengths = true;
 
 	if (pwd->use_noise_coding) {
 		/* init the noise generator */
@@ -429,13 +429,13 @@ static int wma_init(struct private_wmadec_data *pwd)
 	return 0;
 }
 
-static void wma_lsp_to_curve_init(struct private_wmadec_data *pwd, int frame_len)
+static void wma_lsp_to_curve_init(struct private_wmadec_data *pwd)
 {
 	float wdel, a, b;
 	int i, e, m;
 
-	wdel = M_PI / frame_len;
-	for (i = 0; i < frame_len; i++)
+	wdel = M_PI / pwd->frame_len;
+	for (i = 0; i < pwd->frame_len; i++)
 		pwd->lsp_cos_table[i] = 2.0f * cos(wdel * i);
 
 	/* tables for x^-0.25 computation */
@@ -491,7 +491,7 @@ static int wma_decode_init(char *initial_buf, int len, struct private_wmadec_dat
 			wma_scale_huffbits, wma_scale_huffcodes, 4);
 	} else {
 		PARA_INFO_LOG("using curve\n");
-		wma_lsp_to_curve_init(pwd, pwd->frame_len);
+		wma_lsp_to_curve_init(pwd);
 	}
 	*result = pwd;
 	return pwd->ahi.header_len;
@@ -810,7 +810,7 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd,
 		}
 		/* very high freqs: noise */
 		n = pwd->block_len - pwd->coefs_end[bsize];
-		mult1 = mult * exponents[((-1 << bsize)) >> esize];
+		mult1 = mult * exponents[(-(1 << bsize)) >> esize];
 		for (i = 0; i < n; i++) {
 			*coefs++ = pwd->noise_table[pwd->noise_index] * mult1;
 			pwd->noise_index = (pwd->noise_index + 1)
@@ -834,7 +834,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
 		n = wma_log2(pwd->nb_block_sizes - 1) + 1;
 
 		if (pwd->reset_block_lengths) {
-			pwd->reset_block_lengths = 0;
+			pwd->reset_block_lengths = false;
 			v = get_bits(&pwd->gb, n);
 			if (v >= pwd->nb_block_sizes)
 				return -E_WMA_BLOCK_SIZE;
@@ -1068,10 +1068,13 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
 
 	if (buf_size == 0) {
 		pwd->last_superframe_len = 0;
+		*data_size = 0;
 		return 0;
 	}
-	if (buf_size < pwd->ahi.block_align)
+	if (buf_size < pwd->ahi.block_align) {
+		*data_size = 0;
 		return 0;
+	}
 	buf_size = pwd->ahi.block_align;
 	samples = data;
 	init_get_bits(&pwd->gb, buf, buf_size);
@@ -1129,7 +1132,7 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
 		if (len > 0)
 			skip_bits(&pwd->gb, len);
 
-		pwd->reset_block_lengths = 1;
+		pwd->reset_block_lengths = true;
 		for (i = 0; i < nb_frames; i++) {
 			ret = wma_decode_frame(pwd, samples);
 			if (ret < 0)
@@ -1221,12 +1224,12 @@ next_buffer:
 			fn->min_iqs += 4096;
 			goto next_buffer;
 		}
-		fn->min_iqs = 2 * (WMA_FRAME_SKIP + pwd->ahi.block_align);
+		fn->min_iqs = 2 * pwd->ahi.packet_size;
 		fn->private_data = pwd;
 		converted = pwd->ahi.header_len;
 		goto success;
 	}
-	fn->min_iqs = WMA_FRAME_SKIP + pwd->ahi.block_align;
+	fn->min_iqs = pwd->ahi.packet_size;
 	if (fn->min_iqs > len)
 		goto success;
 	out_size = WMA_OUTPUT_BUFFER_SIZE;
@@ -1237,10 +1240,12 @@ next_buffer:
 		free(out);
 		goto err;
 	}
-	out = para_realloc(out, out_size);
-	if (out_size > 0)
+	if (out_size > 0) {
+		out = para_realloc(out, out_size);
 		btr_add_output(out, out_size, btrn);
-	converted += ret + WMA_FRAME_SKIP;
+	} else
+		free(out);
+	converted += pwd->ahi.packet_size;
 success:
 	btr_consume(btrn, converted);
 	return 0;