X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=compress_filter.c;h=499a9e7674305dde3d7189e73f75fed772a54b04;hb=0a6c0e26b73d0cbf4b324b38e1be484d6a6c27e8;hp=cf55985cbb6b2abc82a290a50f3d401420bdc078;hpb=15a54f2ef3d6c33b15a1180332e63604e7cedc60;p=paraslash.git diff --git a/compress_filter.c b/compress_filter.c index cf55985c..499a9e76 100644 --- a/compress_filter.c +++ b/compress_filter.c @@ -75,21 +75,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; + int sample = *ip++; + bool neg = false; - 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; + 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 if (adjusted_sample > pcd->peak) - 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,