diff options
author | Chris Robinson <[email protected]> | 2014-05-18 07:54:51 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2014-05-18 08:59:10 -0700 |
commit | 29b5dae6aa010224b2fd428530e1cd67d6d92e1a (patch) | |
tree | 544b4c9d9d82ad3e0e050aa12ad7dcd71101ff38 /Alc/mixer_inc.c | |
parent | bd2721dc7a2bd3376e01ff32c18737a6fa38ff42 (diff) |
Pass some DirectParams as function parameters
Diffstat (limited to 'Alc/mixer_inc.c')
-rw-r--r-- | Alc/mixer_inc.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Alc/mixer_inc.c b/Alc/mixer_inc.c index 6bc4eb9b..b75ddad3 100644 --- a/Alc/mixer_inc.c +++ b/Alc/mixer_inc.c @@ -25,14 +25,13 @@ static inline void ApplyCoeffs(ALuint Offset, ALfloat (*restrict Values)[2], ALfloat left, ALfloat right); -void MixDirect_Hrtf(DirectParams *params, const ALfloat *restrict data, ALuint srcchan, - ALuint OutPos, ALuint BufferSize) +void MixDirect_Hrtf(DirectParams *params, + ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *restrict data, + ALuint Counter, ALuint srcchan, ALuint OutPos, ALuint BufferSize) { - ALfloat (*restrict DryBuffer)[BUFFERSIZE] = params->OutBuffer; const ALuint IrSize = params->Mix.Hrtf.IrSize; const HrtfParams *hrtfparams = ¶ms->Mix.Hrtf.Params[srcchan]; HrtfState *hrtfstate = ¶ms->Mix.Hrtf.State[srcchan]; - ALuint Counter = maxu(params->Counter, OutPos) - OutPos; ALuint Offset = params->Offset + OutPos; alignas(16) ALfloat Coeffs[HRIR_LENGTH][2]; ALuint Delay[2]; @@ -66,8 +65,8 @@ void MixDirect_Hrtf(DirectParams *params, const ALfloat *restrict data, ALuint s Offset++; ApplyCoeffsStep(Offset, hrtfstate->Values, IrSize, Coeffs, hrtfparams->CoeffStep, left, right); - DryBuffer[FrontLeft][OutPos] += hrtfstate->Values[Offset&HRIR_MASK][0]; - DryBuffer[FrontRight][OutPos] += hrtfstate->Values[Offset&HRIR_MASK][1]; + OutBuffer[FrontLeft][OutPos] += hrtfstate->Values[Offset&HRIR_MASK][0]; + OutBuffer[FrontRight][OutPos] += hrtfstate->Values[Offset&HRIR_MASK][1]; OutPos++; } @@ -84,8 +83,8 @@ void MixDirect_Hrtf(DirectParams *params, const ALfloat *restrict data, ALuint s Offset++; ApplyCoeffs(Offset, hrtfstate->Values, IrSize, Coeffs, left, right); - DryBuffer[FrontLeft][OutPos] += hrtfstate->Values[Offset&HRIR_MASK][0]; - DryBuffer[FrontRight][OutPos] += hrtfstate->Values[Offset&HRIR_MASK][1]; + OutBuffer[FrontLeft][OutPos] += hrtfstate->Values[Offset&HRIR_MASK][0]; + OutBuffer[FrontRight][OutPos] += hrtfstate->Values[Offset&HRIR_MASK][1]; OutPos++; } |