X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress_filter.c;h=b01c01a4a68824bbd747980e37c97f8fb3589cbb;hp=04377b752a89cf83ba33532e4d24542e9d06a064;hb=be761d16f78eeb062f4d268e3b80ff6d225f767f;hpb=3879481ddabc38236b9eee979a090c2a9bfa74d3 diff --git a/compress_filter.c b/compress_filter.c index 04377b75..b01c01a4 100644 --- a/compress_filter.c +++ b/compress_filter.c @@ -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;