make gengetopt-2.20 happy
[paraslash.git] / compress.c
index b4e4c40..3372301 100644 (file)
@@ -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"
 
@@ -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;