compress filter: Fix parsing of the amplification string.

[paraslash.git] / compress.c

diff --git a/compress.c b/compress.c
index 579a6ab643e479eb55156bdd3280f0d246dcee54..8e2f07c9c4f3342e2984c5b4b8b2a0b047bb038c 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -16,24 +16,27 @@
 #include "sched.h"
 #include "filter.h"
 #include "string.h"
+#include "audiod.h"
 
 /** The size of the output data buffer. */
 #define COMPRESS_CHUNK_SIZE 40960
 
+extern char *stat_item_values[NUM_STAT_ITEMS];
+
 /** Data specific to the compress filter. */
 struct private_compress_data {
        /** The current multiplier. */
        unsigned current_gain;
        /** Points to the configuration data for this instance of the compress filter. */
        struct compress_filter_args_info *conf;
-       /** Minimal admissible gain. */
-       unsigned min_gain;
        /** Maximal admissible gain. */
        unsigned max_gain;
        /** Number of samples already seen. */
        unsigned num_samples;
        /** Absolute value of the maximal sample in the current block. */
        unsigned peak;
+       /** Amplification factor. */
+       unsigned amp;
 };
 
 static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
@@ -49,10 +52,9 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
                return 0;
        for (i = 0; i < length / 2; i++) {
                /* be careful in that heat, my dear */
-               int sample = *ip++, adjusted_sample;
+               int sample = *ip++, adjusted_sample = (PARA_ABS(sample) * (64 + pcd->amp)) >> 6;
 
-               adjusted_sample = (PARA_ABS(sample) * pcd->current_gain)
-                       >> gain_shift;
+               adjusted_sample = (adjusted_sample * pcd->current_gain) >> gain_shift;
                if (unlikely(adjusted_sample > 32767)) { /* clip */
                        PARA_NOTICE_LOG("clip: sample: %d, adjusted sample: %d\n",
                                sample, adjusted_sample);
@@ -65,15 +67,14 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
                *op++ = sample >= 0? adjusted_sample : -adjusted_sample;
                if (likely(++pcd->num_samples & mask))
                        continue;
+//             PARA_DEBUG_LOG("gain: %u, peak: %u\n", pcd->current_gain,
+//                     pcd->peak);
                if (pcd->peak < pcd->conf->target_level_arg) {
                        if (pcd->current_gain < pcd->max_gain)
                                pcd->current_gain++;
-               } else {
-                       if (pcd->current_gain > pcd->min_gain + 1)
-                               pcd->current_gain -= 2;
-               }
-               PARA_DEBUG_LOG("gain: %lu, peak: %d\n", pcd->current_gain,
-                       pcd->peak);
+               } else
+                       pcd->current_gain = PARA_MAX(pcd->current_gain - 2,
+                               1 << pcd->conf->inertia_arg);
                pcd->peak = 0;
        }
        fn->loaded += length;
@@ -104,8 +105,14 @@ static void open_compress(struct filter_node *fn)
        fn->bufsize = COMPRESS_CHUNK_SIZE;
        fn->buf = para_malloc(fn->bufsize);
        pcd->current_gain = 1 << pcd->conf->inertia_arg;
-       pcd->min_gain = 1 << (pcd->conf->inertia_arg - pcd->conf->aggressiveness_arg);
        pcd->max_gain = 1 << (pcd->conf->inertia_arg + pcd->conf->aggressiveness_arg);
+       if (stat_item_values[SI_AMPLIFICATION]) {
+               int i = SI_AMPLIFICATION;
+               char *s = stat_item_values[i] + strlen(status_item_list[i]) + 1;
+               sscanf(s, "%u", &pcd->amp);
+       }
+       PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n", pcd->amp,
+               pcd->amp / 64.0 + 1.0);
 }
 
 /**