Switch audiod over to the buffer tree API.

[paraslash.git] / compress_filter.c

diff --git a/compress_filter.c b/compress_filter.c
index 65bc8e51ba0f3fe11126b53e04b774e70dd9872d..39055618cde7ea16bfd5f2207f4b00a3b314c5e2 100644 (file)
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -10,11 +10,15 @@
  * Uses ideas of AudioCompress, (C) 2002-2004  M. Hari Nezumi <magenta@trikuare.cx>
  */
 
+#include <regex.h>
+#include <stdbool.h>
+
 #include "para.h"
 #include "compress_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"
@@ -51,7 +55,7 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
                /* be careful in that heat, my dear */
                int sample = *ip++, adjusted_sample = (PARA_ABS(sample) *
                        pcd->current_gain) >> gain_shift;
-               if (unlikely(adjusted_sample > 32767)) { /* clip */
+               if (adjusted_sample > 32767) { /* clip */
                        PARA_NOTICE_LOG("clip: sample: %d, adjusted sample: %d\n",
                                sample, adjusted_sample);
                        adjusted_sample = 32767;
@@ -61,7 +65,7 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
                } else
                        pcd->peak = PARA_MAX(pcd->peak, adjusted_sample);
                *op++ = sample >= 0? adjusted_sample : -adjusted_sample;
-               if (likely(++pcd->num_samples & mask))
+               if (++pcd->num_samples & mask)
                        continue;
 //             PARA_DEBUG_LOG("gain: %u, peak: %u\n", pcd->current_gain,
 //                     pcd->peak);
@@ -83,6 +87,77 @@ static void close_compress(struct filter_node *fn)
        free(fn->buf);
 }
 
+static void compress_post_select(__a_unused struct sched *s, struct task *t)
+{
+       struct filter_node *fn = container_of(t, struct filter_node, task);
+       struct private_compress_data *pcd = fn->private_data;
+       struct btr_node *btrn = fn->btrn;
+       bool inplace = btr_inplace_ok(btrn);
+       int ret;
+       char *inbuf;
+       size_t length, i;
+       int16_t *ip, *op;
+       unsigned gain_shift = pcd->conf->inertia_arg + pcd->conf->damp_arg,
+               mask = (1 << pcd->conf->blocksize_arg) - 1;
+
+       //inplace = false;
+next_buffer:
+       t->error = 0;
+       ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
+       if (ret < 0)
+               goto err;
+       if (ret == 0)
+               return;
+       btr_merge(btrn, fn->min_iqs);
+       length = btr_next_buffer(btrn, &inbuf) & ~(size_t)1;
+       if (length == 0) { /* eof and 1 byte available */
+               ret = -E_COMPRESS_EOF;
+               goto err;
+       }
+       ip = (int16_t *)inbuf;
+       if (inplace)
+               op = ip;
+       else
+               op = para_malloc(length);
+       for (i = 0; i < length / 2; i++) {
+               /* be careful in that heat, my dear */
+               int sample = *ip++, adjusted_sample = (PARA_ABS(sample) *
+                       pcd->current_gain) >> gain_shift;
+               if (adjusted_sample > 32767) { /* clip */
+                       PARA_NOTICE_LOG("clip: sample: %d, adjusted sample: %d\n",
+                               sample, adjusted_sample);
+                       adjusted_sample = 32767;
+                       pcd->current_gain = (3 * pcd->current_gain +
+                               (1 << pcd->conf->inertia_arg)) / 4;
+                       pcd->peak = 0;
+               } else
+                       pcd->peak = PARA_MAX(pcd->peak, adjusted_sample);
+               op[i] = sample >= 0? adjusted_sample : -adjusted_sample;
+               if (++pcd->num_samples & mask)
+                       continue;
+//             PARA_DEBUG_LOG("gain: %u, peak: %u\n", pcd->current_gain,
+//                     pcd->peak);
+               if (pcd->peak < pcd->conf->target_level_arg) {
+                       if (pcd->current_gain < pcd->max_gain)
+                               pcd->current_gain++;
+               } else
+                       pcd->current_gain = PARA_MAX(pcd->current_gain - 2,
+                               1U << pcd->conf->inertia_arg);
+               pcd->peak = 0;
+       }
+       if (inplace)
+               btr_pushdown_one(btrn);
+       else {
+               btr_consume(btrn, length);
+               btr_add_output((char *)op, length, btrn);
+       }
+       goto next_buffer;
+err:
+       assert(ret < 0);
+       t->error = ret;
+       btr_remove_node(btrn);
+}
+
 /** TODO: Add sanity checks */
 static int compress_parse_config(int argc, char **argv, void **config)
 {
@@ -106,12 +181,18 @@ static void open_compress(struct filter_node *fn)
                sizeof(struct private_compress_data));
        pcd->conf = fn->conf;
        fn->private_data = pcd;
+       fn->min_iqs = 2; /* 16 bit audio */
        fn->bufsize = COMPRESS_CHUNK_SIZE;
        fn->buf = para_malloc(fn->bufsize);
        pcd->current_gain = 1 << pcd->conf->inertia_arg;
        pcd->max_gain = 1 << (pcd->conf->inertia_arg + pcd->conf->aggressiveness_arg);
 }
 
+static void compress_free_config(void *conf)
+{
+       compress_cmdline_parser_free(conf);
+}
+
 /**
  * The init function of the compress filter.
  *
@@ -125,7 +206,10 @@ void compress_filter_init(struct filter *f)
        f->open = open_compress;
        f->close = close_compress;
        f->convert = compress;
+       f->pre_select = generic_filter_pre_select;
+       f->post_select = compress_post_select;
        f->parse_config = compress_parse_config;
+       f->free_config = compress_free_config;
        f->help = (struct ggo_help) {
                .short_help = compress_filter_args_info_help,
                .detailed_help = compress_filter_args_info_detailed_help