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

Store the calculated source parameters in the source struct

Browse Source
This commit is contained in:
Chris Robinson 2009-10-21 14:25:54 -07:00
parent 47b8510b0c
commit 8dbac9c0bd
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Alc/ALu.c
View File

@ -823,7 +823,7 @@ static void MixSomeSources(ALCcontext *ALContext, float (*DryBuffer)[OUTPUTCHANN
static float DummyBuffer[BUFFERSIZE];
ALfloat *WetBuffer[MAX_SENDS];
ALfloat (*Matrix)[OUTPUTCHANNELS] = ALContext->ChannelMatrix;
ALfloat DrySend[OUTPUTCHANNELS] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f };
ALfloat DrySend[OUTPUTCHANNELS];
ALfloat dryGainStep[OUTPUTCHANNELS];
ALfloat wetGainStep[MAX_SENDS];
ALuint i, j, k, out;
@ -879,18 +879,19 @@ another_source:
goto skipmix;
/* Get source info */
DryFilter = &ALSource->iirFilter;
DryFilter = &ALSource->Params.iirFilter;
for(i = 0;i < MAX_SENDS;i++)
{
WetFilter[i] = &ALSource->Send[i].iirFilter;
WetFilter[i] = &ALSource->Params.Send[i].iirFilter;
WetBuffer[i] = (ALSource->Send[i].Slot ?
ALSource->Send[i].Slot->WetBuffer :
DummyBuffer);
}
CalcSourceParams(ALContext, ALSource, (Channels==1)?AL_TRUE:AL_FALSE,
DrySend, WetSend, &Pitch, DryFilter, WetFilter);
Pitch = (Pitch*ALBuffer->frequency) / frequency;
ALSource->Params.DryGains, ALSource->Params.WetGains,
&ALSource->Params.Pitch, DryFilter, WetFilter);
Pitch = (ALSource->Params.Pitch*ALBuffer->frequency) / frequency;
if(DuplicateStereo && Channels == 2)
{
@ -912,20 +913,28 @@ another_source:
{
ALSource->FirstStart = AL_FALSE;
for(i = 0;i < OUTPUTCHANNELS;i++)
{
DrySend[i] = ALSource->Params.DryGains[i];
dryGainStep[i] = 0.0f;
}
for(i = 0;i < MAX_SENDS;i++)
{
WetSend[i] = ALSource->Params.WetGains[i];
wetGainStep[i] = 0.0f;
}
}
else
{
for(i = 0;i < OUTPUTCHANNELS;i++)
{
dryGainStep[i] = (DrySend[i]-ALSource->DryGains[i]) / rampLength;
dryGainStep[i] = (ALSource->Params.DryGains[i]-
ALSource->DryGains[i]) / rampLength;
DrySend[i] = ALSource->DryGains[i];
}
for(i = 0;i < MAX_SENDS;i++)
{
wetGainStep[i] = (WetSend[i]-ALSource->WetGains[i]) / rampLength;
wetGainStep[i] = (ALSource->Params.WetGains[i]-
ALSource->WetGains[i]) / rampLength;
WetSend[i] = ALSource->WetGains[i];
}
}

28
OpenAL32/Include/alSource.h
View File

@ -66,8 +66,6 @@ typedef struct ALsource
struct {
struct ALeffectslot *Slot;
ALfilter WetFilter;
FILTER iirFilter;
ALfloat history[2];
} Send[MAX_SENDS];
ALboolean DryGainHFAuto;
@ -75,18 +73,10 @@ typedef struct ALsource
ALboolean WetGainHFAuto;
ALfloat OuterGainHF;
FILTER iirFilter;
ALfloat history[OUTPUTCHANNELS*2];
ALfloat AirAbsorptionFactor;
ALfloat RoomRolloffFactor;
ALfloat DopplerFactor;
// Index to itself
ALuint source;
ALint lOffset;
ALint lOffsetType;
@ -98,6 +88,24 @@ typedef struct ALsource
ALfloat WetGains[MAX_SENDS];
ALboolean FirstStart;
// Current target parameters used for mixing
struct {
ALfloat DryGains[OUTPUTCHANNELS];
ALfloat WetGains[MAX_SENDS];
ALfloat Pitch;
struct {
FILTER iirFilter;
ALfloat history[2];
} Send[MAX_SENDS];
FILTER iirFilter;
ALfloat history[OUTPUTCHANNELS*2];
} Params;
// Index to itself
ALuint source;
struct ALsource *next;
} ALsource;