Add btr support for the compress filter.

[paraslash.git] / amp_filter.c

diff --git a/amp_filter.c b/amp_filter.c
index a62344a1520798787f5698b89db7ec085776ef2e..0ed2d8e0f13e5391698901fc9dd6e5af1af3463d 100644 (file)
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -6,11 +6,15 @@
 
 /** \file amp_filter.c Paraslash's amplify filter. */
 
+#include <regex.h>
+#include <stdbool.h>
+
 #include "para.h"
 #include "amp_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "filter.h"
 #include "string.h"
 #include "error.h"
@@ -30,19 +34,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;
        }
-       fn->loaded += length;
-       return length;
+       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;
+       }
+out:
+       fn->loaded += length * 2;
+       return length * 2;
 }
 
 static void amp_close(struct filter_node *fn)
@@ -84,6 +98,55 @@ static void amp_open(struct filter_node *fn)
        fn->buf = para_malloc(fn->bufsize);
 }
 
+static void amp_post_select(__a_unused struct sched *s, struct task *t)
+{
+       struct filter_node *fn = container_of(t, struct filter_node, task);
+       struct private_amp_data *pad = fn->private_data;
+       struct btr_node *btrn = fn->btrn;
+       int ret, factor = 64 + pad->amp;
+       char *in;
+       size_t in_len = btr_next_buffer(btrn, &in);
+       size_t i, length = in_len / 2;
+       int16_t *ip = (int16_t *)in, *op;
+       bool inplace = btr_inplace_ok(btrn);
+
+       ret = prepare_filter_node(fn);
+       if (ret < 0)
+               goto err;
+       if (ret == 0)
+               return;
+
+       if (inplace)
+               op = ip;
+       else
+               op = para_malloc(length * 2);
+       if (pad->amp == 0) {
+               memcpy(op, ip, length * 2);
+               goto success;
+       }
+       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;
+       }
+success:
+       t->error = 0;
+       if (inplace)
+               btr_pushdown_one(btrn);
+       else {
+               btr_consume(btrn, length * 2);
+               btr_add_output((char *)op, length * 2, btrn);
+       }
+       return;
+err:
+       assert(ret < 0);
+       amp_close(fn);
+       t->error = ret;
+       btr_del_node(btrn);
+}
+
 /**
  * The init function of the amplify filter.
  *
@@ -97,6 +160,8 @@ void amp_filter_init(struct filter *f)
        f->open = amp_open;
        f->close = amp_close;
        f->convert = amp_convert;
+       f->pre_select = generic_filter_pre_select;
+       f->post_select = amp_post_select;
        f->parse_config = amp_parse_config;
        f->help = (struct ggo_help) {
                .short_help = amp_filter_args_info_help,