aboutsummaryrefslogtreecommitdiffstats
path: root/OpenAL32
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2011-08-16 18:33:10 -0700
committerChris Robinson <[email protected]>2011-08-16 18:33:10 -0700
commit04dad28228a694e681d722826615245466a3aa16 (patch)
tree54860fb951339bb4af88df4c620383323427a5fd /OpenAL32
parenta96f8177387818d3ef69778e3f78a9ed251326c1 (diff)
Use mini/maxi/clampi and minu/maxu/clampu to replace min/max calls
Diffstat (limited to 'OpenAL32')
-rw-r--r--OpenAL32/Include/alu.h14
-rw-r--r--OpenAL32/alBuffer.c29
2 files changed, 25 insertions, 18 deletions
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 65d8d3a7..45eb09c5 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -134,6 +134,20 @@ static __inline ALfloat maxF(ALfloat a, ALfloat b)
static __inline ALfloat clampF(ALfloat val, ALfloat mn, ALfloat mx)
{ return minF(mx, maxF(mn, val)); }
+static __inline ALuint minu(ALuint a, ALuint b)
+{ return ((a > b) ? b : a); }
+static __inline ALuint maxu(ALuint a, ALuint b)
+{ return ((a > b) ? a : b); }
+static __inline ALuint clampu(ALuint val, ALuint min, ALuint max)
+{ return minu(max, maxu(min, val)); }
+
+static __inline ALint mini(ALint a, ALint b)
+{ return ((a > b) ? b : a); }
+static __inline ALint maxi(ALint a, ALint b)
+{ return ((a > b) ? a : b); }
+static __inline ALint clampi(ALint val, ALint min, ALint max)
+{ return mini(max, maxi(min, val)); }
+
static __inline ALdouble lerp(ALdouble val1, ALdouble val2, ALdouble mu)
{
diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c
index 306d240d..267faad5 100644
--- a/OpenAL32/alBuffer.c
+++ b/OpenAL32/alBuffer.c
@@ -982,11 +982,11 @@ static ALmulaw EncodeMuLaw(ALshort val)
{
/* -32768 doesn't properly negate on a short; it results in itself.
* So clamp to -32767 */
- val = max(val, -32767);
+ val = maxi(val, -32767);
val = -val;
}
- val = min(val, muLawClip);
+ val = mini(val, muLawClip);
val += muLawBias;
exp = muLawCompressTable[(val>>7) & 0xff];
@@ -1010,8 +1010,7 @@ static void DecodeIMA4Block(ALshort *dst, const ALima4 *src, ALint numchans)
index[c] |= *(src++) << 8;
index[c] = (index[c]^0x8000) - 32768;
- index[c] = max(0, index[c]);
- index[c] = min(index[c], 88);
+ index[c] = clampi(index[c], 0, 88);
dst[c] = sample[c];
}
@@ -1035,12 +1034,10 @@ static void DecodeIMA4Block(ALshort *dst, const ALima4 *src, ALint numchans)
code[c] >>= 4;
sample[c] += IMA4Codeword[nibble] * IMAStep_size[index[c]] / 8;
- sample[c] = max(-32768, sample[c]);
- sample[c] = min(sample[c], 32767);
+ sample[c] = clampi(sample[c], -32768, 32767);
index[c] += IMA4Index_adjust[nibble];
- index[c] = max(0, index[c]);
- index[c] = min(index[c], 88);
+ index[c] = clampi(index[c], 0, 88);
dst[j*numchans + c] = sample[c];
}
@@ -1065,16 +1062,14 @@ static void EncodeIMA4Block(ALima4 *dst, const ALshort *src, ALint *sample, ALin
diff = -diff;
}
- diff = min(step*2, diff);
+ diff = mini(step*2, diff);
nibble |= (diff*8/step - 1) / 2;
sample[c] += IMA4Codeword[nibble] * step / 8;
- sample[c] = max(-32768, sample[c]);
- sample[c] = min(sample[c], 32767);
+ sample[c] = clampi(sample[c], -32768, 32767);
index[c] += IMA4Index_adjust[nibble];
- index[c] = max(0, index[c]);
- index[c] = min(index[c], 88);
+ index[c] = clampi(index[c], 0, 88);
*(dst++) = sample[c] & 0xff;
*(dst++) = (sample[c]>>8) & 0xff;
@@ -1100,16 +1095,14 @@ static void EncodeIMA4Block(ALima4 *dst, const ALshort *src, ALint *sample, ALin
diff = -diff;
}
- diff = min(step*2, diff);
+ diff = mini(step*2, diff);
nibble |= (diff*8/step - 1) / 2;
sample[c] += IMA4Codeword[nibble] * step / 8;
- sample[c] = max(-32768, sample[c]);
- sample[c] = min(sample[c], 32767);
+ sample[c] = clampi(sample[c], -32768, 32767);
index[c] += IMA4Index_adjust[nibble];
- index[c] = max(0, index[c]);
- index[c] = min(index[c], 88);
+ index[c] = clampi(index[c], 0, 88);
if(!(k&1)) *dst = nibble;
else *(dst++) |= nibble<<4;