X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress_filter.c;h=0c0200e7e3b522af5aad7bb0a9f86f7e32024218;hp=f6108c752ab97bb87228ea6cfe118b7003673cd3;hb=38657223b245405602bc50906a9687ce98f53857;hpb=aa74a903545250506fd4c29791e6f4aef3a01c41

diff --git a/compress_filter.c b/compress_filter.c
index f6108c75..0c0200e7 100644
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -74,18 +74,23 @@ next_buffer:
 		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[i] = 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,