/*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*/
#include <regex.h>
-#include <stdbool.h>
#include "para.h"
#include "compress_filter.cmdline.h"
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;
+ int sample = *ip++, adjusted_sample;
+
+ adjusted_sample = sample > 0? sample : -sample;
+ adjusted_sample *= pcd->current_gain;
+ adjusted_sample >>= gain_shift;
if (adjusted_sample > 32767) { /* clip */
PARA_NOTICE_LOG("clip: sample: %d, adjusted sample: %d\n",
sample, adjusted_sample);
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);
+ } else if (adjusted_sample > pcd->peak)
+ pcd->peak = adjusted_sample;
op[i] = sample >= 0? adjusted_sample : -adjusted_sample;
if (++pcd->num_samples & mask)
continue;
err:
assert(ret < 0);
t->error = ret;
- btr_remove_node(btrn);
+ btr_remove_node(&fn->btrn);
}
/** TODO: Add sanity checks */
static int compress_parse_config(int argc, char **argv, void **config)
{
- int ret;
- struct compress_filter_args_info *compress_conf
- = para_calloc(sizeof(*compress_conf));
+ struct compress_filter_args_info *conf = para_calloc(sizeof(*conf));
- ret = -E_COMPRESS_SYNTAX;
- if (compress_cmdline_parser(argc, argv, compress_conf))
- goto err;
- *config = compress_conf;
+ compress_filter_cmdline_parser(argc, argv, conf);
+ *config = conf;
return 1;
-err:
- free(compress_conf);
- return ret;
}
static void compress_open(struct filter_node *fn)
static void compress_free_config(void *conf)
{
- compress_cmdline_parser_free(conf);
+ compress_filter_cmdline_parser_free(conf);
}
/**
{
struct compress_filter_args_info dummy;
- compress_cmdline_parser_init(&dummy);
+ compress_filter_cmdline_parser_init(&dummy);
f->open = compress_open;
f->close = compress_close;
f->pre_select = generic_filter_pre_select;