X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress_filter.c;h=8e6b1c45eca5c65ae712875ab46250fa7a7dca7c;hp=14df8d966128556e32957749b91bdd225730b1c1;hb=810761a3cdf3f75dd8e07a5d903793048c36df1d;hpb=d8213149049056e0cabbcbe575a10dfb1a83583e

diff --git a/compress_filter.c b/compress_filter.c
index 14df8d96..8e6b1c45 100644
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -40,47 +40,6 @@ 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)
 {
 	free(fn->private_data);
@@ -110,6 +69,10 @@ next_buffer:
 		return;
 	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;
@@ -184,6 +147,11 @@ static void open_compress(struct filter_node *fn)
 	pcd->max_gain = 1 << (pcd->conf->inertia_arg + pcd->conf->aggressiveness_arg);
 }
 
+static void compress_free_config(void *conf)
+{
+	compress_cmdline_parser_free(conf);
+}
+
 /**
  * The init function of the compress filter.
  *
@@ -196,10 +164,10 @@ void compress_filter_init(struct filter *f)
 	compress_cmdline_parser_init(&dummy);
 	f->open = open_compress;
 	f->close = close_compress;
-	f->convert = compress;
 	f->pre_select = generic_filter_pre_select;
 	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