diff options
| author | Chris Robinson <[email protected]> | 2022-09-02 09:41:19 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2022-09-02 09:41:19 -0700 |
| commit | e5c49d019f41ac9b2d04f9cd04f6c3f8421703a6 (patch) | |
| tree | 49279ead685246375a18453fce2f551424acda49 /core/ambidefs.cpp | |
| parent | 02cf2bde7b513a67742dea38d949f9e4338e75c6 (diff) | |
Revert "Don't apply the HF scaling for "upsampling" ambisonics"
This reverts commit bf3f63fb4c5faa45784d7433d68b7013e29ee2c1.
Diffstat (limited to 'core/ambidefs.cpp')
| -rw-r--r-- | core/ambidefs.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/core/ambidefs.cpp b/core/ambidefs.cpp index e34b520e..864144b8 100644 --- a/core/ambidefs.cpp +++ b/core/ambidefs.cpp @@ -366,3 +366,22 @@ const std::array<AmbiChannelFloatArray,9> AmbiScale::SecondOrder2DUp{CalcSecondO const std::array<AmbiChannelFloatArray,16> AmbiScale::ThirdOrderUp{CalcThirdOrderUp()}; const std::array<AmbiChannelFloatArray,16> AmbiScale::ThirdOrder2DUp{CalcThirdOrder2DUp()}; const std::array<AmbiChannelFloatArray,25> AmbiScale::FourthOrder2DUp{CalcFourthOrder2DUp()}; + +const std::array<float,MaxAmbiOrder+1> AmbiScale::DecoderHFScale1O{{ + 2.000000000e+00f, 1.154700538e+00f +}}; +const std::array<float,MaxAmbiOrder+1> AmbiScale::DecoderHFScale1O2D{{ + 1.414213562e+00f, 1.000000000e+00f +}}; +const std::array<float,MaxAmbiOrder+1> AmbiScale::DecoderHFScale2O{{ + 1.972026594e+00f, 1.527525232e+00f, 7.888106377e-01f +}}; +const std::array<float,MaxAmbiOrder+1> AmbiScale::DecoderHFScale2O2D{{ + 1.414213562e+00f, 1.224744871e+00f, 7.071067812e-01f +}}; +const std::array<float,MaxAmbiOrder+1> AmbiScale::DecoderHFScale3O{{ + 1.865086714e+00f, 1.606093894e+00f, 1.142055301e+00f, 5.683795528e-01f +}}; +const std::array<float,MaxAmbiOrder+1> AmbiScale::DecoderHFScale3O2D{{ + 1.414213562e+00f, 1.306562965e+00f, 1.000000000e+00f, 5.411961001e-01f +}}; |