diff options
author | Chris Robinson <[email protected]> | 2022-09-03 21:06:39 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2022-09-03 21:06:39 -0700 |
commit | f2ff2bb2f6f2f9190210b60833b4232fe5398b07 (patch) | |
tree | 4506fea997e6c6828e428bea6791df467971d118 /alc/effects | |
parent | d2a2a696a13645414410c89614d482c33eae4d19 (diff) |
Use the difference in HF scale for upsampling ambisonics
Diffstat (limited to 'alc/effects')
-rw-r--r-- | alc/effects/convolution.cpp | 2 | ||||
-rw-r--r-- | alc/effects/reverb.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/alc/effects/convolution.cpp b/alc/effects/convolution.cpp index 90220a50..196238fc 100644 --- a/alc/effects/convolution.cpp +++ b/alc/effects/convolution.cpp @@ -420,7 +420,7 @@ void ConvolutionState::update(const ContextBase *context, const EffectSlot *slot if(device->mAmbiOrder > mAmbiOrder) { mMix = &ConvolutionState::UpsampleMix; - const auto scales = AmbiScale::GetHFOrderScales(mAmbiOrder, true); + const auto scales = AmbiScale::GetHFOrderScales(mAmbiOrder, device->mAmbiOrder); (*mChans)[0].mHfScale = scales[0]; for(size_t i{1};i < mChans->size();++i) (*mChans)[i].mHfScale = scales[1]; diff --git a/alc/effects/reverb.cpp b/alc/effects/reverb.cpp index ea3367d0..71640a87 100644 --- a/alc/effects/reverb.cpp +++ b/alc/effects/reverb.cpp @@ -686,7 +686,7 @@ void ReverbState::deviceUpdate(const DeviceBase *device, const Buffer&) if(device->mAmbiOrder > 1) { mUpmixOutput = true; - mOrderScales = AmbiScale::GetHFOrderScales(1, true); + mOrderScales = AmbiScale::GetHFOrderScales(1, device->mAmbiOrder); } else { |