X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress_filter.c;h=d26fe233a85d062f839615e12f04367b582a2d85;hp=b488f55cb3ae2471201ab518ae84e3603ebcf005;hb=8f69a1302a52163c61142531c4a6944510c3ec12;hpb=56df9bb38aa4725f9244a7898d765608d8a1fffa

diff --git a/compress_filter.c b/compress_filter.c
index b488f55c..d26fe233 100644
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file compress_filter.c Paraslash's dynamic audio range compressor. */
 
@@ -11,23 +7,23 @@
  */
 
 #include <regex.h>
+#include <lopsub.h>
 
+#include "filter_cmd.lsg.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"
 
+#define U32_OPTVAL(_opt, _lpr) (FILTER_CMD_OPT_UINT32_VAL(COMPRESS, _opt, _lpr))
+
 /** Data specific to the compress filter. */
 struct private_compress_data {
 	/** The current multiplier. */
 	unsigned current_gain;
-	/** Points to the configuration data for this instance of the compress filter. */
-	struct compress_filter_args_info *conf;
 	/** Maximal admissible gain. */
 	unsigned max_gain;
 	/** Number of samples already seen. */
@@ -41,9 +37,9 @@ static void compress_close(struct filter_node *fn)
 	free(fn->private_data);
 }
 
-static int compress_post_select(__a_unused struct sched *s, struct task *t)
+static int compress_post_select(__a_unused struct sched *s, void *context)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
 	struct private_compress_data *pcd = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
 	bool inplace = btr_inplace_ok(btrn);
@@ -51,9 +47,9 @@ static int compress_post_select(__a_unused struct sched *s, struct task *t)
 	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;
-
+	uint32_t inertia = U32_OPTVAL(INERTIA, fn->lpr);
+	unsigned gain_shift = inertia + U32_OPTVAL(DAMP, fn->lpr),
+		mask = (1 << U32_OPTVAL(BLOCKSIZE, fn->lpr)) - 1;
 	//inplace = false;
 next_buffer:
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
@@ -86,7 +82,7 @@ next_buffer:
 		if (sample > 32767) { /* clip */
 			sample = 32767;
 			pcd->current_gain = (3 * pcd->current_gain +
-				(1 << pcd->conf->inertia_arg)) / 4;
+				(1 << inertia)) / 4;
 			pcd->peak = 0;
 		} else if (sample > pcd->peak)
 			pcd->peak = sample;
@@ -95,12 +91,12 @@ next_buffer:
 			continue;
 //		PARA_DEBUG_LOG("gain: %u, peak: %u\n", pcd->current_gain,
 //			pcd->peak);
-		if (pcd->peak < pcd->conf->target_level_arg) {
+		if (pcd->peak < U32_OPTVAL(TARGET_LEVEL, fn->lpr)) {
 			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);
+				1U << inertia);
 		pcd->peak = 0;
 	}
 	if (inplace)
@@ -116,47 +112,21 @@ err:
 	return ret;
 }
 
-/** TODO: Add sanity checks */
-static int compress_parse_config(int argc, char **argv, void **config)
-{
-	struct compress_filter_args_info *conf = para_calloc(sizeof(*conf));
-
-	compress_filter_cmdline_parser(argc, argv, conf);
-	*config = conf;
-	return 1;
-}
-
 static void compress_open(struct filter_node *fn)
 {
-	struct private_compress_data *pcd = para_calloc(
-		sizeof(struct private_compress_data));
-	pcd->conf = fn->conf;
+	struct private_compress_data *pcd = para_calloc(sizeof(*pcd));
+	uint32_t inertia = U32_OPTVAL(INERTIA, fn->lpr);
+	uint32_t aggressiveness = U32_OPTVAL(AGGRESSIVENESS, fn->lpr);
+
 	fn->private_data = pcd;
 	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);
+	pcd->current_gain = 1U << inertia;
+	pcd->max_gain = 1U << (inertia + aggressiveness);
 }
 
-static void compress_free_config(void *conf)
-{
-	compress_filter_cmdline_parser_free(conf);
-}
-
-/**
- * The init function of the compress filter.
- *
- * \param f Pointer to the struct to initialize.
- */
-void compress_filter_init(struct filter *f)
-{
-	struct compress_filter_args_info dummy;
-
-	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;
-	f->free_config = compress_free_config;
-	f->help = (struct ggo_help)DEFINE_GGO_HELP(compress_filter);
-}
+const struct filter lsg_filter_cmd_com_compress_user_data = {
+	.open = compress_open,
+	.close = compress_close,
+	.pre_select = generic_filter_pre_select,
+	.post_select = compress_post_select,
+};