X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress.c;h=c30c998a33eb3354968f6801fe4890aea43e3b19;hp=579a6ab643e479eb55156bdd3280f0d246dcee54;hb=6d213d3638eafeab4785e64decc7f4826a964c32;hpb=64e8616027238f6ef1933ccef14a2e031552db79

diff --git a/compress.c b/compress.c
index 579a6ab6..c30c998a 100644
--- a/compress.c
+++ b/compress.c
@@ -20,14 +20,14 @@
 /** The size of the output data buffer. */
 #define COMPRESS_CHUNK_SIZE 40960
 
+extern char *stat_item_values[NUM_STAT_ITEMS];
+
 /** Data specific to the compress filter. */
 struct private_compress_data {
 	/** The current multiplier. */
 	unsigned current_gain;
 	/** 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. */
 	unsigned max_gain;
 	/** Number of samples already seen. */
@@ -49,10 +49,8 @@ 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;
-
-		adjusted_sample = (PARA_ABS(sample) * pcd->current_gain)
-			>> gain_shift;
+		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);
@@ -65,15 +63,14 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
 		*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;
 	}
 	fn->loaded += length;
@@ -104,7 +101,6 @@ 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);
 }