X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=525ed3150cda5affb9b479029b7e9aa5f461a0aa;hp=cb3660571a5c5cd27cbaab4bd7d3a9f20d82ae28;hb=40a60cb3cfe62626a41f677046e714c0577dc745;hpb=d565f0e8aedfb8efab7028de03ce35eb141df8d1

diff --git a/wmadec_filter.c b/wmadec_filter.c
index cb366057..525ed315 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -24,11 +24,11 @@
 #include "para.h"
 #include "error.h"
 #include "list.h"
-#include "ggo.h"
 #include "string.h"
 #include "sched.h"
 #include "buffer_tree.h"
 #include "filter.h"
+#include "portable_io.h"
 #include "bitstream.h"
 #include "imdct.h"
 #include "wma.h"
@@ -371,8 +371,8 @@ static int wma_init(struct private_wmadec_data *pwd)
 		else
 			high_freq = high_freq * 0.5;
 	}
-	PARA_INFO_LOG("channels=%d sample_rate=%d "
-		"bitrate=%d block_align=%d\n",
+	PARA_INFO_LOG("channels=%u sample_rate=%u "
+		"bitrate=%u block_align=%d\n",
 		ahi->channels, ahi->sample_rate,
 		ahi->bit_rate, ahi->block_align);
 	PARA_INFO_LOG("frame_len=%d, bps=%f bps1=%f "
@@ -1028,7 +1028,7 @@ static inline int16_t av_clip_int16(int a)
 /* Decode a frame of frame_len samples. */
 static int wma_decode_frame(struct private_wmadec_data *pwd, int16_t *samples)
 {
-	int ret, i, n, ch, incr;
+	int ret, i, ch;
 	int16_t *ptr;
 	float *iptr;
 
@@ -1043,15 +1043,13 @@ static int wma_decode_frame(struct private_wmadec_data *pwd, int16_t *samples)
 	}
 
 	/* convert frame to integer */
-	n = pwd->frame_len;
-	incr = pwd->ahi.channels;
 	for (ch = 0; ch < pwd->ahi.channels; ch++) {
 		ptr = samples + ch;
 		iptr = pwd->frame_out[ch];
 
-		for (i = 0; i < n; i++) {
+		for (i = 0; i < pwd->frame_len; i++) {
 			*ptr = av_clip_int16(lrintf(*iptr++));
-			ptr += incr;
+			ptr += pwd->ahi.channels;
 		}
 		/* prepare for next block */
 		memmove(&pwd->frame_out[ch][0], &pwd->frame_out[ch][pwd->frame_len],
@@ -1261,16 +1259,10 @@ static void wmadec_open(struct filter_node *fn)
 	fn->min_iqs = 4096;
 }
 
-/**
- * The init function of the wma decoder.
- *
- * \param f Its fields are filled in by the function.
- */
-void wmadec_filter_init(struct filter *f)
-{
-	f->open = wmadec_open;
-	f->close = wmadec_close;
-	f->execute = wmadec_execute;
-	f->pre_select = generic_filter_pre_select;
-	f->post_select = wmadec_post_select;
-}
+const struct filter lsg_filter_cmd_com_wmadec_user_data = {
+	.open = wmadec_open,
+	.close = wmadec_close,
+	.execute = wmadec_execute,
+	.pre_select = generic_filter_pre_select,
+	.post_select = wmadec_post_select,
+};