X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress_filter.c;h=d0d96fd960955bcccedc731eb33221d5369e778f;hp=b01c01a4a68824bbd747980e37c97f8fb3589cbb;hb=fc8dfbb416ff07cca08fbf4e13efcaa25e17cc54;hpb=be761d16f78eeb062f4d268e3b80ff6d225f767f

diff --git a/compress_filter.c b/compress_filter.c
index b01c01a4..d0d96fd9 100644
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -41,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);
@@ -56,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 */
@@ -75,19 +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;
+		int sample = *ip++;
+		bool neg = false;
 
-		adjusted_sample = sample > 0? sample : -sample;
-		adjusted_sample *= pcd->current_gain;
-		adjusted_sample >>= gain_shift;
-		if (adjusted_sample > 32767) { /* clip */
-			adjusted_sample = 32767;
+		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 if (adjusted_sample > pcd->peak)
-			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,8 +112,8 @@ next_buffer:
 	goto next_buffer;
 err:
 	assert(ret < 0);
-	t->error = ret;
 	btr_remove_node(&fn->btrn);
+	return ret;
 }
 
 /** TODO: Add sanity checks */
@@ -155,8 +158,5 @@ void compress_filter_init(struct filter *f)
 	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);
 }