/*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 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"
#include "string.h"
#include "error.h"
-/** The size of the output data buffer. */
-#define COMPRESS_CHUNK_SIZE 40960
-
/** Data specific to the compress filter. */
struct private_compress_data {
/** The current multiplier. */
int peak;
};
-static void close_compress(struct filter_node *fn)
+static void compress_close(struct filter_node *fn)
{
free(fn->private_data);
- free(fn->buf);
}
static void compress_post_select(__a_unused struct sched *s, struct task *t)
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 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->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);
+ compress_filter_cmdline_parser_free(conf);
}
/**
{
struct compress_filter_args_info dummy;
- compress_cmdline_parser_init(&dummy);
- f->open = open_compress;
- f->close = close_compress;
+ compress_filter_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;