X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=amp_filter.c;h=9484966380a3610a8a0bab0a7eeef4bc67f9a21f;hp=690080bd2844073b2dc82168a7c5accf6e7221b3;hb=6ca50bc4766fab54698a6c86b5395a49221c3408;hpb=e86c756aaa4d3c5020deb46dc570df41764e5524

diff --git a/amp_filter.c b/amp_filter.c
index 690080bd..94849663 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file amp_filter.c Paraslash's amplify filter. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "amp_filter.cmdline.h"
@@ -19,82 +18,47 @@
 #include "string.h"
 #include "error.h"
 
-/** The size of the output data buffer. */
-#define AMP_CHUNK_SIZE 40960
-
 extern char *stat_item_values[NUM_STAT_ITEMS];
 
 /** Data specific to the amplify filter. */
 struct private_amp_data {
 	/** Points to the configuration data for this instance of this filter. */
-	struct amp_filter_args_info *conf;
 	/** Amplification factor. */
 	unsigned amp;
 };
 
-static ssize_t amp_convert(char *inbuf, size_t inbuf_len, struct filter_node *fn)
-{
-	size_t i, length = PARA_MIN((inbuf_len / 2),
-		(fn->bufsize - fn->loaded) / 2);
-	struct private_amp_data *pad = fn->private_data;
-	int16_t *ip = (int16_t *)inbuf, *op = (int16_t *)(fn->buf + fn->loaded);
-	int factor = 64 + pad->amp;
-
-	if (!length)
-		return 0;
-
-	if (pad->amp == 0) {
-		memcpy(op, ip, length * 2);
-		goto out;
-	}
-	for (i = 0; i < length; i++) {
-		int x = (ip[i] * factor) >> 6;
-
-		op[i] = x;
-		if (op[i] != x)
-			op[i] = (x >= 32768)? 32767 : -32768;
-	}
-out:
-	fn->loaded += length * 2;
-	return length * 2;
-}
-
 static void amp_close(struct filter_node *fn)
 {
 	free(fn->private_data);
-	free(fn->buf);
 }
 
 static int amp_parse_config(int argc, char **argv, void **config)
 {
-	struct amp_filter_args_info *amp_conf = para_calloc(sizeof(*amp_conf));
+	struct amp_filter_args_info *conf = para_calloc(sizeof(*conf));
 	int ret = -E_AMP_SYNTAX;
 
-	if (amp_cmdline_parser(argc, argv, amp_conf))
-		goto err;
+	amp_filter_cmdline_parser(argc, argv, conf);
 	ret = -ERRNO_TO_PARA_ERROR(EINVAL);
-	if (amp_conf->amp_arg < 0)
+	if (conf->amp_arg < 0)
 		goto err;
-	*config = amp_conf;
+	*config = conf;
 	return 1;
 err:
-	free(amp_conf);
+	free(conf);
 	return ret;
 }
 
 static void amp_open(struct filter_node *fn)
 {
 	struct private_amp_data *pad = para_calloc(sizeof(*pad));
+	struct amp_filter_args_info *conf = fn->conf;
 
-	pad->conf = fn->conf;
 	fn->private_data = pad;
 	fn->min_iqs = 2;
-	if (!pad->conf->amp_given && stat_item_values[SI_AMPLIFICATION])
+	if (!conf->amp_given && stat_item_values[SI_AMPLIFICATION])
 		sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp);
 	else
-		pad->amp = pad->conf->amp_arg;
-	fn->bufsize = AMP_CHUNK_SIZE;
-	fn->buf = para_malloc(fn->bufsize);
+		pad->amp = conf->amp_arg;
 	PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
 		pad->amp, pad->amp / 64.0 + 1.0);
 }
@@ -152,12 +116,12 @@ next_buffer:
 err:
 	assert(ret < 0);
 	t->error = ret;
-	btr_remove_node(btrn);
+	btr_remove_node(&fn->btrn);
 }
 
 static void amp_free_config(void *conf)
 {
-	amp_cmdline_parser_free(conf);
+	amp_filter_cmdline_parser_free(conf);
 }
 
 /**
@@ -169,10 +133,9 @@ void amp_filter_init(struct filter *f)
 {
 	struct amp_filter_args_info dummy;
 
-	amp_cmdline_parser_init(&dummy);
+	amp_filter_cmdline_parser_init(&dummy);
 	f->open = amp_open;
 	f->close = amp_close;
-	f->convert = amp_convert;
 	f->pre_select = generic_filter_pre_select;
 	f->post_select = amp_post_select;
 	f->parse_config = amp_parse_config;