Merge branch 'maint'

[paraslash.git] / amp_filter.c

diff --git a/amp_filter.c b/amp_filter.c
index 3154735e1753c87872963be7f5f7d83c47640655..29c62e3bf580931788d28c0dd5ddb051f119f256 100644 (file)
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -19,9 +19,6 @@
 #include "string.h"
 #include "error.h"
 
-/** The size of the output data buffer. */
-#define AMP_CHUNK_SIZE 40960
-
 extern char *stat_item_values[NUM_STAT_ITEMS];
 
 /** Data specific to the amplify filter. */
@@ -32,37 +29,9 @@ struct private_amp_data {
        unsigned amp;
 };
 
-static ssize_t amp_convert(char *inbuf, size_t inbuf_len, struct filter_node *fn)
-{
-       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;
-
-       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;
-       }
-out:
-       fn->loaded += length * 2;
-       return length * 2;
-}
-
 static void amp_close(struct filter_node *fn)
 {
        free(fn->private_data);
-       free(fn->buf);
 }
 
 static int amp_parse_config(int argc, char **argv, void **config)
@@ -75,8 +44,6 @@ static int amp_parse_config(int argc, char **argv, void **config)
        ret = -ERRNO_TO_PARA_ERROR(EINVAL);
        if (amp_conf->amp_arg < 0)
                goto err;
-       PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
-               amp_conf->amp_arg, amp_conf->amp_arg / 64.0 + 1.0);
        *config = amp_conf;
        return 1;
 err:
@@ -95,8 +62,8 @@ static void amp_open(struct filter_node *fn)
                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);
+       PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
+               pad->amp, pad->amp / 64.0 + 1.0);
 }
 
 static void amp_post_select(__a_unused struct sched *s, struct task *t)
@@ -112,11 +79,10 @@ static void amp_post_select(__a_unused struct sched *s, struct task *t)
        if (pad->amp == 0) { /* no amplification */
                t->error = -E_AMP_ZERO_AMP;
                btr_splice_out_node(btrn);
-               amp_close(fn);
                return;
        }
 next_buffer:
-       ret = btr_node_status(btrn, fn->min_iqs);
+       ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
        if (ret < 0)
                goto err;
        if (ret == 0)
@@ -156,6 +122,11 @@ err:
        btr_remove_node(btrn);
 }
 
+static void amp_free_config(void *conf)
+{
+       amp_cmdline_parser_free(conf);
+}
+
 /**
  * The init function of the amplify filter.
  *
@@ -168,10 +139,10 @@ void amp_filter_init(struct filter *f)
        amp_cmdline_parser_init(&dummy);
        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->free_config = amp_free_config;
        f->help = (struct ggo_help) {
                .short_help = amp_filter_args_info_help,
                .detailed_help = amp_filter_args_info_detailed_help