X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress_filter.c;h=0c76fd785123a83bd1b7fb660ecb6157da2a47eb;hp=d01325960f39d15743affd26b5382e4e31cd1d10;hb=e0441a354b25f6fdd97480fe4e1f4f942347611f;hpb=1acc8bcc050a7b8f427e04dcc457efa0fdbb9507

diff --git a/compress_filter.c b/compress_filter.c
index d0132596..0c76fd78 100644
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -48,8 +48,7 @@ static int compress_post_select(__a_unused struct sched *s, void *context)
 	size_t length, i;
 	int16_t *ip, *op;
 	uint32_t inertia = U32_OPTVAL(INERTIA, fn->lpr);
-	unsigned gain_shift = inertia + U32_OPTVAL(DAMP, fn->lpr),
-		mask = (1U << U32_OPTVAL(BLOCKSIZE, fn->lpr)) - 1U;
+	unsigned mask = (1U << U32_OPTVAL(BLOCKSIZE, fn->lpr)) - 1U;
 	//inplace = false;
 next_buffer:
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
@@ -78,19 +77,22 @@ next_buffer:
 			neg = true;
 		}
 		sample *= pcd->current_gain;
-		sample >>= gain_shift;
+		sample >>= inertia + 1;
 		if (sample > 32767) { /* clip */
+			PARA_WARNING_LOG("clip: %d\n", sample);
 			sample = 32767;
 			pcd->current_gain = (3 * pcd->current_gain +
 				(1 << inertia)) / 4;
 			pcd->peak = 0;
 		} else if (sample > pcd->peak)
 			pcd->peak = sample;
+		sample >>= U32_OPTVAL(DAMP, fn->lpr);
 		op[i] = neg? -sample : sample;
 		if (++pcd->num_samples & mask)
 			continue;
 //		PARA_DEBUG_LOG("gain: %u, peak: %u\n", pcd->current_gain,
 //			pcd->peak);
+
 		if (pcd->peak < U32_OPTVAL(TARGET_LEVEL, fn->lpr)) {
 			if (pcd->current_gain < pcd->max_gain)
 				pcd->current_gain++;