time.c: tv_convex_combination() fixes.
[paraslash.git] / compress_filter.c
index 6034ce7..09a4c74 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  * 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"
 
-/** The size of the output data buffer. */
-#define COMPRESS_CHUNK_SIZE 40960
-
-extern char *stat_item_values[NUM_STAT_ITEMS];
-
 /** Data specific to the compress filter. */
 struct private_compress_data {
        /** The current multiplier. */
@@ -34,25 +34,51 @@ struct private_compress_data {
        /** Number of samples already seen. */
        unsigned num_samples;
        /** Absolute value of the maximal sample in the current block. */
-       unsigned peak;
+       int peak;
 };
 
-static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
+static void compress_close(struct filter_node *fn)
 {
-       size_t i, length = PARA_MIN((inbuf_len / 2) * 2,
-               (fn->bufsize - fn->loaded) / 2 * 2);
+       free(fn->private_data);
+}
+
+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;
-       int16_t *ip = (int16_t *)inbuf, *op = (int16_t *)(fn->buf + fn->loaded);
+       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;
 
-       if (!length)
-               return 0;
+       //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 (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,8 +87,8 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
                        pcd->peak = 0;
                } else
                        pcd->peak = PARA_MAX(pcd->peak, adjusted_sample);
-               *op++ = sample >= 0? adjusted_sample : -adjusted_sample;
-               if (likely(++pcd->num_samples & mask))
+               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);
@@ -71,17 +97,20 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
                                pcd->current_gain++;
                } else
                        pcd->current_gain = PARA_MAX(pcd->current_gain - 2,
-                               1 << pcd->conf->inertia_arg);
+                               1U << pcd->conf->inertia_arg);
                pcd->peak = 0;
        }
-       fn->loaded += length;
-       return length;
-}
-
-static void close_compress(struct filter_node *fn)
-{
-       free(fn->private_data);
-       free(fn->buf);
+       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 */
@@ -101,18 +130,22 @@ err:
        return  ret;
 }
 
-static void open_compress(struct filter_node *fn)
+static void compress_open(struct filter_node *fn)
 {
        struct private_compress_data *pcd = para_calloc(
                sizeof(struct private_compress_data));
        pcd->conf = fn->conf;
        fn->private_data = pcd;
-       fn->bufsize = COMPRESS_CHUNK_SIZE;
-       fn->buf = para_malloc(fn->bufsize);
+       fn->min_iqs = 2; /* 16 bit audio */
        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.
  *
@@ -120,9 +153,17 @@ static void open_compress(struct filter_node *fn)
  */
 void compress_filter_init(struct filter *f)
 {
-       f->open = open_compress;
-       f->close = close_compress;
-       f->convert = compress;
-       f->print_help = compress_cmdline_parser_print_help;
+       struct compress_filter_args_info dummy;
+
+       compress_cmdline_parser_init(&dummy);
+       f->open = compress_open;
+       f->close = compress_close;
+       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
+       };
 }