Merge branch 'UPSTREAM' into UPSTREAM_MERGE

1 files changed, 36 insertions, 83 deletions

diff --git a/Alc/mixer_inc.c b/Alc/mixer_inc.c
index 17be5cde..7c90ae9c 100644
--- a/Alc/mixer_inc.c
+++ b/Alc/mixer_inc.c
@@ -2,15 +2,11 @@
 
 #include "alMain.h"
 #include "alSource.h"
+
+#include "hrtf.h"
 #include "mixer_defs.h"
+#include "align.h"
 
-#ifdef __GNUC__
-#define LIKELY(x) __builtin_expect(!!(x), 1)
-#define UNLIKELY(x) __builtin_expect(!!(x), 0)
-#else
-#define LIKELY(x) (x)
-#define UNLIKELY(x) (x)
-#endif
 
 #define REAL_MERGE2(a,b) a##b
 #define MERGE2(a,b) REAL_MERGE2(a,b)
@@ -18,116 +14,76 @@
 #define MixDirect_Hrtf MERGE2(MixDirect_Hrtf_,SUFFIX)
 
 
-static inline void ApplyCoeffsStep(const ALuint irSize,
+static inline void ApplyCoeffsStep(ALuint Offset, ALfloat (*restrict Values)[2],
+                                   const ALuint irSize,
                                    ALfloat (*restrict Coeffs)[2],
-                                   const ALfloat (*restrict CoeffStep)[2]);
+                                   const ALfloat (*restrict CoeffStep)[2],
+                                   ALfloat left, ALfloat right);
 static inline void ApplyCoeffs(ALuint Offset, ALfloat (*restrict Values)[2],
                                const ALuint irSize,
                                ALfloat (*restrict Coeffs)[2],
                                ALfloat left, ALfloat right);
 
 
-void MixDirect_Hrtf(const DirectParams *params, const ALfloat *restrict data, ALuint srcchan,
-  ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize)
+void MixDirect_Hrtf(ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *data,
+                    ALuint Counter, ALuint Offset, ALuint OutPos, const ALuint IrSize,
+                    const HrtfParams *hrtfparams, HrtfState *hrtfstate, ALuint BufferSize)
 {
-    ALfloat (*restrict DryBuffer)[BUFFERSIZE] = params->OutBuffer;
-    ALfloat *restrict ClickRemoval = params->ClickRemoval;
-    ALfloat *restrict PendingClicks = params->PendingClicks;
-    const ALuint IrSize = params->Hrtf.Params.IrSize;
-    const ALint *restrict DelayStep = params->Hrtf.Params.DelayStep;
-    const ALfloat (*restrict CoeffStep)[2] = params->Hrtf.Params.CoeffStep;
-    const ALfloat (*restrict TargetCoeffs)[2] = params->Hrtf.Params.Coeffs[srcchan];
-    const ALuint *restrict TargetDelay = params->Hrtf.Params.Delay[srcchan];
-    ALfloat *restrict History = params->Hrtf.State->History[srcchan];
-    ALfloat (*restrict Values)[2] = params->Hrtf.State->Values[srcchan];
-    ALint Counter = maxu(params->Hrtf.State->Counter, OutPos) - OutPos;
-    ALuint Offset = params->Hrtf.State->Offset + OutPos;
-    ALIGN(16) ALfloat Coeffs[HRIR_LENGTH][2];
+    alignas(16) ALfloat Coeffs[HRIR_LENGTH][2];
     ALuint Delay[2];
     ALfloat left, right;
     ALuint pos;
     ALuint c;
 
-    pos = 0;
     for(c = 0;c < IrSize;c++)
     {
-        Coeffs[c][0] = TargetCoeffs[c][0] - (CoeffStep[c][0]*Counter);
-        Coeffs[c][1] = TargetCoeffs[c][1] - (CoeffStep[c][1]*Counter);
+        Coeffs[c][0] = hrtfparams->Coeffs[c][0] - (hrtfparams->CoeffStep[c][0]*Counter);
+        Coeffs[c][1] = hrtfparams->Coeffs[c][1] - (hrtfparams->CoeffStep[c][1]*Counter);
     }
+    Delay[0] = hrtfparams->Delay[0] - (hrtfparams->DelayStep[0]*Counter);
+    Delay[1] = hrtfparams->Delay[1] - (hrtfparams->DelayStep[1]*Counter);
 
-    Delay[0] = TargetDelay[0] - (DelayStep[0]*Counter);
-    Delay[1] = TargetDelay[1] - (DelayStep[1]*Counter);
-
-    if(LIKELY(OutPos == 0))
+    for(pos = 0;pos < BufferSize && pos < Counter;pos++)
     {
-        History[Offset&SRC_HISTORY_MASK] = data[pos];
-        left  = lerp(History[(Offset-(Delay[0]>>HRTFDELAY_BITS))&SRC_HISTORY_MASK],
-                     History[(Offset-(Delay[0]>>HRTFDELAY_BITS)-1)&SRC_HISTORY_MASK],
+        hrtfstate->History[Offset&SRC_HISTORY_MASK] = data[pos];
+        left  = lerp(hrtfstate->History[(Offset-(Delay[0]>>HRTFDELAY_BITS))&SRC_HISTORY_MASK],
+                     hrtfstate->History[(Offset-(Delay[0]>>HRTFDELAY_BITS)-1)&SRC_HISTORY_MASK],
                      (Delay[0]&HRTFDELAY_MASK)*(1.0f/HRTFDELAY_FRACONE));
-        right = lerp(History[(Offset-(Delay[1]>>HRTFDELAY_BITS))&SRC_HISTORY_MASK],
-                     History[(Offset-(Delay[1]>>HRTFDELAY_BITS)-1)&SRC_HISTORY_MASK],
+        right = lerp(hrtfstate->History[(Offset-(Delay[1]>>HRTFDELAY_BITS))&SRC_HISTORY_MASK],
+                     hrtfstate->History[(Offset-(Delay[1]>>HRTFDELAY_BITS)-1)&SRC_HISTORY_MASK],
                      (Delay[1]&HRTFDELAY_MASK)*(1.0f/HRTFDELAY_FRACONE));
 
-        ClickRemoval[FrontLeft]  -= Values[(Offset+1)&HRIR_MASK][0] +
-                                    Coeffs[0][0] * left;
-        ClickRemoval[FrontRight] -= Values[(Offset+1)&HRIR_MASK][1] +
-                                    Coeffs[0][1] * right;
-    }
-    for(pos = 0;pos < BufferSize && Counter > 0;pos++)
-    {
-        History[Offset&SRC_HISTORY_MASK] = data[pos];
-        left  = lerp(History[(Offset-(Delay[0]>>HRTFDELAY_BITS))&SRC_HISTORY_MASK],
-                     History[(Offset-(Delay[0]>>HRTFDELAY_BITS)-1)&SRC_HISTORY_MASK],
-                     (Delay[0]&HRTFDELAY_MASK)*(1.0f/HRTFDELAY_FRACONE));
-        right = lerp(History[(Offset-(Delay[1]>>HRTFDELAY_BITS))&SRC_HISTORY_MASK],
-                     History[(Offset-(Delay[1]>>HRTFDELAY_BITS)-1)&SRC_HISTORY_MASK],
-                     (Delay[1]&HRTFDELAY_MASK)*(1.0f/HRTFDELAY_FRACONE));
+        Delay[0] += hrtfparams->DelayStep[0];
+        Delay[1] += hrtfparams->DelayStep[1];
 
-        Delay[0] += DelayStep[0];
-        Delay[1] += DelayStep[1];
-
-        Values[(Offset+IrSize)&HRIR_MASK][0] = 0.0f;
-        Values[(Offset+IrSize)&HRIR_MASK][1] = 0.0f;
+        hrtfstate->Values[(Offset+IrSize)&HRIR_MASK][0] = 0.0f;
+        hrtfstate->Values[(Offset+IrSize)&HRIR_MASK][1] = 0.0f;
         Offset++;
 
-        ApplyCoeffs(Offset, Values, IrSize, Coeffs, left, right);
-        DryBuffer[FrontLeft][OutPos]  += Values[Offset&HRIR_MASK][0];
-        DryBuffer[FrontRight][OutPos] += Values[Offset&HRIR_MASK][1];
-        ApplyCoeffsStep(IrSize, Coeffs, CoeffStep);
-
+        ApplyCoeffsStep(Offset, hrtfstate->Values, IrSize, Coeffs, hrtfparams->CoeffStep, left, right);
+        OutBuffer[FrontLeft][OutPos]  += hrtfstate->Values[Offset&HRIR_MASK][0];
+        OutBuffer[FrontRight][OutPos] += hrtfstate->Values[Offset&HRIR_MASK][1];
         OutPos++;
-        Counter--;
     }
 
     Delay[0] >>= HRTFDELAY_BITS;
     Delay[1] >>= HRTFDELAY_BITS;
     for(;pos < BufferSize;pos++)
     {
-        History[Offset&SRC_HISTORY_MASK] = data[pos];
-        left = History[(Offset-Delay[0])&SRC_HISTORY_MASK];
-        right = History[(Offset-Delay[1])&SRC_HISTORY_MASK];
+        hrtfstate->History[Offset&SRC_HISTORY_MASK] = data[pos];
+        left = hrtfstate->History[(Offset-Delay[0])&SRC_HISTORY_MASK];
+        right = hrtfstate->History[(Offset-Delay[1])&SRC_HISTORY_MASK];
 
-        Values[(Offset+IrSize)&HRIR_MASK][0] = 0.0f;
-        Values[(Offset+IrSize)&HRIR_MASK][1] = 0.0f;
+        hrtfstate->Values[(Offset+IrSize)&HRIR_MASK][0] = 0.0f;
+        hrtfstate->Values[(Offset+IrSize)&HRIR_MASK][1] = 0.0f;
         Offset++;
 
-        ApplyCoeffs(Offset, Values, IrSize, Coeffs, left, right);
-        DryBuffer[FrontLeft][OutPos]  += Values[Offset&HRIR_MASK][0];
-        DryBuffer[FrontRight][OutPos] += Values[Offset&HRIR_MASK][1];
+        ApplyCoeffs(Offset, hrtfstate->Values, IrSize, Coeffs, left, right);
+        OutBuffer[FrontLeft][OutPos]  += hrtfstate->Values[Offset&HRIR_MASK][0];
+        OutBuffer[FrontRight][OutPos] += hrtfstate->Values[Offset&HRIR_MASK][1];
 
         OutPos++;
     }
-    if(LIKELY(OutPos == SamplesToDo))
-    {
-        History[Offset&SRC_HISTORY_MASK] = data[pos];
-        left = History[(Offset-Delay[0])&SRC_HISTORY_MASK];
-        right = History[(Offset-Delay[1])&SRC_HISTORY_MASK];
-
-        PendingClicks[FrontLeft]  += Values[(Offset+1)&HRIR_MASK][0] +
-                                     Coeffs[0][0] * left;
-        PendingClicks[FrontRight] += Values[(Offset+1)&HRIR_MASK][1] +
-                                     Coeffs[0][1] * right;
-    }
 }
 
 
@@ -135,6 +91,3 @@ void MixDirect_Hrtf(const DirectParams *params, const ALfloat *restrict data, AL
 
 #undef MERGE2
 #undef REAL_MERGE2
-
-#undef UNLIKELY
-#undef LIKELY