compress: Remove log statement in inner loop.

[paraslash.git] / compress_filter.c

diff --git a/compress_filter.c b/compress_filter.c
index 49e386ae775c5c3ace61c08108f1bfede9d7fe85..b01c01a4a68824bbd747980e37c97f8fb3589cbb 100644 (file)
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -75,17 +75,18 @@ next_buffer:
                op = para_malloc(length);
        for (i = 0; i < length / 2; i++) {
                /* be careful in that heat, my dear */
-               int sample = *ip++, adjusted_sample = (PARA_ABS(sample) *
-                       pcd->current_gain) >> gain_shift;
+               int sample = *ip++, adjusted_sample;
+
+               adjusted_sample = sample > 0? sample : -sample;
+               adjusted_sample *= pcd->current_gain;
+               adjusted_sample >>= gain_shift;
                if (adjusted_sample > 32767) { /* clip */
-                       PARA_NOTICE_LOG("clip: sample: %d, adjusted sample: %d\n",
-                               sample, adjusted_sample);
                        adjusted_sample = 32767;
                        pcd->current_gain = (3 * pcd->current_gain +
                                (1 << pcd->conf->inertia_arg)) / 4;
                        pcd->peak = 0;
-               } else
-                       pcd->peak = PARA_MAX(pcd->peak, adjusted_sample);
+               } else if (adjusted_sample > pcd->peak)
+                       pcd->peak = adjusted_sample;
                op[i] = sample >= 0? adjusted_sample : -adjusted_sample;
                if (++pcd->num_samples & mask)
                        continue;