X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=a35c174283a4e08b10b8f759839e7656396dbf50;hp=7d89d112a53d074cf3538cf890062b7afa87278c;hb=4ac3134c050ba28b57e0ae9686eb1f6d83e6d586;hpb=d16fe3df649cb48d5ffa26187da3dad4c3066646

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 7d89d112..a35c1742 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -71,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];
@@ -502,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);
@@ -1213,11 +1214,11 @@ static int wmadec_execute(struct btr_node *btrn, const char *cmd, char **result)
 static void 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;
@@ -1246,29 +1247,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;
 err:
 	assert(ret < 0);
 	t->error = ret;
-	btr_remove_node(btrn);
+	btr_remove_node(&fn->btrn);
 }
 
 static void wmadec_open(struct filter_node *fn)