audiod: Kill noisy debug message.

[paraslash.git] / amp_filter.c

diff --git a/amp_filter.c b/amp_filter.c
index c0835f806ad322480cb38e7ca851b1ef78b3e366..690080bd2844073b2dc82168a7c5accf6e7221b3 100644 (file)
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -75,8 +75,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:
@@ -97,6 +95,8 @@ static void amp_open(struct filter_node *fn)
                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,18 +112,21 @@ 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 = prepare_filter_node(fn);
-       in_bytes = btr_next_buffer(btrn, (char **)&in);
+       ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
        if (ret < 0)
                goto err;
-       len = in_bytes / 2;
-       /* len == 0 happens if eof and in_bytes == 1. */
-       if (ret == 0 || len == 0)
+       if (ret == 0)
                return;
+       btr_merge(btrn, fn->min_iqs);
+       in_bytes = btr_next_buffer(btrn, (char **)&in);
+       len = in_bytes / 2;
+       if (len == 0) { /* eof and in_bytes == 1 */
+               ret = -E_AMP_EOF;
+               goto err;
+       }
 
        if (inplace)
                out = in;
@@ -149,8 +152,12 @@ next_buffer:
 err:
        assert(ret < 0);
        t->error = ret;
-       btr_del_node(btrn);
-       amp_close(fn);
+       btr_remove_node(btrn);
+}
+
+static void amp_free_config(void *conf)
+{
+       amp_cmdline_parser_free(conf);
 }
 
 /**
@@ -169,6 +176,7 @@ void amp_filter_init(struct filter *f)
        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