X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress_filter.c;h=0c0200e7e3b522af5aad7bb0a9f86f7e32024218;hp=7bad4c25debac02e16f2df75a6f98530fd666e3b;hb=d87806284b9f6be9aab71ccbf0280d273b57eeb3;hpb=271c83d4fd9411be628fa650ce595ac79754d22e

diff --git a/compress_filter.c b/compress_filter.c
index 7bad4c25..0c0200e7 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.
  */
@@ -17,13 +17,11 @@
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "filter.h"
 #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. */
@@ -38,31 +36,61 @@ struct private_compress_data {
 	int peak;
 };
 
-static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
+static void compress_close(struct filter_node *fn)
+{
+	free(fn->private_data);
+}
+
+static int compress_post_select(__a_unused struct sched *s, struct task *t)
 {
-	size_t i, length = PARA_MIN((inbuf_len / 2) * 2,
-		(fn->bufsize - fn->loaded) / 2 * 2);
+	struct filter_node *fn = container_of(t, struct filter_node, task);
 	struct private_compress_data *pcd = fn->private_data;
-	int16_t *ip = (int16_t *)inbuf, *op = (int16_t *)(fn->buf + fn->loaded);
+	struct btr_node *btrn = fn->btrn;
+	bool inplace = btr_inplace_ok(btrn);
+	int ret;
+	char *inbuf;
+	size_t length, i;
+	int16_t *ip, *op;
 	unsigned gain_shift = pcd->conf->inertia_arg + pcd->conf->damp_arg,
 		mask = (1 << pcd->conf->blocksize_arg) - 1;
 
-	if (!length)
+	//inplace = false;
+next_buffer:
+	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
+	if (ret < 0)
+		goto err;
+	if (ret == 0)
 		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 */
+		ret = -E_COMPRESS_EOF;
+		goto err;
+	}
+	ip = (int16_t *)inbuf;
+	if (inplace)
+		op = ip;
+	else
+		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++ = 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,
@@ -75,45 +103,45 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
 				1U << pcd->conf->inertia_arg);
 		pcd->peak = 0;
 	}
-	fn->loaded += length;
-	return length;
-}
-
-static void close_compress(struct filter_node *fn)
-{
-	free(fn->private_data);
-	free(fn->buf);
+	if (inplace)
+		btr_pushdown_one(btrn);
+	else {
+		btr_consume(btrn, length);
+		btr_add_output((char *)op, length, btrn);
+	}
+	goto next_buffer;
+err:
+	assert(ret < 0);
+	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->bufsize = COMPRESS_CHUNK_SIZE;
-	fn->buf = para_malloc(fn->bufsize);
+	fn->min_iqs = 2; /* 16 bit audio */
 	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_filter_cmdline_parser_free(conf);
+}
+
 /**
  * The init function of the compress filter.
  *
@@ -123,13 +151,12 @@ 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->parse_config = compress_parse_config;
-	f->help = (struct ggo_help) {
-		.short_help = compress_filter_args_info_help,
-		.detailed_help = compress_filter_args_info_detailed_help
-	};
+	f->free_config = compress_free_config;
+	f->help = (struct ggo_help)DEFINE_GGO_HELP(compress_filter);
 }