fecdec_filter: Avoid potentially expensive pointer subtraction.

[paraslash.git] / compress_filter.c

diff --git a/compress_filter.c b/compress_filter.c
index 6034ce790276c7bbcb8d35312e717394e10f5098..f853b6335d5a9fd9744f86343dd22df6184e6ca1 100644 (file)
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -14,6 +14,7 @@
 #include "compress_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "compress_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"

+#include "ggo.h"

 #include "filter.h"
 #include "string.h"
 #include "error.h"
 #include "filter.h"
 #include "string.h"
 #include "error.h"


@@ -34,7 +35,7 @@ struct private_compress_data {
        /** Number of samples already seen. */
        unsigned num_samples;
        /** Absolute value of the maximal sample in the current block. */
        /** Number of samples already seen. */
        unsigned num_samples;
        /** Absolute value of the maximal sample in the current block. */

-       unsigned peak;
+       int peak;

 };
 
 static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
 };
 
 static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)


@@ -71,7 +72,7 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
                                pcd->current_gain++;
                } else
                        pcd->current_gain = PARA_MAX(pcd->current_gain - 2,
                                pcd->current_gain++;
                } else
                        pcd->current_gain = PARA_MAX(pcd->current_gain - 2,

-                               1 << pcd->conf->inertia_arg);
+                               1U << pcd->conf->inertia_arg);

                pcd->peak = 0;
        }
        fn->loaded += length;
                pcd->peak = 0;
        }
        fn->loaded += length;


@@ -120,9 +121,15 @@ static void open_compress(struct filter_node *fn)
  */
 void compress_filter_init(struct filter *f)
 {
  */
 void compress_filter_init(struct filter *f)
 {

+       struct compress_filter_args_info dummy;
+
+       compress_cmdline_parser_init(&dummy);

        f->open = open_compress;
        f->close = close_compress;
        f->convert = compress;
        f->open = open_compress;
        f->close = close_compress;
        f->convert = compress;

-       f->print_help = compress_cmdline_parser_print_help;

        f->parse_config = compress_parse_config;
        f->parse_config = compress_parse_config;

+       f->help = (struct ggo_help) {
+               .short_help = compress_filter_args_info_help,
+               .detailed_help = compress_filter_args_info_detailed_help
+       };

 }
 }