From c1985c2acc43f5d2c23e1e736588c5ef3a398a17 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 9 Nov 2007 14:20:12 +0000 Subject: replace a few CLAMPs by PA_CLAMP_UNLIKELY git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2040 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/pulsecore/sample-util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/pulsecore/sample-util.c') diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c index 0383b567..001a997e 100644 --- a/src/pulsecore/sample-util.c +++ b/src/pulsecore/sample-util.c @@ -178,7 +178,7 @@ size_t pa_mix( if (volume->values[channel] != PA_VOLUME_NORM) sum = (int32_t) (sum * pa_sw_volume_to_linear(volume->values[channel])); - sum = CLAMP(sum, -0x8000, 0x7FFF); + sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF); } *((int16_t*) data) = (int16_t) sum; @@ -225,7 +225,7 @@ size_t pa_mix( if (volume->values[channel] != PA_VOLUME_NORM) sum = (int32_t) (sum * pa_sw_volume_to_linear(volume->values[channel])); - sum = CLAMP(sum, -0x8000, 0x7FFF); + sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF); } *((int16_t*) data) = PA_INT16_SWAP((int16_t) sum); @@ -272,7 +272,7 @@ size_t pa_mix( if (volume->values[channel] != PA_VOLUME_NORM) sum = (int32_t) (sum * pa_sw_volume_to_linear(volume->values[channel])); - sum = CLAMP(sum, -0x80, 0x7F); + sum = PA_CLAMP_UNLIKELY(sum, -0x80, 0x7F); } *((uint8_t*) data) = (uint8_t) (sum + 0x80); -- cgit