X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=amp_filter.c;h=21fd9fd179a3885e7f25664fbfae60029922536b;hp=0ed2d8e0f13e5391698901fc9dd6e5af1af3463d;hb=c387b216b5fd3c944053e1bba024815719e9a0d9;hpb=764e787bc065694b2e9b05159a92104d585f59eb

diff --git a/amp_filter.c b/amp_filter.c
index 0ed2d8e0..21fd9fd1 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -19,9 +19,6 @@
 #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. */
@@ -32,37 +29,9 @@ struct private_amp_data {
 	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)
@@ -75,8 +44,6 @@ static int amp_parse_config(int argc, char **argv, void **config)
 	ret = -ERRNO_TO_PARA_ERROR(EINVAL);
 	if (amp_conf->amp_arg < 0)
 		goto err;
-	PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
-		amp_conf->amp_arg, amp_conf->amp_arg / 64.0 + 1.0);
 	*config = amp_conf;
 	return 1;
 err:
@@ -90,12 +57,13 @@ static void amp_open(struct filter_node *fn)
 
 	pad->conf = fn->conf;
 	fn->private_data = pad;
+	fn->min_iqs = 2;
 	if (!pad->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);
+	PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
+		pad->amp, pad->amp / 64.0 + 1.0);
 }
 
 static void amp_post_select(__a_unused struct sched *s, struct task *t)
@@ -104,47 +72,59 @@ static void amp_post_select(__a_unused struct sched *s, struct task *t)
 	struct private_amp_data *pad = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
 	int ret, factor = 64 + pad->amp;
-	char *in;
-	size_t in_len = btr_next_buffer(btrn, &in);
-	size_t i, length = in_len / 2;
-	int16_t *ip = (int16_t *)in, *op;
+	size_t i, in_bytes, len;
+	int16_t *in, *out;
 	bool inplace = btr_inplace_ok(btrn);
 
-	ret = prepare_filter_node(fn);
+	if (pad->amp == 0) { /* no amplification */
+		t->error = -E_AMP_ZERO_AMP;
+		btr_splice_out_node(btrn);
+		return;
+	}
+next_buffer:
+	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0)
 		goto err;
 	if (ret == 0)
 		return;
+	btr_merge(btrn, fn->min_iqs);
+	in_bytes = btr_next_buffer(btrn, (char **)&in);
+	len = in_bytes / 2;
+	if (len == 0) { /* eof and in_bytes == 1 */
+		ret = -E_AMP_EOF;
+		goto err;
+	}
 
 	if (inplace)
-		op = ip;
+		out = in;
 	else
-		op = para_malloc(length * 2);
-	if (pad->amp == 0) {
-		memcpy(op, ip, length * 2);
-		goto success;
-	}
-	for (i = 0; i < length; i++) {
-		int x = (ip[i] * factor) >> 6;
+		out = para_malloc(len * 2);
+
+	for (i = 0; i < len; i++) {
+		int x = (in[i] * factor) >> 6;
 
-		op[i] = x;
-		if (op[i] != x)
-			op[i] = (x >= 32768)? 32767 : -32768;
+		out[i] = x;
+		if (out[i] != x) /* overflow, clip */
+			out[i] = (x >= 0)? 32767 : -32768;
 	}
-success:
-	t->error = 0;
+
 	if (inplace)
 		btr_pushdown_one(btrn);
 	else {
-		btr_consume(btrn, length * 2);
-		btr_add_output((char *)op, length * 2, btrn);
+		btr_consume(btrn, len * 2);
+		btr_add_output((char *)out, len * 2, btrn);
 	}
-	return;
+	t->error = 0;
+	goto next_buffer;
 err:
 	assert(ret < 0);
-	amp_close(fn);
 	t->error = ret;
-	btr_del_node(btrn);
+	btr_remove_node(btrn);
+}
+
+static void amp_free_config(void *conf)
+{
+	amp_cmdline_parser_free(conf);
 }
 
 /**
@@ -159,10 +139,10 @@ void amp_filter_init(struct filter *f)
 	amp_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;
+	f->free_config = amp_free_config;
 	f->help = (struct ggo_help) {
 		.short_help = amp_filter_args_info_help,
 		.detailed_help = amp_filter_args_info_detailed_help