X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress.c;h=337230106c2aa559d57961daeeea6659fce58cc1;hp=b7ddc28534106eede2ba8b7e6ad1b1d60a3b5510;hb=b46dd218f90646441998f975c9b5515a5521c9d5;hpb=1dd66e3e7c80a95dbd4fedeb7978b3f32f66d2b1;ds=sidebyside

diff --git a/compress.c b/compress.c
index b7ddc285..33723010 100644
--- a/compress.c
+++ b/compress.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file compress.c paraslash's dynamic audio range compressor */
@@ -25,6 +13,7 @@
 #include "para.h"
 #include "compress_filter.cmdline.h"
 #include "list.h"
+#include "sched.h"
 #include "filter.h"
 #include "string.h"
 
@@ -36,7 +25,7 @@ struct private_compress_data {
 	/** the current multiplier */
 	unsigned current_gain;
 	/** points to the configuration data for this instance of the compress filter */
-	struct gengetopt_args_info *conf;
+	struct compress_filter_args_info *conf;
 	/** minimal admissible gain */
 	unsigned min_gain;
 	/** maximal admissible gain */
@@ -49,7 +38,8 @@ struct private_compress_data {
 
 static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
 {
-	size_t i, length = MIN((inbuf_len / 2) * 2, (fn->bufsize - fn->loaded) / 2 * 2);
+	size_t i, length = PARA_MIN((inbuf_len / 2) * 2,
+		(fn->bufsize - fn->loaded) / 2 * 2);
 	struct private_compress_data *pcd = fn->private_data;
 	int16_t *ip = (int16_t *)inbuf, *op = (int16_t *)(fn->buf + fn->loaded);
 	unsigned gain_shift = pcd->conf->inertia_arg + pcd->conf->damp_arg,
@@ -66,19 +56,19 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
 				>> gain_shift;
 			if (unlikely(adjusted_sample > 32767)) {
 				adjusted_sample = 32767;
-				pcd->current_gain = (pcd->current_gain +
-					(1 << pcd->conf->inertia_arg)) / 2;
+				pcd->current_gain = (3 * pcd->current_gain +
+					(1 << pcd->conf->inertia_arg)) / 4;
 				pcd->peak = 0;
 			} else
 				if (adjusted_sample > pcd->peak)
-					pcd->peak = sample;
+					pcd->peak = adjusted_sample;
 		} else {
 			adjusted_sample = -((-sample * pcd->current_gain)
 				>> gain_shift);
 			if (unlikely(adjusted_sample < -32768)) {
 				adjusted_sample = -32768;
-				pcd->current_gain = (pcd->current_gain +
-					(1 << pcd->conf->inertia_arg)) / 2;
+				pcd->current_gain = (3 * pcd->current_gain +
+					(1 << pcd->conf->inertia_arg)) / 4;
 				pcd->peak = 0;
 			} else
 				if (-adjusted_sample > pcd->peak)
@@ -111,7 +101,7 @@ static void close_compress(struct filter_node *fn)
 
 static void *compress_parse_config(int argc, char **argv)
 {
-	struct gengetopt_args_info *ret = para_calloc(sizeof(struct gengetopt_args_info));
+	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);
@@ -131,7 +121,11 @@ static void open_compress(struct filter_node *fn)
 	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
+ */
 void compress_init(struct filter *f)
 {
 	f->open = open_compress;