X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=compress.c;h=1ea41107e252f80c14810c6c11720e3e2ab28b07;hb=8d945ebad52a7b331cad3c06a3708b26019293fb;hp=b4e4c40a7a1663c95b38cdbada69715c519da5dc;hpb=a8a78f935dcefa8a7fcda8dae80bca64fe39d632;p=paraslash.git

diff --git a/compress.c b/compress.c
index b4e4c40a..1ea41107 100644
--- a/compress.c
+++ b/compress.c
@@ -1,49 +1,38 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 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 */
+/** \file compress.c Paraslash's dynamic audio range compressor. */
 
 /*
- * Used ideas of AudioCompress, (C) 2002-2004  M. Hari Nezumi <magenta@trikuare.cx>
+ * Uses ideas of AudioCompress, (C) 2002-2004  M. Hari Nezumi <magenta@trikuare.cx>
  */
 
 #include "para.h"
 #include "compress_filter.cmdline.h"
 #include "list.h"
+#include "sched.h"
 #include "filter.h"
 #include "string.h"
 
-/** the size of the output data buffer */
+/** The size of the output data buffer. */
 #define COMPRESS_CHUNK_SIZE 40960
 
-/** data specific to the compress filter */
+/** Data specific to the compress filter. */
 struct private_compress_data {
-	/** the current multiplier */
+	/** The current multiplier. */
 	unsigned current_gain;
-	/** points to the configuration data for this instance of the compress filter */
+	/** Points to the configuration data for this instance of the compress filter. */
 	struct compress_filter_args_info *conf;
-	/** minimal admissible gain */
+	/** Minimal admissible gain. */
 	unsigned min_gain;
-	/** maximal admissible gain */
+	/** Maximal admissible gain. */
 	unsigned max_gain;
-	/** number of samples already seen */
+	/** Number of samples already seen. */
 	unsigned num_samples;
-	/** absolute value of the maximal sample in the current block */
+	/** Absolute value of the maximal sample in the current block. */
 	unsigned peak;
 };
 
@@ -67,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)
@@ -132,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;