kcat/openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clamp the current and target gain lower bound to epsilon

Browse Source 
Should give a bit more wiggle room for the gain stepping to get lower than the
silence threshold.
This commit is contained in:
Chris Robinson 2014-05-03 17:51:06 -07:00
parent 34e96aef60
commit b2e533fbfc
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Alc/ALu.c
View File

@ -437,8 +437,8 @@ ALvoid CalcNonAttnSourceParams(ALactivesource *src, const ALCcontext *ALContext)
{
for(j = 0;j < MaxChannels;j++)
{
ALfloat cur = maxf(Current[i][j], GAIN_SILENCE_THRESHOLD);
ALfloat trg = maxf(Matrix[i][j], GAIN_SILENCE_THRESHOLD);
ALfloat cur = maxf(Current[i][j], FLT_EPSILON);
ALfloat trg = maxf(Matrix[i][j], FLT_EPSILON);
if(fabs(trg - cur) >= GAIN_SILENCE_THRESHOLD)
Step[i][j] = powf(trg/cur, 1.0f/64.0f);
else
@ -527,8 +527,8 @@ ALvoid CalcNonAttnSourceParams(ALactivesource *src, const ALCcontext *ALContext)
{
for(j = 0;j < MaxChannels;j++)
{
ALfloat trg = maxf(Matrix[i][j], GAIN_SILENCE_THRESHOLD);
ALfloat cur = maxf(Current[i][j], GAIN_SILENCE_THRESHOLD);
ALfloat trg = maxf(Matrix[i][j], FLT_EPSILON);
ALfloat cur = maxf(Current[i][j], FLT_EPSILON);
if(fabs(trg - cur) >= GAIN_SILENCE_THRESHOLD)
Step[i][j] = powf(trg/cur, 1.0f/64.0f);
else
@ -560,8 +560,8 @@ ALvoid CalcNonAttnSourceParams(ALactivesource *src, const ALCcontext *ALContext)
{
if(src->Send[i].Moving)
{
ALfloat cur = maxf(src->Send[i].Gain.Current, GAIN_SILENCE_THRESHOLD);
ALfloat trg = maxf(src->Send[i].Gain.Target, GAIN_SILENCE_THRESHOLD);
ALfloat cur = maxf(src->Send[i].Gain.Current, FLT_EPSILON);
ALfloat trg = maxf(src->Send[i].Gain.Target, FLT_EPSILON);
if(fabs(trg - cur) >= GAIN_SILENCE_THRESHOLD)
src->Send[i].Gain.Step = powf(trg/cur, 1.0f/64.0f);
else
@ -1025,8 +1025,8 @@ ALvoid CalcSourceParams(ALactivesource *src, const ALCcontext *ALContext)
ALfloat (*restrict Step)[MaxChannels] = src->Direct.Mix.Gains.Step;
for(j = 0;j < MaxChannels;j++)
{
ALfloat cur = maxf(Current[0][j], GAIN_SILENCE_THRESHOLD);
ALfloat trg = maxf(Matrix[0][j], GAIN_SILENCE_THRESHOLD);
ALfloat cur = maxf(Current[0][j], FLT_EPSILON);
ALfloat trg = maxf(Matrix[0][j], FLT_EPSILON);
if(fabs(trg - cur) >= GAIN_SILENCE_THRESHOLD)
Step[0][j] = powf(trg/cur, 1.0f/64.0f);
else
@ -1057,8 +1057,8 @@ ALvoid CalcSourceParams(ALactivesource *src, const ALCcontext *ALContext)
{
if(src->Send[i].Moving)
{
ALfloat cur = maxf(src->Send[i].Gain.Current, GAIN_SILENCE_THRESHOLD);
ALfloat trg = maxf(src->Send[i].Gain.Target, GAIN_SILENCE_THRESHOLD);
ALfloat cur = maxf(src->Send[i].Gain.Current, FLT_EPSILON);
ALfloat trg = maxf(src->Send[i].Gain.Target, FLT_EPSILON);
if(fabs(trg - cur) >= GAIN_SILENCE_THRESHOLD)
src->Send[i].Gain.Step = powf(trg/cur, 1.0f/64.0f);
else

2
OpenAL32/Include/alu.h
View File

@ -111,7 +111,7 @@ typedef ALvoid (*WetMixerFunc)(struct SendParams *params,
ALuint OutPos, ALuint BufferSize);
#define GAIN_SILENCE_THRESHOLD (0.00001f)
#define GAIN_SILENCE_THRESHOLD (0.00001f) /* -100dB */
#define SPEEDOFSOUNDMETRESPERSEC (343.3f)
#define AIRABSORBGAINHF (0.99426f) /* -0.05dB */