X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=amp_filter.c;h=e180db437c6a26fe8c978fefccdd51841cd97fd0;hp=a88719e33544b4a08e3d74862ee54cf13cae3d19;hb=6df1cc12ccd144c028f9d4a38aea6bf80dc3e554;hpb=ebe54cf6ee1b9c5daf7837cb618c299a5b5187e0

diff --git a/amp_filter.c b/amp_filter.c
index a88719e3..e180db43 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -1,11 +1,13 @@
 /*
- * Copyright (C) 2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file amp_filter.c Paraslash's amplify filter. */
 
+#include <regex.h>
+
 #include "para.h"
 #include "amp_filter.cmdline.h"
 #include "list.h"
@@ -30,19 +32,29 @@ struct private_amp_data {
 
 static ssize_t amp_convert(char *inbuf, size_t inbuf_len, struct filter_node *fn)
 {
-	size_t i, length = PARA_MIN((inbuf_len / 2) * 2,
-		(fn->bufsize - fn->loaded) / 2 * 2);
+	size_t i, length = PARA_MIN((inbuf_len / 2),
+		(fn->bufsize - fn->loaded) / 2);
 	struct private_amp_data *pad = fn->private_data;
 	int16_t *ip = (int16_t *)inbuf, *op = (int16_t *)(fn->buf + fn->loaded);
+	int factor = 64 + pad->amp;
 
 	if (!length)
 		return 0;
-	for (i = 0; i < length / 2; i++) {
-		int x = (PARA_ABS(*ip) * (64 + pad->amp)) >> 6;
-		*op++ = *ip++ > 0? PARA_MIN(x, 32767) : PARA_MAX(-x, -32768);
+
+	if (pad->amp == 0) {
+		memcpy(op, ip, length * 2);
+		goto out;
+	}
+	for (i = 0; i < length; i++) {
+		int x = (ip[i] * factor) >> 6;
+
+		op[i] = x;
+		if (op[i] != x)
+			op[i] = (x >= 32768)? 32767 : -32768;
 	}
-	fn->loaded += length;
-	return length;
+out:
+	fn->loaded += length * 2;
+	return length * 2;
 }
 
 static void amp_close(struct filter_node *fn)
@@ -76,11 +88,9 @@ static void amp_open(struct filter_node *fn)
 
 	pad->conf = fn->conf;
 	fn->private_data = pad;
-	if (!pad->conf->amp_given && stat_item_values[SI_AMPLIFICATION]) {
-		int i = SI_AMPLIFICATION;
-		char *s = stat_item_values[i] + strlen(status_item_list[i]) + 1;
-		sscanf(s, "%u", &pad->amp);
-	} else
+	if (!pad->conf->amp_given && stat_item_values[SI_AMPLIFICATION])
+		sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp);
+	else
 		pad->amp = pad->conf->amp_arg;
 	fn->bufsize = AMP_CHUNK_SIZE;
 	fn->buf = para_malloc(fn->bufsize);