diff options
author | Chris Robinson <[email protected]> | 2018-12-16 21:03:24 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2018-12-16 21:03:24 -0800 |
commit | 3b0fd20bee855bbd7075b34e32f2272f71e28462 (patch) | |
tree | 8b93832ef3a629da31ff1dd8fe335f1b98905297 /Alc/panning.cpp | |
parent | 064f4f500a2805167f543670d999977322ba3e87 (diff) |
Always use the transcode method with the AmbiUpsampler
Diffstat (limited to 'Alc/panning.cpp')
-rw-r--r-- | Alc/panning.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/Alc/panning.cpp b/Alc/panning.cpp index 3ea0ae06..28df87d0 100644 --- a/Alc/panning.cpp +++ b/Alc/panning.cpp @@ -435,18 +435,7 @@ void InitPanning(ALCdevice *device) device->FOAOut.CoeffCount = 0; device->FOAOut.NumChannels = 4; - ALfloat w_scale{1.0f}, xyz_scale{1.0f}; - if(device->mAmbiOrder >= 3) - { - w_scale = W_SCALE_3H3P; - xyz_scale = XYZ_SCALE_3H3P; - } - else - { - w_scale = W_SCALE_2H2P; - xyz_scale = XYZ_SCALE_2H2P; - } - device->AmbiUp->reset(device, w_scale, xyz_scale); + device->AmbiUp->reset(device); } ALfloat nfc_delay{0.0f}; @@ -738,8 +727,7 @@ void InitHrtfPanning(ALCdevice *device) device->FOAOut.CoeffCount = 0; device->FOAOut.NumChannels = 4; - device->AmbiUp->reset(device, AmbiOrderHFGainFOA[0] / AmbiOrderHFGain[0], - AmbiOrderHFGainFOA[1] / AmbiOrderHFGain[1]); + device->AmbiUp->reset(device); } else { |