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

Pass the device to the mix function and localize the dry mix and click buffers

Browse Source
This commit is contained in:
Chris Robinson 2010-09-26 12:23:22 -07:00
parent 7cd52b2857
commit 92d8d2f8a4
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Alc/mixer.c
View File

@ -96,6 +96,8 @@ static __inline ALfloat cos_lerp16(ALfloat val1, ALfloat val2, ALint frac)
#define DO_MIX_MONO(S,sampler) do { \ #define DO_MIX_MONO(S,sampler) do { \
ALfloat (*DryBuffer)[OUTPUTCHANNELS]; \
ALfloat *ClickRemoval, *PendingClicks; \
ALuint pos = DataPosInt; \ ALuint pos = DataPosInt; \
ALuint frac = DataPosFrac; \ ALuint frac = DataPosFrac; \
ALfloat DrySend[OUTPUTCHANNELS]; \ ALfloat DrySend[OUTPUTCHANNELS]; \
@ -104,6 +106,9 @@ static __inline ALfloat cos_lerp16(ALfloat val1, ALfloat val2, ALint frac)
ALuint i, out; \ ALuint i, out; \
ALfloat value; \ ALfloat value; \
\ \
DryBuffer = Device->DryBuffer; \
ClickRemoval = Device->ClickRemoval; \
PendingClicks = Device->PendingClicks; \
DryFilter = &Source->Params.iirFilter; \ DryFilter = &Source->Params.iirFilter; \
for(i = 0;i < OUTPUTCHANNELS;i++) \ for(i = 0;i < OUTPUTCHANNELS;i++) \
DrySend[i] = Source->Params.DryGains[i]; \ DrySend[i] = Source->Params.DryGains[i]; \
@ -237,6 +242,8 @@ static __inline ALfloat cos_lerp16(ALfloat val1, ALfloat val2, ALint frac)
#define DO_MIX_STEREO(S,sampler) do { \ #define DO_MIX_STEREO(S,sampler) do { \
const ALfloat scaler = 1.0f/Channels; \ const ALfloat scaler = 1.0f/Channels; \
ALfloat (*DryBuffer)[OUTPUTCHANNELS]; \
ALfloat *ClickRemoval, *PendingClicks; \
ALuint pos = DataPosInt; \ ALuint pos = DataPosInt; \
ALuint frac = DataPosFrac; \ ALuint frac = DataPosFrac; \
ALfloat DrySend[OUTPUTCHANNELS]; \ ALfloat DrySend[OUTPUTCHANNELS]; \
@ -245,6 +252,9 @@ static __inline ALfloat cos_lerp16(ALfloat val1, ALfloat val2, ALint frac)
ALuint i, out; \ ALuint i, out; \
ALfloat value; \ ALfloat value; \
\ \
DryBuffer = Device->DryBuffer; \
ClickRemoval = Device->ClickRemoval; \
PendingClicks = Device->PendingClicks; \
DryFilter = &Source->Params.iirFilter; \ DryFilter = &Source->Params.iirFilter; \
for(i = 0;i < OUTPUTCHANNELS;i++) \ for(i = 0;i < OUTPUTCHANNELS;i++) \
DrySend[i] = Source->Params.DryGains[i]; \ DrySend[i] = Source->Params.DryGains[i]; \
@ -383,6 +393,8 @@ static __inline ALfloat cos_lerp16(ALfloat val1, ALfloat val2, ALint frac)
#define DO_MIX_MC(S,sampler) do { \ #define DO_MIX_MC(S,sampler) do { \
const ALfloat scaler = 1.0f/Channels; \ const ALfloat scaler = 1.0f/Channels; \
ALfloat (*DryBuffer)[OUTPUTCHANNELS]; \
ALfloat *ClickRemoval, *PendingClicks; \
ALuint pos = DataPosInt; \ ALuint pos = DataPosInt; \
ALuint frac = DataPosFrac; \ ALuint frac = DataPosFrac; \
ALfloat DrySend[OUTPUTCHANNELS]; \ ALfloat DrySend[OUTPUTCHANNELS]; \
@ -391,6 +403,9 @@ static __inline ALfloat cos_lerp16(ALfloat val1, ALfloat val2, ALint frac)
ALuint i, out; \ ALuint i, out; \
ALfloat value; \ ALfloat value; \
\ \
DryBuffer = Device->DryBuffer; \
ClickRemoval = Device->ClickRemoval; \
PendingClicks = Device->PendingClicks; \
DryFilter = &Source->Params.iirFilter; \ DryFilter = &Source->Params.iirFilter; \
for(i = 0;i < OUTPUTCHANNELS;i++) \ for(i = 0;i < OUTPUTCHANNELS;i++) \
DrySend[i] = Source->Params.DryGains[i]; \ DrySend[i] = Source->Params.DryGains[i]; \
@ -601,9 +616,7 @@ static __inline ALfloat cos_lerp16(ALfloat val1, ALfloat val2, ALint frac)
} while(0) } while(0)
ALvoid MixSource(ALsource *Source, ALuint SamplesToDo, ALvoid MixSource(ALsource *Source, ALCdevice *Device, ALuint SamplesToDo)
ALfloat (*DryBuffer)[OUTPUTCHANNELS],
ALfloat *ClickRemoval, ALfloat *PendingClicks)
{ {
ALbufferlistitem *BufferListItem; ALbufferlistitem *BufferListItem;
ALint64 DataSize64,DataPos64; ALint64 DataSize64,DataPos64;
@ -752,8 +765,6 @@ ALvoid MixSource(ALsource *Source, ALuint SamplesToDo,
ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size) ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size)
{ {
ALfloat (*DryBuffer)[OUTPUTCHANNELS];
ALfloat *ClickRemoval;
ALuint SamplesToDo; ALuint SamplesToDo;
ALeffectslot *ALEffectSlot; ALeffectslot *ALEffectSlot;
ALCcontext **ctx, **ctx_end; ALCcontext **ctx, **ctx_end;
@ -773,14 +784,13 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size)
(void)fpuState; (void)fpuState;
#endif #endif
DryBuffer = device->DryBuffer;
while(size > 0) while(size > 0)
{ {
/* Setup variables */ /* Setup variables */
SamplesToDo = min(size, BUFFERSIZE); SamplesToDo = min(size, BUFFERSIZE);
/* Clear mixing buffer */ /* Clear mixing buffer */
memset(DryBuffer, 0, SamplesToDo*OUTPUTCHANNELS*sizeof(ALfloat)); memset(device->DryBuffer, 0, SamplesToDo*OUTPUTCHANNELS*sizeof(ALfloat));
SuspendContext(NULL); SuspendContext(NULL);
ctx = device->Contexts; ctx = device->Contexts;
@ -806,8 +816,7 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size)
(*src)->NeedsUpdate = AL_FALSE; (*src)->NeedsUpdate = AL_FALSE;
} }
ALsource_Mix(*src, SamplesToDo, DryBuffer, ALsource_Mix(*src, device, SamplesToDo);
device->ClickRemoval, device->PendingClicks);
src++; src++;
} }
@ -816,11 +825,10 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size)
{ {
ALEffectSlot = (*ctx)->EffectSlotMap.array[e].value; ALEffectSlot = (*ctx)->EffectSlotMap.array[e].value;
ClickRemoval = ALEffectSlot->ClickRemoval;
for(i = 0;i < SamplesToDo;i++) for(i = 0;i < SamplesToDo;i++)
{ {
ClickRemoval[0] -= ClickRemoval[0] / 256.0f; ALEffectSlot->ClickRemoval[0] -= ALEffectSlot->ClickRemoval[0] / 256.0f;
ALEffectSlot->WetBuffer[i] += ClickRemoval[0]; ALEffectSlot->WetBuffer[i] += ALEffectSlot->ClickRemoval[0];
} }
for(i = 0;i < 1;i++) for(i = 0;i < 1;i++)
{ {
@ -828,7 +836,9 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size)
ALEffectSlot->PendingClicks[i] = 0.0f; ALEffectSlot->PendingClicks[i] = 0.0f;
} }
ALEffect_Process(ALEffectSlot->EffectState, ALEffectSlot, SamplesToDo, ALEffectSlot->WetBuffer, DryBuffer); ALEffect_Process(ALEffectSlot->EffectState, ALEffectSlot,
SamplesToDo, ALEffectSlot->WetBuffer,
device->DryBuffer);
for(i = 0;i < SamplesToDo;i++) for(i = 0;i < SamplesToDo;i++)
ALEffectSlot->WetBuffer[i] = 0.0f; ALEffectSlot->WetBuffer[i] = 0.0f;
@ -841,13 +851,12 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size)
ProcessContext(NULL); ProcessContext(NULL);
//Post processing loop //Post processing loop
ClickRemoval = device->ClickRemoval;
for(i = 0;i < SamplesToDo;i++) for(i = 0;i < SamplesToDo;i++)
{ {
for(c = 0;c < OUTPUTCHANNELS;c++) for(c = 0;c < OUTPUTCHANNELS;c++)
{ {
ClickRemoval[c] -= ClickRemoval[c] / 256.0f; device->ClickRemoval[c] -= device->ClickRemoval[c] / 256.0f;
DryBuffer[i][c] += ClickRemoval[c]; device->DryBuffer[i][c] += device->ClickRemoval[c];
} }
} }
for(i = 0;i < OUTPUTCHANNELS;i++) for(i = 0;i < OUTPUTCHANNELS;i++)

8
OpenAL32/Include/alSource.h
View File

@ -98,15 +98,13 @@ typedef struct ALsource
} Params; } Params;
ALvoid (*Update)(struct ALsource *self, const ALCcontext *context); ALvoid (*Update)(struct ALsource *self, const ALCcontext *context);
ALvoid (*Mix)(struct ALsource *self, ALuint SamplesToDo, ALvoid (*Mix)(struct ALsource *self, ALCdevice *Device, ALuint SamplesToDo);
ALfloat (*DryBuffer)[OUTPUTCHANNELS],
ALfloat *ClickRemoval, ALfloat *PendingClicks);
// Index to itself // Index to itself
ALuint source; ALuint source;
} ALsource; } ALsource;
#define ALsource_Update(s,a) ((s)->Update(s,a)) #define ALsource_Update(s,a) ((s)->Update(s,a))
#define ALsource_Mix(s,a,b,c,d) ((s)->Mix(s,a,b,c,d)) #define ALsource_Mix(s,a,b) ((s)->Mix(s,a,b))
ALvoid ReleaseALSources(ALCcontext *Context); ALvoid ReleaseALSources(ALCcontext *Context);

4
OpenAL32/Include/alu.h
View File

@ -189,9 +189,7 @@ ALvoid aluInitPanning(ALCdevice *Device);
ALvoid CalcSourceParams(struct ALsource *ALSource, const ALCcontext *ALContext); ALvoid CalcSourceParams(struct ALsource *ALSource, const ALCcontext *ALContext);
ALvoid CalcNonAttnSourceParams(struct ALsource *ALSource, const ALCcontext *ALContext); ALvoid CalcNonAttnSourceParams(struct ALsource *ALSource, const ALCcontext *ALContext);
ALvoid MixSource(struct ALsource *Source, ALuint SamplesToDo, ALvoid MixSource(struct ALsource *Source, ALCdevice *Device, ALuint SamplesToDo);
ALfloat (*DryBuffer)[OUTPUTCHANNELS],
ALfloat *ClickRemoval, ALfloat *PendingClicks);
ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size); ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size);
ALvoid aluHandleDisconnect(ALCdevice *device); ALvoid aluHandleDisconnect(ALCdevice *device);