Make mp3_get_file_info() static.

[paraslash.git] / compress.c

diff --git a/compress.c b/compress.c
index 1ea41107e252f80c14810c6c11720e3e2ab28b07..a6c3d32a18990719f454c971a1ead2de46659e0e 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -26,8 +26,6 @@ struct private_compress_data {
        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. */
@@ -51,43 +49,29 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
                /* be careful in that heat, my dear */
                int sample = *ip++, adjusted_sample;
 
-               if (sample > 0) {
-                       adjusted_sample = (sample * pcd->current_gain)
-                               >> gain_shift;
-                       if (unlikely(adjusted_sample > 32767)) {
-                               adjusted_sample = 32767;
-                               pcd->current_gain = (3 * pcd->current_gain +
-                                       (1 << pcd->conf->inertia_arg)) / 4;
-                               pcd->peak = 0;
-                       } else
-                               if (adjusted_sample > pcd->peak)
-                                       pcd->peak = adjusted_sample;
-               } else {
-                       adjusted_sample = -((-sample * pcd->current_gain)
-                               >> gain_shift);
-                       if (unlikely(adjusted_sample < -32768)) {
-                               adjusted_sample = -32768;
-                               pcd->current_gain = (3 * pcd->current_gain +
-                                       (1 << pcd->conf->inertia_arg)) / 4;
-                               pcd->peak = 0;
-                       } else
-                               if (-adjusted_sample > pcd->peak)
-                                       pcd->peak = -adjusted_sample;
-               }
-               *op++ = adjusted_sample;
+               adjusted_sample = (PARA_ABS(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);
+                       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);
+               *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;
-//             PARA_INFO_LOG("sample: %lu\n", ABS(sample));
        }
        fn->loaded += length;
        return length;
@@ -117,7 +101,6 @@ 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);
 }