diff options
| author | Chris Robinson <[email protected]> | 2014-04-05 10:24:13 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2014-04-05 10:24:13 -0700 |
| commit | 5e0fc84f49bb4f1491ff92ad0bc023b5b87ee934 (patch) | |
| tree | d81c36651edae6aa311335efac7c061ea22a1dfa | |
| parent | 569374da2c5f310d9309d477c24627133110dad0 (diff) | |
Make HRTF stepping values per-channel
| -rw-r--r-- | Alc/ALu.c | 4 | ||||
| -rw-r--r-- | Alc/mixer_inc.c | 4 | ||||
| -rw-r--r-- | OpenAL32/Include/alu.h | 4 |
3 files changed, 6 insertions, 6 deletions
@@ -959,8 +959,8 @@ ALvoid CalcSourceParams(ALactivesource *src, const ALCcontext *ALContext) src->Direct.Counter, src->Direct.Mix.Hrtf.Params.Coeffs[0], src->Direct.Mix.Hrtf.Params.Delay[0], - src->Direct.Mix.Hrtf.Params.CoeffStep, - src->Direct.Mix.Hrtf.Params.DelayStep); + src->Direct.Mix.Hrtf.Params.CoeffStep[0], + src->Direct.Mix.Hrtf.Params.DelayStep[0]); src->Direct.Counter = counter; src->Direct.Mix.Hrtf.Params.Gain = DryGain; src->Direct.Mix.Hrtf.Params.Dir[0] = Position[0]; diff --git a/Alc/mixer_inc.c b/Alc/mixer_inc.c index 93118423..a2d0a16c 100644 --- a/Alc/mixer_inc.c +++ b/Alc/mixer_inc.c @@ -28,8 +28,8 @@ void MixDirect_Hrtf(DirectParams *params, const ALfloat *restrict data, ALuint s { ALfloat (*restrict DryBuffer)[BUFFERSIZE] = params->OutBuffer; const ALuint IrSize = params->Mix.Hrtf.Params.IrSize; - const ALint *restrict DelayStep = params->Mix.Hrtf.Params.DelayStep; - const ALfloat (*restrict CoeffStep)[2] = params->Mix.Hrtf.Params.CoeffStep; + const ALint *restrict DelayStep = params->Mix.Hrtf.Params.DelayStep[srcchan]; + const ALfloat (*restrict CoeffStep)[2] = params->Mix.Hrtf.Params.CoeffStep[srcchan]; const ALfloat (*restrict TargetCoeffs)[2] = params->Mix.Hrtf.Params.Coeffs[srcchan]; const ALuint *restrict TargetDelay = params->Mix.Hrtf.Params.Delay[srcchan]; ALfloat *restrict History = params->Mix.Hrtf.State.History[srcchan]; diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index c2e725ff..c1aa143d 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -46,9 +46,9 @@ typedef struct HrtfParams { ALfloat Gain; ALfloat Dir[3]; ALIGN(16) ALfloat Coeffs[MAX_INPUT_CHANNELS][HRIR_LENGTH][2]; - ALIGN(16) ALfloat CoeffStep[HRIR_LENGTH][2]; + ALIGN(16) ALfloat CoeffStep[MAX_INPUT_CHANNELS][HRIR_LENGTH][2]; ALuint Delay[MAX_INPUT_CHANNELS][2]; - ALint DelayStep[2]; + ALint DelayStep[MAX_INPUT_CHANNELS][2]; ALuint IrSize; } HrtfParams; |