X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=compress_filter.c;h=a6a001919acc5038039d5de0b0590a265052e978;hb=9055c71be97f1095dcdbd83da305b600f204f763;hp=f98fb413b2498311d25299fe9dfabfcad87af823;hpb=6b966e1df730ab787014b4bd5dd08214d3722bfe;p=paraslash.git

diff --git a/compress_filter.c b/compress_filter.c
index f98fb413..a6a00191 100644
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -37,7 +37,7 @@ static void compress_close(struct filter_node *fn)
 	free(fn->private_data);
 }
 
-static int compress_post_select(__a_unused struct sched *s, void *context)
+static int compress_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct filter_node *fn = context;
 	struct private_compress_data *pcd = fn->private_data;
@@ -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);
@@ -67,7 +66,7 @@ next_buffer:
 	if (inplace)
 		op = ip;
 	else
-		op = para_malloc(length);
+		op = alloc(length);
 	for (i = 0; i < length / 2; i++) {
 		/* be careful in that heat, my dear */
 		int sample = *ip++;
@@ -78,20 +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);
+			PARA_NOTICE_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++;
@@ -115,14 +116,14 @@ err:
 
 static void compress_open(struct filter_node *fn)
 {
-	struct private_compress_data *pcd = para_calloc(sizeof(*pcd));
+	struct private_compress_data *pcd = zalloc(sizeof(*pcd));
 	uint32_t inertia = U32_OPTVAL(INERTIA, fn->lpr);
 	uint32_t aggressiveness = U32_OPTVAL(AGGRESSIVENESS, fn->lpr);
 
 	fn->private_data = pcd;
 	fn->min_iqs = 2; /* 16 bit audio */
 	pcd->current_gain = 1U << inertia;
-	pcd->max_gain = 1U << (inertia + aggressiveness);
+	pcd->max_gain = (1U << inertia) * (1.0 + 3.0 * aggressiveness / 10.0);
 }
 
 static void *compress_setup(const struct lls_parse_result *lpr)
@@ -135,20 +136,15 @@ static void *compress_setup(const struct lls_parse_result *lpr)
 		exit(EXIT_FAILURE);
 	}
 	val = U32_OPTVAL(AGGRESSIVENESS, lpr);
-	if (val == 0 || val > 15) {
+	if (val > 10) {
 		PARA_EMERG_LOG("aggressiveness (%u) out of range\n", val);
 		exit(EXIT_FAILURE);
 	}
 	val = U32_OPTVAL(INERTIA, lpr);
-	if (val == 0 || val > 15) {
+	if (val == 0 || val > 14) {
 		PARA_EMERG_LOG("inertia (%u) out of range\n", val);
 		exit(EXIT_FAILURE);
 	}
-	val = U32_OPTVAL(AGGRESSIVENESS, lpr) + U32_OPTVAL(INERTIA, lpr);
-	if (val > 16) {
-		PARA_EMERG_LOG("inertia + aggressiveness (%u) > 16\n", val);
-		exit(EXIT_FAILURE);
-	}
 	val = U32_OPTVAL(TARGET_LEVEL, lpr);
 	if (val > 32767) {
 		PARA_EMERG_LOG("target-level (%u) out of range\n", val);
@@ -166,6 +162,6 @@ const struct filter lsg_filter_cmd_com_compress_user_data = {
 	.setup = compress_setup,
 	.open = compress_open,
 	.close = compress_close,
-	.pre_select = generic_filter_pre_select,
-	.post_select = compress_post_select,
+	.pre_monitor = generic_filter_pre_monitor,
+	.post_monitor = compress_post_monitor,
 };