X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress_filter.c;h=d0d96fd960955bcccedc731eb33221d5369e778f;hp=eee37518fd3ef0c5b52f3a4e116ff1767d360db3;hb=534a94f441767947874cb15d18211edf758e9277;hpb=e90440367f744a7723b201a95888e66f070ffa92

diff --git a/compress_filter.c b/compress_filter.c
index eee37518..d0d96fd9 100644
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -11,7 +11,6 @@
  */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "compress_filter.cmdline.h"
@@ -42,9 +41,9 @@ static void compress_close(struct filter_node *fn)
 	free(fn->private_data);
 }
 
-static void 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);
@@ -57,12 +56,11 @@ static void compress_post_select(__a_unused struct sched *s, struct task *t)
 
 	//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;
+		return 0;
 	btr_merge(btrn, fn->min_iqs);
 	length = btr_next_buffer(btrn, &inbuf) & ~(size_t)1;
 	if (length == 0) { /* eof and 1 byte available */
@@ -76,18 +74,23 @@ next_buffer:
 		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;
+		int sample = *ip++;
+		bool neg = false;
+
+		if (sample < 0) {
+			sample = -sample;
+			neg = true;
+		}
+		sample *= pcd->current_gain;
+		sample >>= gain_shift;
+		if (sample > 32767) { /* clip */
+			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;
+		} else if (sample > pcd->peak)
+			pcd->peak = sample;
+		op[i] = neg? -sample : sample;
 		if (++pcd->num_samples & mask)
 			continue;
 //		PARA_DEBUG_LOG("gain: %u, peak: %u\n", pcd->current_gain,
@@ -109,25 +112,18 @@ next_buffer:
 	goto next_buffer;
 err:
 	assert(ret < 0);
-	t->error = ret;
-	btr_remove_node(btrn);
+	btr_remove_node(&fn->btrn);
+	return ret;
 }
 
 /** 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)
@@ -143,7 +139,7 @@ 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);
 }
 
 /**
@@ -155,15 +151,12 @@ void compress_filter_init(struct filter *f)
 {
 	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;
 	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
-	};
+	f->help = (struct ggo_help)DEFINE_GGO_HELP(compress_filter);
 }