Merge pull request #3 from drowe67/dr-cleanup21.2.0

Cleanup Part 2

1 files changed, 25 insertions, 29 deletions

diff --git a/src/postfilter.c b/src/postfilter.c
index 96f4f02..e46d488 100644
--- a/src/postfilter.c
+++ b/src/postfilter.c
@@ -27,16 +27,17 @@
   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "postfilter.h"
+
 #include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
 
-#include "defines.h"
 #include "comp.h"
+#include "defines.h"
 #include "dump.h"
 #include "sine.h"
-#include "postfilter.h"
 
 /*---------------------------------------------------------------------------*\
 
@@ -44,13 +45,14 @@
 
 \*---------------------------------------------------------------------------*/
 
-#define BG_THRESH 40.0     /* only consider low levels signals for bg_est */
-#define BG_BETA    0.1     /* averaging filter constant                   */
-#define BG_MARGIN  6.0     /* harmonics this far above BG noise are
-			      randomised.  Helped make bg noise less
-			      spikey (impulsive) for mmt1, but speech was
-                              perhaps a little rougher.
-			   */
+#define BG_THRESH 40.0 /* only consider low levels signals for bg_est */
+#define BG_BETA 0.1    /* averaging filter constant                   */
+#define BG_MARGIN                                    \
+  6.0 /* harmonics this far above BG noise are       \
+         randomised.  Helped make bg noise less      \
+         spikey (impulsive) for mmt1, but speech was \
+         perhaps a little rougher.                   \
+      */
 
 /*---------------------------------------------------------------------------*\
 
@@ -98,45 +100,39 @@
 
 \*---------------------------------------------------------------------------*/
 
-void postfilter(
-  MODEL *model,
-  float *bg_est
-)
-{
-  int   m, uv;
+void postfilter(MODEL *model, float *bg_est) {
+  int m, uv;
   float e, thresh;
 
   /* determine average energy across spectrum */
 
   e = 1E-12;
-  for(m=1; m<=model->L; m++)
-      e += model->A[m]*model->A[m];
+  for (m = 1; m <= model->L; m++) e += model->A[m] * model->A[m];
 
   assert(e > 0.0);
-  e = 10.0*log10f(e/model->L);
+  e = 10.0 * log10f(e / model->L);
 
   /* If beneath threshold, update bg estimate.  The idea
      of the threshold is to prevent updating during high level
      speech. */
 
   if ((e < BG_THRESH) && !model->voiced)
-      *bg_est =  *bg_est*(1.0 - BG_BETA) + e*BG_BETA;
+    *bg_est = *bg_est * (1.0 - BG_BETA) + e * BG_BETA;
 
   /* now mess with phases during voiced frames to make any harmonics
      less then our background estimate unvoiced.
   */
 
   uv = 0;
-  thresh = POW10F((*bg_est + BG_MARGIN)/20.0);
+  thresh = POW10F((*bg_est + BG_MARGIN) / 20.0);
   if (model->voiced)
-      for(m=1; m<=model->L; m++)
-	  if (model->A[m] < thresh) {
-	      model->phi[m] = (TWO_PI/CODEC2_RAND_MAX)*(float)codec2_rand();
-	      uv++;
-	  }
+    for (m = 1; m <= model->L; m++)
+      if (model->A[m] < thresh) {
+        model->phi[m] = (TWO_PI / CODEC2_RAND_MAX) * (float)codec2_rand();
+        uv++;
+      }
 
 #ifdef DUMP
-  dump_bg(e, *bg_est, 100.0*uv/model->L);
+  dump_bg(e, *bg_est, 100.0 * uv / model->L);
 #endif
-
 }