X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress_filter.c;h=a10e7c3561b030ca9bb63fa6dd2916bcb7a2a173;hp=39055618cde7ea16bfd5f2207f4b00a3b314c5e2;hb=74c88020bd325865fe26ed25ea8ad0ace0924136;hpb=c282c836791cedf57c128555af90af37c7c01c05

diff --git a/compress_filter.c b/compress_filter.c
index 39055618..a10e7c35 100644
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * 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"
@@ -23,9 +22,6 @@
 #include "string.h"
 #include "error.h"
 
-/** The size of the output data buffer. */
-#define COMPRESS_CHUNK_SIZE 40960
-
 /** Data specific to the compress filter. */
 struct private_compress_data {
 	/** The current multiplier. */
@@ -40,54 +36,12 @@ struct private_compress_data {
 	int peak;
 };
 
-static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
-{
-	size_t i, length = PARA_MIN((inbuf_len / 2) * 2,
-		(fn->bufsize - fn->loaded) / 2 * 2);
-	struct private_compress_data *pcd = fn->private_data;
-	int16_t *ip = (int16_t *)inbuf, *op = (int16_t *)(fn->buf + fn->loaded);
-	unsigned gain_shift = pcd->conf->inertia_arg + pcd->conf->damp_arg,
-		mask = (1 << pcd->conf->blocksize_arg) - 1;
-
-	if (!length)
-		return 0;
-	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;
-			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++ = sample >= 0? adjusted_sample : -adjusted_sample;
-		if (++pcd->num_samples & mask)
-			continue;
-//		PARA_DEBUG_LOG("gain: %u, peak: %u\n", pcd->current_gain,
-//			pcd->peak);
-		if (pcd->peak < pcd->conf->target_level_arg) {
-			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);
-		pcd->peak = 0;
-	}
-	fn->loaded += length;
-	return length;
-}
-
-static void close_compress(struct filter_node *fn)
+static void compress_close(struct filter_node *fn)
 {
 	free(fn->private_data);
-	free(fn->buf);
 }
 
-static void compress_post_select(__a_unused struct sched *s, struct task *t)
+static int compress_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
 	struct private_compress_data *pcd = fn->private_data;
@@ -102,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 */
@@ -154,43 +107,34 @@ 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 open_compress(struct filter_node *fn)
+static void compress_open(struct filter_node *fn)
 {
 	struct private_compress_data *pcd = para_calloc(
 		sizeof(struct private_compress_data));
 	pcd->conf = fn->conf;
 	fn->private_data = pcd;
 	fn->min_iqs = 2; /* 16 bit audio */
-	fn->bufsize = COMPRESS_CHUNK_SIZE;
-	fn->buf = para_malloc(fn->bufsize);
 	pcd->current_gain = 1 << pcd->conf->inertia_arg;
 	pcd->max_gain = 1 << (pcd->conf->inertia_arg + pcd->conf->aggressiveness_arg);
 }
 
 static void compress_free_config(void *conf)
 {
-	compress_cmdline_parser_free(conf);
+	compress_filter_cmdline_parser_free(conf);
 }
 
 /**
@@ -202,12 +146,11 @@ void compress_filter_init(struct filter *f)
 {
 	struct compress_filter_args_info dummy;
 
-	compress_cmdline_parser_init(&dummy);
-	f->open = open_compress;
-	f->close = close_compress;
-	f->convert = compress;
+	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->new_post_select = compress_post_select;
 	f->parse_config = compress_parse_config;
 	f->free_config = compress_free_config;
 	f->help = (struct ggo_help) {