Merge branch 't/compress'

Well tested an cooked.

	0a6c0e compress: Further optimize inner loop.
	be761d compress: Remove log statement in inner loop.
	15a54f compress: Avoid PARA_ABS and PARA_MAX in inner loop.
	28c03c compress: Compile with -O3.

diff --git a/Makefile.in b/Makefile.in
index f3dfea0065c31a564156000d0b1842eedc24e6c7..698599e5fcc4522ce54d1c2ba70d5080b30755a8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -182,6 +182,10 @@ $(object_dir)/mp3dec_filter.o: mp3dec_filter.c | $(object_dir)
        @[ -z "$(Q)" ] || echo 'CC $<'
        $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
 
+$(object_dir)/compress_filter.o: compress_filter.c | $(object_dir)
+       @[ -z "$(Q)" ] || echo 'CC $<'
+       $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) -O3 $<
+
 $(object_dir)/aacdec_filter.o: aacdec_filter.c | $(object_dir)
        @[ -z "$(Q)" ] || echo 'CC $<'
        $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<

diff --git a/NEWS b/NEWS
index 07481964e2400d42caeb0db78bf3d66bbbe44509..9a720307a568938a5ada992e7bc329f828c6743f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,8 @@
          by clock_gettime() on systems which support it.
        - Speed and usability improvements for para_gui.
        - para_client now restores the fd flags of stdin and stdout
-         on shutdown
+         on shutdown.
+       - Performance improvements for the compress filter.
 
 -----------------------------------------
 0.4.12 (2012-12-20) "volatile relativity"

diff --git a/compress_filter.c b/compress_filter.c
index d7162791b86d372562f690b464779b250519cbeb..f591123aeeb73f3e6c5f2c1234450645e974c2c3 100644 (file)
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -74,18 +74,23 @@ 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;
-               if (adjusted_sample > 32767) { /* clip */
-                       PARA_NOTICE_LOG("clip: sample: %d, adjusted sample: %d\n",
-                               sample, adjusted_sample);
-                       adjusted_sample = 32767;
+               int sample = *ip++;
+               bool neg = false;
+
+               if (sample < 0) {
+                       sample = -sample;
+                       neg = true;
+               }
+               sample *= pcd->current_gain;
+               sample >>= gain_shift;
+               if (sample > 32767) { /* clip */
+                       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[i] = sample >= 0? adjusted_sample : -adjusted_sample;
+               } else if (sample > pcd->peak)
+                       pcd->peak = sample;
+               op[i] = neg? -sample : sample;
                if (++pcd->num_samples & mask)
                        continue;
 //             PARA_DEBUG_LOG("gain: %u, peak: %u\n", pcd->current_gain,