mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-11 13:30:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace a few CLAMPs by PA_CLAMP_UNLIKELY

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2040 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-11-09 14:20:12 +00:00
parent 01490319d3
commit c1985c2acc
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pulsecore/sample-util.c
View file

@ -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);

4
src/pulsecore/sconv.c
View file

@ -130,7 +130,7 @@ static void ulaw_from_float32ne(unsigned n, const float *a, uint8_t *b) {
for (; n > 0; n--) {
float v = *(a++);
v = CLAMP(v, -1, 1);
v = PA_CLAMP_UNLIKELY(v, -1, 1);
v *= 0x1FFF;
*(b++) = st_14linear2ulaw((int16_t) v);
}
@ -168,7 +168,7 @@ static void alaw_from_float32ne(unsigned n, const float *a, uint8_t *b) {
for (; n > 0; n--, a++, b++) {
float v = *a;
v = CLAMP(v, -1, 1);
v = PA_CLAMP_UNLIKELY(v, -1, 1);
v *= 0xFFF;
*b = st_13linear2alaw((int16_t) v);
}