From 06b9140e109a591529ec7229085fe138ce79a6d1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 2 May 2008 01:24:47 +0000 Subject: reorderer a few things git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2345 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/pulsecore/sample-util.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c index d295742f..a8028296 100644 --- a/src/pulsecore/sample-util.c +++ b/src/pulsecore/sample-util.c @@ -1002,20 +1002,19 @@ pa_memchunk* pa_silence_memchunk_get(pa_silence_cache *cache, pa_mempool *pool, } void pa_sample_clamp(pa_sample_format_t format, void *dst, size_t dstr, const void *src, size_t sstr, unsigned n) { - const float *s; float *d; - if (format != PA_SAMPLE_FLOAT32BE && format != PA_SAMPLE_FLOAT32LE) - return; - - s = src; - d = dst; + s = src; d = dst; if (format == PA_SAMPLE_FLOAT32NE) { - const static float minus_one = -1.0, plus_one = 1.0; - oil_clip_f32(dst, dstr, src, sstr, n, &minus_one, &plus_one); - } else + + float minus_one = -1.0, plus_one = 1.0; + oil_clip_f32(d, dstr, s, sstr, n, &minus_one, &plus_one); + + } else { + pa_assert(format == PA_SAMPLE_FLOAT32RE); + for (; n > 0; n--) { float f; @@ -1026,4 +1025,5 @@ void pa_sample_clamp(pa_sample_format_t format, void *dst, size_t dstr, const vo s = (const float*) ((const uint8_t*) s + sstr); d = (float*) ((uint8_t*) d + dstr); } + } } -- cgit