X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=compress.c;h=d6f7520d6376dab4ccc9a4a580aab40d90f68c03;hb=89a0e510df07bc7210ca9e73381763fdd183df75;hp=54f3cd5d907af9c58072ae69742a22b95b763361;hpb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde;p=paraslash.git

diff --git a/compress.c b/compress.c
index 54f3cd5d..d6f7520d 100644
--- a/compress.c
+++ b/compress.c
@@ -4,10 +4,10 @@
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file compress.c paraslash's dynamic audio range compressor */
+/** \file compress.c Paraslash's dynamic audio range compressor. */
 
 /*
- * Used ideas of AudioCompress, (C) 2002-2004  M. Hari Nezumi <magenta@trikuare.cx>
+ * Uses ideas of AudioCompress, (C) 2002-2004  M. Hari Nezumi <magenta@trikuare.cx>
  */
 
 #include "para.h"
@@ -16,23 +16,24 @@
 #include "sched.h"
 #include "filter.h"
 #include "string.h"
+#include "error.h"
 
-/** the size of the output data buffer */
+/** The size of the output data buffer. */
 #define COMPRESS_CHUNK_SIZE 40960
 
-/** data specific to the compress filter */
+extern char *stat_item_values[NUM_STAT_ITEMS];
+
+/** Data specific to the compress filter. */
 struct private_compress_data {
-	/** the current multiplier */
+	/** The current multiplier. */
 	unsigned current_gain;
-	/** points to the configuration data for this instance of the compress filter */
+	/** Points to the configuration data for this instance of the compress filter. */
 	struct compress_filter_args_info *conf;
-	/** minimal admissible gain */
-	unsigned min_gain;
-	/** maximal admissible gain */
+	/** Maximal admissible gain. */
 	unsigned max_gain;
-	/** number of samples already seen */
+	/** Number of samples already seen. */
 	unsigned num_samples;
-	/** absolute value of the maximal sample in the current block */
+	/** Absolute value of the maximal sample in the current block. */
 	unsigned peak;
 };
 
@@ -49,45 +50,29 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
 		return 0;
 	for (i = 0; i < length / 2; i++) {
 		/* be careful in that heat, my dear */
-		int sample = *ip++, adjusted_sample;
-
-		if (sample > 0) {
-			adjusted_sample = (sample * pcd->current_gain)
-				>> gain_shift;
-			if (unlikely(adjusted_sample > 32767)) {
-				adjusted_sample = 32767;
-				pcd->current_gain = (3 * pcd->current_gain +
-					(1 << pcd->conf->inertia_arg)) / 4;
-				pcd->peak = 0;
-			} else
-				if (adjusted_sample > pcd->peak)
-					pcd->peak = adjusted_sample;
-		} else {
-			adjusted_sample = -((-sample * pcd->current_gain)
-				>> gain_shift);
-			if (unlikely(adjusted_sample < -32768)) {
-				adjusted_sample = -32768;
-				pcd->current_gain = (3 * pcd->current_gain +
-					(1 << pcd->conf->inertia_arg)) / 4;
-				pcd->peak = 0;
-			} else
-				if (-adjusted_sample > pcd->peak)
-					pcd->peak = -adjusted_sample;
-		}
-		*op++ = adjusted_sample;
+		int sample = *ip++, adjusted_sample = (PARA_ABS(sample) *
+			pcd->current_gain) >> gain_shift;
+		if (unlikely(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 (likely(++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 {
-			if (pcd->current_gain > pcd->min_gain + 1)
-				pcd->current_gain -= 2;
-		}
-//		PARA_DEBUG_LOG("gain: %lu, peak: %d\n", pcd->current_gain,
-//			pcd->peak);
+		} else
+			pcd->current_gain = PARA_MAX(pcd->current_gain - 2,
+				1 << pcd->conf->inertia_arg);
 		pcd->peak = 0;
-//		PARA_INFO_LOG("sample: %lu\n", ABS(sample));
 	}
 	fn->loaded += length;
 	return length;
@@ -99,13 +84,21 @@ static void close_compress(struct filter_node *fn)
 	free(fn->buf);
 }
 
-static void *compress_parse_config(int argc, char **argv)
+/** TODO: Add sanity checks */
+static int compress_parse_config(int argc, char **argv, void **config)
 {
-	struct compress_filter_args_info *ret = para_calloc(sizeof(struct compress_filter_args_info));
-	if (!compress_cmdline_parser(argc, argv, ret))
-		return ret;
-	free(ret);
-	return NULL;
+	int ret;
+	struct compress_filter_args_info *compress_conf
+		= para_calloc(sizeof(*compress_conf));
+
+	ret = -E_COMPRESS_SYNTAX;
+	if (compress_cmdline_parser(argc, argv, compress_conf))
+		goto err;
+	*config = compress_conf;
+	return 1;
+err:
+	free(compress_conf);
+	return  ret;
 }
 
 static void open_compress(struct filter_node *fn)
@@ -117,16 +110,15 @@ static void open_compress(struct filter_node *fn)
 	fn->bufsize = COMPRESS_CHUNK_SIZE;
 	fn->buf = para_malloc(fn->bufsize);
 	pcd->current_gain = 1 << pcd->conf->inertia_arg;
-	pcd->min_gain = 1 << (pcd->conf->inertia_arg - pcd->conf->aggressiveness_arg);
 	pcd->max_gain = 1 << (pcd->conf->inertia_arg + pcd->conf->aggressiveness_arg);
 }
 
 /**
- * the init function of the compress filter
+ * The init function of the compress filter.
  *
- * \param f pointer to the struct to initialize
+ * \param f Pointer to the struct to initialize.
  */
-void compress_init(struct filter *f)
+void compress_filter_init(struct filter *f)
 {
 	f->open = open_compress;
 	f->close = close_compress;