Merge commit 'meins/master'

[paraslash.git] / amp_filter.c

diff --git a/amp_filter.c b/amp_filter.c
index a62344a1520798787f5698b89db7ec085776ef2e..e180db437c6a26fe8c978fefccdd51841cd97fd0 100644 (file)
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -6,6 +6,8 @@
 
 /** \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)