2021-05-14 10:15:42 +08:00
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
|
|
#include "ambidefs.h"
|
|
|
|
|
|
2023-02-04 15:03:54 +08:00
|
|
|
#include "alnumbers.h"
|
2021-05-14 10:15:42 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
2023-02-04 15:03:54 +08:00
|
|
|
using AmbiChannelFloatArray = std::array<float,MaxAmbiChannels>;
|
|
|
|
|
|
|
|
|
|
constexpr auto inv_sqrt2f = static_cast<float>(1.0/al::numbers::sqrt2);
|
|
|
|
|
constexpr auto inv_sqrt3f = static_cast<float>(1.0/al::numbers::sqrt3);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* These HF gains are derived from the same 32-point speaker array. The scale
|
|
|
|
|
* factor between orders represents the same scale factors for any (regular)
|
|
|
|
|
* speaker array decoder. e.g. Given a first-order source and second-order
|
|
|
|
|
* output, applying an HF scale of HFScales[1][0] / HFScales[2][0] to channel 0
|
|
|
|
|
* will result in that channel being subsequently decoded for second-order as
|
|
|
|
|
* if it was a first-order decoder for that same speaker array.
|
|
|
|
|
*/
|
|
|
|
|
constexpr std::array<std::array<float,MaxAmbiOrder+1>,MaxAmbiOrder+1> HFScales{{
|
|
|
|
|
{{ 4.000000000e+00f, 2.309401077e+00f, 1.192569588e+00f, 7.189495850e-01f }},
|
|
|
|
|
{{ 4.000000000e+00f, 2.309401077e+00f, 1.192569588e+00f, 7.189495850e-01f }},
|
|
|
|
|
{{ 2.981423970e+00f, 2.309401077e+00f, 1.192569588e+00f, 7.189495850e-01f }},
|
|
|
|
|
{{ 2.359168820e+00f, 2.031565936e+00f, 1.444598386e+00f, 7.189495850e-01f }},
|
|
|
|
|
/* 1.947005434e+00f, 1.764337084e+00f, 1.424707344e+00f, 9.755104127e-01f, 4.784482742e-01f */
|
|
|
|
|
}};
|
|
|
|
|
|
|
|
|
|
/* Same as above, but using a 10-point horizontal-only speaker array. Should
|
|
|
|
|
* only be used when the device is mixing in 2D B-Format for horizontal-only
|
|
|
|
|
* output.
|
|
|
|
|
*/
|
|
|
|
|
constexpr std::array<std::array<float,MaxAmbiOrder+1>,MaxAmbiOrder+1> HFScales2D{{
|
|
|
|
|
{{ 2.236067977e+00f, 1.581138830e+00f, 9.128709292e-01f, 6.050756345e-01f }},
|
|
|
|
|
{{ 2.236067977e+00f, 1.581138830e+00f, 9.128709292e-01f, 6.050756345e-01f }},
|
|
|
|
|
{{ 1.825741858e+00f, 1.581138830e+00f, 9.128709292e-01f, 6.050756345e-01f }},
|
|
|
|
|
{{ 1.581138830e+00f, 1.460781803e+00f, 1.118033989e+00f, 6.050756345e-01f }},
|
|
|
|
|
/* 1.414213562e+00f, 1.344997024e+00f, 1.144122806e+00f, 8.312538756e-01f, 4.370160244e-01f */
|
|
|
|
|
}};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This calculates a first-order "upsampler" matrix. It combines a first-order
|
|
|
|
|
* decoder matrix with a max-order encoder matrix, creating a matrix that
|
|
|
|
|
* behaves as if the B-Format input signal is first decoded to a speaker array
|
|
|
|
|
* at first-order, then those speaker feeds are encoded to a higher-order
|
|
|
|
|
* signal. While not perfect, this should accurately encode a lower-order
|
|
|
|
|
* signal into a higher-order signal.
|
|
|
|
|
*/
|
|
|
|
|
constexpr std::array<std::array<float,4>,8> FirstOrderDecoder{{
|
|
|
|
|
{{ 1.250000000e-01f, 1.250000000e-01f, 1.250000000e-01f, 1.250000000e-01f, }},
|
|
|
|
|
{{ 1.250000000e-01f, 1.250000000e-01f, 1.250000000e-01f, -1.250000000e-01f, }},
|
|
|
|
|
{{ 1.250000000e-01f, -1.250000000e-01f, 1.250000000e-01f, 1.250000000e-01f, }},
|
|
|
|
|
{{ 1.250000000e-01f, -1.250000000e-01f, 1.250000000e-01f, -1.250000000e-01f, }},
|
|
|
|
|
{{ 1.250000000e-01f, 1.250000000e-01f, -1.250000000e-01f, 1.250000000e-01f, }},
|
|
|
|
|
{{ 1.250000000e-01f, 1.250000000e-01f, -1.250000000e-01f, -1.250000000e-01f, }},
|
|
|
|
|
{{ 1.250000000e-01f, -1.250000000e-01f, -1.250000000e-01f, 1.250000000e-01f, }},
|
|
|
|
|
{{ 1.250000000e-01f, -1.250000000e-01f, -1.250000000e-01f, -1.250000000e-01f, }},
|
|
|
|
|
}};
|
|
|
|
|
constexpr std::array<AmbiChannelFloatArray,8> FirstOrderEncoder{{
|
|
|
|
|
CalcAmbiCoeffs( inv_sqrt3f, inv_sqrt3f, inv_sqrt3f),
|
|
|
|
|
CalcAmbiCoeffs( inv_sqrt3f, inv_sqrt3f, -inv_sqrt3f),
|
|
|
|
|
CalcAmbiCoeffs(-inv_sqrt3f, inv_sqrt3f, inv_sqrt3f),
|
|
|
|
|
CalcAmbiCoeffs(-inv_sqrt3f, inv_sqrt3f, -inv_sqrt3f),
|
|
|
|
|
CalcAmbiCoeffs( inv_sqrt3f, -inv_sqrt3f, inv_sqrt3f),
|
|
|
|
|
CalcAmbiCoeffs( inv_sqrt3f, -inv_sqrt3f, -inv_sqrt3f),
|
|
|
|
|
CalcAmbiCoeffs(-inv_sqrt3f, -inv_sqrt3f, inv_sqrt3f),
|
|
|
|
|
CalcAmbiCoeffs(-inv_sqrt3f, -inv_sqrt3f, -inv_sqrt3f),
|
2021-05-14 10:15:42 +08:00
|
|
|
}};
|
2023-02-04 15:03:54 +08:00
|
|
|
static_assert(FirstOrderDecoder.size() == FirstOrderEncoder.size(), "First-order mismatch");
|
|
|
|
|
|
|
|
|
|
/* This calculates a 2D first-order "upsampler" matrix. Same as the first-order
|
|
|
|
|
* matrix, just using a more optimized speaker array for horizontal-only
|
|
|
|
|
* content.
|
|
|
|
|
*/
|
|
|
|
|
constexpr std::array<std::array<float,4>,4> FirstOrder2DDecoder{{
|
|
|
|
|
{{ 2.500000000e-01f, 2.041241452e-01f, 0.0f, 2.041241452e-01f, }},
|
|
|
|
|
{{ 2.500000000e-01f, 2.041241452e-01f, 0.0f, -2.041241452e-01f, }},
|
|
|
|
|
{{ 2.500000000e-01f, -2.041241452e-01f, 0.0f, 2.041241452e-01f, }},
|
|
|
|
|
{{ 2.500000000e-01f, -2.041241452e-01f, 0.0f, -2.041241452e-01f, }},
|
|
|
|
|
}};
|
|
|
|
|
constexpr std::array<AmbiChannelFloatArray,4> FirstOrder2DEncoder{{
|
|
|
|
|
CalcAmbiCoeffs( inv_sqrt2f, 0.0f, inv_sqrt2f),
|
|
|
|
|
CalcAmbiCoeffs( inv_sqrt2f, 0.0f, -inv_sqrt2f),
|
|
|
|
|
CalcAmbiCoeffs(-inv_sqrt2f, 0.0f, inv_sqrt2f),
|
|
|
|
|
CalcAmbiCoeffs(-inv_sqrt2f, 0.0f, -inv_sqrt2f),
|
|
|
|
|
}};
|
|
|
|
|
static_assert(FirstOrder2DDecoder.size() == FirstOrder2DEncoder.size(), "First-order 2D mismatch");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This calculates a second-order "upsampler" matrix. Same as the first-order
|
|
|
|
|
* matrix, just using a slightly more dense speaker array suitable for second-
|
|
|
|
|
* order content.
|
|
|
|
|
*/
|
|
|
|
|
constexpr std::array<std::array<float,9>,12> SecondOrderDecoder{{
|
|
|
|
|
{{ 8.333333333e-02f, 0.000000000e+00f, -7.588274978e-02f, 1.227808683e-01f, 0.000000000e+00f, 0.000000000e+00f, -1.591525047e-02f, -1.443375673e-01f, 1.167715449e-01f, }},
|
|
|
|
|
{{ 8.333333333e-02f, -1.227808683e-01f, 0.000000000e+00f, 7.588274978e-02f, -1.443375673e-01f, 0.000000000e+00f, -9.316949906e-02f, 0.000000000e+00f, -7.216878365e-02f, }},
|
|
|
|
|
{{ 8.333333333e-02f, -7.588274978e-02f, 1.227808683e-01f, 0.000000000e+00f, 0.000000000e+00f, -1.443375673e-01f, 1.090847495e-01f, 0.000000000e+00f, -4.460276122e-02f, }},
|
|
|
|
|
{{ 8.333333333e-02f, 0.000000000e+00f, 7.588274978e-02f, 1.227808683e-01f, 0.000000000e+00f, 0.000000000e+00f, -1.591525047e-02f, 1.443375673e-01f, 1.167715449e-01f, }},
|
|
|
|
|
{{ 8.333333333e-02f, -1.227808683e-01f, 0.000000000e+00f, -7.588274978e-02f, 1.443375673e-01f, 0.000000000e+00f, -9.316949906e-02f, 0.000000000e+00f, -7.216878365e-02f, }},
|
|
|
|
|
{{ 8.333333333e-02f, 7.588274978e-02f, -1.227808683e-01f, 0.000000000e+00f, 0.000000000e+00f, -1.443375673e-01f, 1.090847495e-01f, 0.000000000e+00f, -4.460276122e-02f, }},
|
|
|
|
|
{{ 8.333333333e-02f, 0.000000000e+00f, -7.588274978e-02f, -1.227808683e-01f, 0.000000000e+00f, 0.000000000e+00f, -1.591525047e-02f, 1.443375673e-01f, 1.167715449e-01f, }},
|
|
|
|
|
{{ 8.333333333e-02f, 1.227808683e-01f, 0.000000000e+00f, -7.588274978e-02f, -1.443375673e-01f, 0.000000000e+00f, -9.316949906e-02f, 0.000000000e+00f, -7.216878365e-02f, }},
|
|
|
|
|
{{ 8.333333333e-02f, 7.588274978e-02f, 1.227808683e-01f, 0.000000000e+00f, 0.000000000e+00f, 1.443375673e-01f, 1.090847495e-01f, 0.000000000e+00f, -4.460276122e-02f, }},
|
|
|
|
|
{{ 8.333333333e-02f, 0.000000000e+00f, 7.588274978e-02f, -1.227808683e-01f, 0.000000000e+00f, 0.000000000e+00f, -1.591525047e-02f, -1.443375673e-01f, 1.167715449e-01f, }},
|
|
|
|
|
{{ 8.333333333e-02f, 1.227808683e-01f, 0.000000000e+00f, 7.588274978e-02f, 1.443375673e-01f, 0.000000000e+00f, -9.316949906e-02f, 0.000000000e+00f, -7.216878365e-02f, }},
|
|
|
|
|
{{ 8.333333333e-02f, -7.588274978e-02f, -1.227808683e-01f, 0.000000000e+00f, 0.000000000e+00f, 1.443375673e-01f, 1.090847495e-01f, 0.000000000e+00f, -4.460276122e-02f, }},
|
|
|
|
|
}};
|
|
|
|
|
constexpr std::array<AmbiChannelFloatArray,12> SecondOrderEncoder{{
|
|
|
|
|
CalcAmbiCoeffs( 0.000000000e+00f, -5.257311121e-01f, 8.506508084e-01f),
|
|
|
|
|
CalcAmbiCoeffs(-8.506508084e-01f, 0.000000000e+00f, 5.257311121e-01f),
|
|
|
|
|
CalcAmbiCoeffs(-5.257311121e-01f, 8.506508084e-01f, 0.000000000e+00f),
|
|
|
|
|
CalcAmbiCoeffs( 0.000000000e+00f, 5.257311121e-01f, 8.506508084e-01f),
|
|
|
|
|
CalcAmbiCoeffs(-8.506508084e-01f, 0.000000000e+00f, -5.257311121e-01f),
|
|
|
|
|
CalcAmbiCoeffs( 5.257311121e-01f, -8.506508084e-01f, 0.000000000e+00f),
|
|
|
|
|
CalcAmbiCoeffs( 0.000000000e+00f, -5.257311121e-01f, -8.506508084e-01f),
|
|
|
|
|
CalcAmbiCoeffs( 8.506508084e-01f, 0.000000000e+00f, -5.257311121e-01f),
|
|
|
|
|
CalcAmbiCoeffs( 5.257311121e-01f, 8.506508084e-01f, 0.000000000e+00f),
|
|
|
|
|
CalcAmbiCoeffs( 0.000000000e+00f, 5.257311121e-01f, -8.506508084e-01f),
|
|
|
|
|
CalcAmbiCoeffs( 8.506508084e-01f, 0.000000000e+00f, 5.257311121e-01f),
|
|
|
|
|
CalcAmbiCoeffs(-5.257311121e-01f, -8.506508084e-01f, 0.000000000e+00f),
|
|
|
|
|
}};
|
|
|
|
|
static_assert(SecondOrderDecoder.size() == SecondOrderEncoder.size(), "Second-order mismatch");
|
|
|
|
|
|
|
|
|
|
/* This calculates a 2D second-order "upsampler" matrix. Same as the second-
|
|
|
|
|
* order matrix, just using a more optimized speaker array for horizontal-only
|
|
|
|
|
* content.
|
|
|
|
|
*/
|
|
|
|
|
constexpr std::array<std::array<float,9>,6> SecondOrder2DDecoder{{
|
|
|
|
|
{{ 1.666666667e-01f, -9.622504486e-02f, 0.0f, 1.666666667e-01f, -1.490711985e-01f, 0.0f, 0.0f, 0.0f, 8.606629658e-02f, }},
|
|
|
|
|
{{ 1.666666667e-01f, -1.924500897e-01f, 0.0f, 0.000000000e+00f, 0.000000000e+00f, 0.0f, 0.0f, 0.0f, -1.721325932e-01f, }},
|
|
|
|
|
{{ 1.666666667e-01f, -9.622504486e-02f, 0.0f, -1.666666667e-01f, 1.490711985e-01f, 0.0f, 0.0f, 0.0f, 8.606629658e-02f, }},
|
|
|
|
|
{{ 1.666666667e-01f, 9.622504486e-02f, 0.0f, -1.666666667e-01f, -1.490711985e-01f, 0.0f, 0.0f, 0.0f, 8.606629658e-02f, }},
|
|
|
|
|
{{ 1.666666667e-01f, 1.924500897e-01f, 0.0f, 0.000000000e+00f, 0.000000000e+00f, 0.0f, 0.0f, 0.0f, -1.721325932e-01f, }},
|
|
|
|
|
{{ 1.666666667e-01f, 9.622504486e-02f, 0.0f, 1.666666667e-01f, 1.490711985e-01f, 0.0f, 0.0f, 0.0f, 8.606629658e-02f, }},
|
2021-05-14 10:15:42 +08:00
|
|
|
}};
|
2023-02-04 15:03:54 +08:00
|
|
|
constexpr std::array<AmbiChannelFloatArray,6> SecondOrder2DEncoder{{
|
|
|
|
|
CalcAmbiCoeffs(-0.50000000000f, 0.0f, 0.86602540379f),
|
|
|
|
|
CalcAmbiCoeffs(-1.00000000000f, 0.0f, 0.00000000000f),
|
|
|
|
|
CalcAmbiCoeffs(-0.50000000000f, 0.0f, -0.86602540379f),
|
|
|
|
|
CalcAmbiCoeffs( 0.50000000000f, 0.0f, -0.86602540379f),
|
|
|
|
|
CalcAmbiCoeffs( 1.00000000000f, 0.0f, 0.00000000000f),
|
|
|
|
|
CalcAmbiCoeffs( 0.50000000000f, 0.0f, 0.86602540379f),
|
2021-05-14 10:15:42 +08:00
|
|
|
}};
|
2023-02-04 15:03:54 +08:00
|
|
|
static_assert(SecondOrder2DDecoder.size() == SecondOrder2DEncoder.size(),
|
|
|
|
|
"Second-order 2D mismatch");
|
2021-05-14 10:15:42 +08:00
|
|
|
|
2023-02-04 15:03:54 +08:00
|
|
|
|
|
|
|
|
/* This calculates a third-order "upsampler" matrix. Same as the first-order
|
|
|
|
|
* matrix, just using a more dense speaker array suitable for third-order
|
|
|
|
|
* content.
|
|
|
|
|
*/
|
|
|
|
|
constexpr std::array<std::array<float,16>,20> ThirdOrderDecoder{{
|
|
|
|
|
{{ 5.000000000e-02f, 3.090169944e-02f, 8.090169944e-02f, 0.000000000e+00f, 0.000000000e+00f, 6.454972244e-02f, 9.045084972e-02f, 0.000000000e+00f, -1.232790000e-02f, -1.256118221e-01f, 0.000000000e+00f, 1.126112056e-01f, 7.944389175e-02f, 0.000000000e+00f, 2.421151497e-02f, 0.000000000e+00f, }},
|
|
|
|
|
{{ 5.000000000e-02f, -3.090169944e-02f, 8.090169944e-02f, 0.000000000e+00f, 0.000000000e+00f, -6.454972244e-02f, 9.045084972e-02f, 0.000000000e+00f, -1.232790000e-02f, 1.256118221e-01f, 0.000000000e+00f, -1.126112056e-01f, 7.944389175e-02f, 0.000000000e+00f, 2.421151497e-02f, 0.000000000e+00f, }},
|
|
|
|
|
{{ 5.000000000e-02f, 3.090169944e-02f, -8.090169944e-02f, 0.000000000e+00f, 0.000000000e+00f, -6.454972244e-02f, 9.045084972e-02f, 0.000000000e+00f, -1.232790000e-02f, -1.256118221e-01f, 0.000000000e+00f, 1.126112056e-01f, -7.944389175e-02f, 0.000000000e+00f, -2.421151497e-02f, 0.000000000e+00f, }},
|
|
|
|
|
{{ 5.000000000e-02f, -3.090169944e-02f, -8.090169944e-02f, 0.000000000e+00f, 0.000000000e+00f, 6.454972244e-02f, 9.045084972e-02f, 0.000000000e+00f, -1.232790000e-02f, 1.256118221e-01f, 0.000000000e+00f, -1.126112056e-01f, -7.944389175e-02f, 0.000000000e+00f, -2.421151497e-02f, 0.000000000e+00f, }},
|
|
|
|
|
{{ 5.000000000e-02f, 8.090169944e-02f, 0.000000000e+00f, 3.090169944e-02f, 6.454972244e-02f, 0.000000000e+00f, -5.590169944e-02f, 0.000000000e+00f, -7.216878365e-02f, -7.763237543e-02f, 0.000000000e+00f, -2.950836627e-02f, 0.000000000e+00f, -1.497759251e-01f, 0.000000000e+00f, -7.763237543e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, 8.090169944e-02f, 0.000000000e+00f, -3.090169944e-02f, -6.454972244e-02f, 0.000000000e+00f, -5.590169944e-02f, 0.000000000e+00f, -7.216878365e-02f, -7.763237543e-02f, 0.000000000e+00f, -2.950836627e-02f, 0.000000000e+00f, 1.497759251e-01f, 0.000000000e+00f, 7.763237543e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, -8.090169944e-02f, 0.000000000e+00f, 3.090169944e-02f, -6.454972244e-02f, 0.000000000e+00f, -5.590169944e-02f, 0.000000000e+00f, -7.216878365e-02f, 7.763237543e-02f, 0.000000000e+00f, 2.950836627e-02f, 0.000000000e+00f, -1.497759251e-01f, 0.000000000e+00f, -7.763237543e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, -8.090169944e-02f, 0.000000000e+00f, -3.090169944e-02f, 6.454972244e-02f, 0.000000000e+00f, -5.590169944e-02f, 0.000000000e+00f, -7.216878365e-02f, 7.763237543e-02f, 0.000000000e+00f, 2.950836627e-02f, 0.000000000e+00f, 1.497759251e-01f, 0.000000000e+00f, 7.763237543e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, 0.000000000e+00f, 3.090169944e-02f, 8.090169944e-02f, 0.000000000e+00f, 0.000000000e+00f, -3.454915028e-02f, 6.454972244e-02f, 8.449668365e-02f, 0.000000000e+00f, 0.000000000e+00f, 0.000000000e+00f, 3.034486645e-02f, -6.779013272e-02f, 1.659481923e-01f, 4.797944664e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, 0.000000000e+00f, 3.090169944e-02f, -8.090169944e-02f, 0.000000000e+00f, 0.000000000e+00f, -3.454915028e-02f, -6.454972244e-02f, 8.449668365e-02f, 0.000000000e+00f, 0.000000000e+00f, 0.000000000e+00f, 3.034486645e-02f, 6.779013272e-02f, 1.659481923e-01f, -4.797944664e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, 0.000000000e+00f, -3.090169944e-02f, 8.090169944e-02f, 0.000000000e+00f, 0.000000000e+00f, -3.454915028e-02f, -6.454972244e-02f, 8.449668365e-02f, 0.000000000e+00f, 0.000000000e+00f, 0.000000000e+00f, -3.034486645e-02f, -6.779013272e-02f, -1.659481923e-01f, 4.797944664e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, 0.000000000e+00f, -3.090169944e-02f, -8.090169944e-02f, 0.000000000e+00f, 0.000000000e+00f, -3.454915028e-02f, 6.454972244e-02f, 8.449668365e-02f, 0.000000000e+00f, 0.000000000e+00f, 0.000000000e+00f, -3.034486645e-02f, 6.779013272e-02f, -1.659481923e-01f, -4.797944664e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, 5.000000000e-02f, 5.000000000e-02f, 5.000000000e-02f, 6.454972244e-02f, 6.454972244e-02f, 0.000000000e+00f, 6.454972244e-02f, 0.000000000e+00f, 1.016220987e-01f, 6.338656910e-02f, -1.092600649e-02f, -7.364853795e-02f, 1.011266756e-01f, -7.086833869e-02f, -1.482646439e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, 5.000000000e-02f, 5.000000000e-02f, -5.000000000e-02f, -6.454972244e-02f, 6.454972244e-02f, 0.000000000e+00f, -6.454972244e-02f, 0.000000000e+00f, 1.016220987e-01f, -6.338656910e-02f, -1.092600649e-02f, -7.364853795e-02f, -1.011266756e-01f, -7.086833869e-02f, 1.482646439e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, -5.000000000e-02f, 5.000000000e-02f, 5.000000000e-02f, -6.454972244e-02f, -6.454972244e-02f, 0.000000000e+00f, 6.454972244e-02f, 0.000000000e+00f, -1.016220987e-01f, -6.338656910e-02f, 1.092600649e-02f, -7.364853795e-02f, 1.011266756e-01f, -7.086833869e-02f, -1.482646439e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, -5.000000000e-02f, 5.000000000e-02f, -5.000000000e-02f, 6.454972244e-02f, -6.454972244e-02f, 0.000000000e+00f, -6.454972244e-02f, 0.000000000e+00f, -1.016220987e-01f, 6.338656910e-02f, 1.092600649e-02f, -7.364853795e-02f, -1.011266756e-01f, -7.086833869e-02f, 1.482646439e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, 5.000000000e-02f, -5.000000000e-02f, 5.000000000e-02f, 6.454972244e-02f, -6.454972244e-02f, 0.000000000e+00f, -6.454972244e-02f, 0.000000000e+00f, 1.016220987e-01f, -6.338656910e-02f, -1.092600649e-02f, 7.364853795e-02f, 1.011266756e-01f, 7.086833869e-02f, -1.482646439e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, 5.000000000e-02f, -5.000000000e-02f, -5.000000000e-02f, -6.454972244e-02f, -6.454972244e-02f, 0.000000000e+00f, 6.454972244e-02f, 0.000000000e+00f, 1.016220987e-01f, 6.338656910e-02f, -1.092600649e-02f, 7.364853795e-02f, -1.011266756e-01f, 7.086833869e-02f, 1.482646439e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, -5.000000000e-02f, -5.000000000e-02f, 5.000000000e-02f, -6.454972244e-02f, 6.454972244e-02f, 0.000000000e+00f, -6.454972244e-02f, 0.000000000e+00f, -1.016220987e-01f, 6.338656910e-02f, 1.092600649e-02f, 7.364853795e-02f, 1.011266756e-01f, 7.086833869e-02f, -1.482646439e-02f, }},
|
|
|
|
|
{{ 5.000000000e-02f, -5.000000000e-02f, -5.000000000e-02f, -5.000000000e-02f, 6.454972244e-02f, 6.454972244e-02f, 0.000000000e+00f, 6.454972244e-02f, 0.000000000e+00f, -1.016220987e-01f, -6.338656910e-02f, 1.092600649e-02f, 7.364853795e-02f, -1.011266756e-01f, 7.086833869e-02f, 1.482646439e-02f, }},
|
|
|
|
|
}};
|
|
|
|
|
constexpr std::array<AmbiChannelFloatArray,20> ThirdOrderEncoder{{
|
|
|
|
|
CalcAmbiCoeffs( 0.35682208976f, 0.93417235897f, 0.00000000000f),
|
|
|
|
|
CalcAmbiCoeffs(-0.35682208976f, 0.93417235897f, 0.00000000000f),
|
|
|
|
|
CalcAmbiCoeffs( 0.35682208976f, -0.93417235897f, 0.00000000000f),
|
|
|
|
|
CalcAmbiCoeffs(-0.35682208976f, -0.93417235897f, 0.00000000000f),
|
|
|
|
|
CalcAmbiCoeffs( 0.93417235897f, 0.00000000000f, 0.35682208976f),
|
|
|
|
|
CalcAmbiCoeffs( 0.93417235897f, 0.00000000000f, -0.35682208976f),
|
|
|
|
|
CalcAmbiCoeffs(-0.93417235897f, 0.00000000000f, 0.35682208976f),
|
|
|
|
|
CalcAmbiCoeffs(-0.93417235897f, 0.00000000000f, -0.35682208976f),
|
|
|
|
|
CalcAmbiCoeffs( 0.00000000000f, 0.35682208976f, 0.93417235897f),
|
|
|
|
|
CalcAmbiCoeffs( 0.00000000000f, 0.35682208976f, -0.93417235897f),
|
|
|
|
|
CalcAmbiCoeffs( 0.00000000000f, -0.35682208976f, 0.93417235897f),
|
|
|
|
|
CalcAmbiCoeffs( 0.00000000000f, -0.35682208976f, -0.93417235897f),
|
|
|
|
|
CalcAmbiCoeffs( inv_sqrt3f, inv_sqrt3f, inv_sqrt3f),
|
|
|
|
|
CalcAmbiCoeffs( inv_sqrt3f, inv_sqrt3f, -inv_sqrt3f),
|
|
|
|
|
CalcAmbiCoeffs( -inv_sqrt3f, inv_sqrt3f, inv_sqrt3f),
|
|
|
|
|
CalcAmbiCoeffs( -inv_sqrt3f, inv_sqrt3f, -inv_sqrt3f),
|
|
|
|
|
CalcAmbiCoeffs( inv_sqrt3f, -inv_sqrt3f, inv_sqrt3f),
|
|
|
|
|
CalcAmbiCoeffs( inv_sqrt3f, -inv_sqrt3f, -inv_sqrt3f),
|
|
|
|
|
CalcAmbiCoeffs( -inv_sqrt3f, -inv_sqrt3f, inv_sqrt3f),
|
|
|
|
|
CalcAmbiCoeffs( -inv_sqrt3f, -inv_sqrt3f, -inv_sqrt3f),
|
|
|
|
|
}};
|
|
|
|
|
static_assert(ThirdOrderDecoder.size() == ThirdOrderEncoder.size(), "Third-order mismatch");
|
|
|
|
|
|
|
|
|
|
/* This calculates a 2D third-order "upsampler" matrix. Same as the third-order
|
|
|
|
|
* matrix, just using a more optimized speaker array for horizontal-only
|
|
|
|
|
* content.
|
|
|
|
|
*/
|
|
|
|
|
constexpr std::array<std::array<float,16>,8> ThirdOrder2DDecoder{{
|
|
|
|
|
{{ 1.250000000e-01f, -5.523559567e-02f, 0.0f, 1.333505242e-01f, -9.128709292e-02f, 0.0f, 0.0f, 0.0f, 9.128709292e-02f, -1.104247249e-01f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 4.573941867e-02f, }},
|
|
|
|
|
{{ 1.250000000e-01f, -1.333505242e-01f, 0.0f, 5.523559567e-02f, -9.128709292e-02f, 0.0f, 0.0f, 0.0f, -9.128709292e-02f, 4.573941867e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -1.104247249e-01f, }},
|
|
|
|
|
{{ 1.250000000e-01f, -1.333505242e-01f, 0.0f, -5.523559567e-02f, 9.128709292e-02f, 0.0f, 0.0f, 0.0f, -9.128709292e-02f, 4.573941867e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.104247249e-01f, }},
|
|
|
|
|
{{ 1.250000000e-01f, -5.523559567e-02f, 0.0f, -1.333505242e-01f, 9.128709292e-02f, 0.0f, 0.0f, 0.0f, 9.128709292e-02f, -1.104247249e-01f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -4.573941867e-02f, }},
|
|
|
|
|
{{ 1.250000000e-01f, 5.523559567e-02f, 0.0f, -1.333505242e-01f, -9.128709292e-02f, 0.0f, 0.0f, 0.0f, 9.128709292e-02f, 1.104247249e-01f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -4.573941867e-02f, }},
|
|
|
|
|
{{ 1.250000000e-01f, 1.333505242e-01f, 0.0f, -5.523559567e-02f, -9.128709292e-02f, 0.0f, 0.0f, 0.0f, -9.128709292e-02f, -4.573941867e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.104247249e-01f, }},
|
|
|
|
|
{{ 1.250000000e-01f, 1.333505242e-01f, 0.0f, 5.523559567e-02f, 9.128709292e-02f, 0.0f, 0.0f, 0.0f, -9.128709292e-02f, -4.573941867e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -1.104247249e-01f, }},
|
|
|
|
|
{{ 1.250000000e-01f, 5.523559567e-02f, 0.0f, 1.333505242e-01f, 9.128709292e-02f, 0.0f, 0.0f, 0.0f, 9.128709292e-02f, 1.104247249e-01f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 4.573941867e-02f, }},
|
|
|
|
|
}};
|
|
|
|
|
constexpr std::array<AmbiChannelFloatArray,8> ThirdOrder2DEncoder{{
|
|
|
|
|
CalcAmbiCoeffs(-0.38268343237f, 0.0f, 0.92387953251f),
|
|
|
|
|
CalcAmbiCoeffs(-0.92387953251f, 0.0f, 0.38268343237f),
|
|
|
|
|
CalcAmbiCoeffs(-0.92387953251f, 0.0f, -0.38268343237f),
|
|
|
|
|
CalcAmbiCoeffs(-0.38268343237f, 0.0f, -0.92387953251f),
|
|
|
|
|
CalcAmbiCoeffs( 0.38268343237f, 0.0f, -0.92387953251f),
|
|
|
|
|
CalcAmbiCoeffs( 0.92387953251f, 0.0f, -0.38268343237f),
|
|
|
|
|
CalcAmbiCoeffs( 0.92387953251f, 0.0f, 0.38268343237f),
|
|
|
|
|
CalcAmbiCoeffs( 0.38268343237f, 0.0f, 0.92387953251f),
|
|
|
|
|
}};
|
|
|
|
|
static_assert(ThirdOrder2DDecoder.size() == ThirdOrder2DEncoder.size(), "Third-order 2D mismatch");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This calculates a 2D fourth-order "upsampler" matrix. There is no 3D fourth-
|
|
|
|
|
* order upsampler since fourth-order is the max order we'll be supporting for
|
|
|
|
|
* the foreseeable future. This is only necessary for mixing horizontal-only
|
|
|
|
|
* fourth-order content to 3D.
|
|
|
|
|
*/
|
|
|
|
|
constexpr std::array<std::array<float,25>,10> FourthOrder2DDecoder{{
|
|
|
|
|
{{ 1.000000000e-01f, 3.568220898e-02f, 0.0f, 1.098185471e-01f, 6.070619982e-02f, 0.0f, 0.0f, 0.0f, 8.355491589e-02f, 7.735682057e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 5.620301997e-02f, 8.573754253e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.785781628e-02f, }},
|
|
|
|
|
{{ 1.000000000e-01f, 9.341723590e-02f, 0.0f, 6.787159473e-02f, 9.822469464e-02f, 0.0f, 0.0f, 0.0f, -3.191513794e-02f, 2.954767620e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -9.093839659e-02f, -5.298871540e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -7.293270986e-02f, }},
|
|
|
|
|
{{ 1.000000000e-01f, 1.154700538e-01f, 0.0f, 0.000000000e+00f, 0.000000000e+00f, 0.0f, 0.0f, 0.0f, -1.032795559e-01f, -9.561828875e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.000000000e+00f, 0.000000000e+00f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 9.014978717e-02f, }},
|
|
|
|
|
{{ 1.000000000e-01f, 9.341723590e-02f, 0.0f, -6.787159473e-02f, -9.822469464e-02f, 0.0f, 0.0f, 0.0f, -3.191513794e-02f, 2.954767620e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 9.093839659e-02f, 5.298871540e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -7.293270986e-02f, }},
|
|
|
|
|
{{ 1.000000000e-01f, 3.568220898e-02f, 0.0f, -1.098185471e-01f, -6.070619982e-02f, 0.0f, 0.0f, 0.0f, 8.355491589e-02f, 7.735682057e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -5.620301997e-02f, -8.573754253e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.785781628e-02f, }},
|
|
|
|
|
{{ 1.000000000e-01f, -3.568220898e-02f, 0.0f, -1.098185471e-01f, 6.070619982e-02f, 0.0f, 0.0f, 0.0f, 8.355491589e-02f, -7.735682057e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -5.620301997e-02f, 8.573754253e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.785781628e-02f, }},
|
|
|
|
|
{{ 1.000000000e-01f, -9.341723590e-02f, 0.0f, -6.787159473e-02f, 9.822469464e-02f, 0.0f, 0.0f, 0.0f, -3.191513794e-02f, -2.954767620e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 9.093839659e-02f, -5.298871540e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -7.293270986e-02f, }},
|
|
|
|
|
{{ 1.000000000e-01f, -1.154700538e-01f, 0.0f, 0.000000000e+00f, 0.000000000e+00f, 0.0f, 0.0f, 0.0f, -1.032795559e-01f, 9.561828875e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.000000000e+00f, 0.000000000e+00f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 9.014978717e-02f, }},
|
|
|
|
|
{{ 1.000000000e-01f, -9.341723590e-02f, 0.0f, 6.787159473e-02f, -9.822469464e-02f, 0.0f, 0.0f, 0.0f, -3.191513794e-02f, -2.954767620e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -9.093839659e-02f, 5.298871540e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -7.293270986e-02f, }},
|
|
|
|
|
{{ 1.000000000e-01f, -3.568220898e-02f, 0.0f, 1.098185471e-01f, -6.070619982e-02f, 0.0f, 0.0f, 0.0f, 8.355491589e-02f, -7.735682057e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 5.620301997e-02f, -8.573754253e-02f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.785781628e-02f, }},
|
|
|
|
|
}};
|
|
|
|
|
constexpr std::array<AmbiChannelFloatArray,10> FourthOrder2DEncoder{{
|
|
|
|
|
CalcAmbiCoeffs( 3.090169944e-01f, 0.000000000e+00f, 9.510565163e-01f),
|
|
|
|
|
CalcAmbiCoeffs( 8.090169944e-01f, 0.000000000e+00f, 5.877852523e-01f),
|
|
|
|
|
CalcAmbiCoeffs( 1.000000000e+00f, 0.000000000e+00f, 0.000000000e+00f),
|
|
|
|
|
CalcAmbiCoeffs( 8.090169944e-01f, 0.000000000e+00f, -5.877852523e-01f),
|
|
|
|
|
CalcAmbiCoeffs( 3.090169944e-01f, 0.000000000e+00f, -9.510565163e-01f),
|
|
|
|
|
CalcAmbiCoeffs(-3.090169944e-01f, 0.000000000e+00f, -9.510565163e-01f),
|
|
|
|
|
CalcAmbiCoeffs(-8.090169944e-01f, 0.000000000e+00f, -5.877852523e-01f),
|
|
|
|
|
CalcAmbiCoeffs(-1.000000000e+00f, 0.000000000e+00f, 0.000000000e+00f),
|
|
|
|
|
CalcAmbiCoeffs(-8.090169944e-01f, 0.000000000e+00f, 5.877852523e-01f),
|
|
|
|
|
CalcAmbiCoeffs(-3.090169944e-01f, 0.000000000e+00f, 9.510565163e-01f),
|
|
|
|
|
}};
|
|
|
|
|
static_assert(FourthOrder2DDecoder.size() == FourthOrder2DEncoder.size(), "Fourth-order 2D mismatch");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
template<size_t N, size_t M>
|
|
|
|
|
auto CalcAmbiUpsampler(const std::array<std::array<float,N>,M> &decoder,
|
|
|
|
|
const std::array<AmbiChannelFloatArray,M> &encoder)
|
2021-05-14 10:15:42 +08:00
|
|
|
{
|
2023-02-04 15:03:54 +08:00
|
|
|
std::array<AmbiChannelFloatArray,N> res{};
|
|
|
|
|
|
|
|
|
|
for(size_t i{0};i < decoder[0].size();++i)
|
|
|
|
|
{
|
|
|
|
|
for(size_t j{0};j < encoder[0].size();++j)
|
|
|
|
|
{
|
|
|
|
|
double sum{0.0};
|
|
|
|
|
for(size_t k{0};k < decoder.size();++k)
|
|
|
|
|
sum += double{decoder[k][i]} * encoder[k][j];
|
|
|
|
|
res[i][j] = static_cast<float>(sum);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return res;
|
2021-05-14 10:15:42 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace
|
|
|
|
|
|
2023-02-04 15:03:54 +08:00
|
|
|
const std::array<AmbiChannelFloatArray,4> AmbiScale::FirstOrderUp{CalcAmbiUpsampler(FirstOrderDecoder, FirstOrderEncoder)};
|
|
|
|
|
const std::array<AmbiChannelFloatArray,4> AmbiScale::FirstOrder2DUp{CalcAmbiUpsampler(FirstOrder2DDecoder, FirstOrder2DEncoder)};
|
|
|
|
|
const std::array<AmbiChannelFloatArray,9> AmbiScale::SecondOrderUp{CalcAmbiUpsampler(SecondOrderDecoder, SecondOrderEncoder)};
|
|
|
|
|
const std::array<AmbiChannelFloatArray,9> AmbiScale::SecondOrder2DUp{CalcAmbiUpsampler(SecondOrder2DDecoder, SecondOrder2DEncoder)};
|
|
|
|
|
const std::array<AmbiChannelFloatArray,16> AmbiScale::ThirdOrderUp{CalcAmbiUpsampler(ThirdOrderDecoder, ThirdOrderEncoder)};
|
|
|
|
|
const std::array<AmbiChannelFloatArray,16> AmbiScale::ThirdOrder2DUp{CalcAmbiUpsampler(ThirdOrder2DDecoder, ThirdOrder2DEncoder)};
|
|
|
|
|
const std::array<AmbiChannelFloatArray,25> AmbiScale::FourthOrder2DUp{CalcAmbiUpsampler(FourthOrder2DDecoder, FourthOrder2DEncoder)};
|
2021-05-14 10:15:42 +08:00
|
|
|
|
|
|
|
|
|
2023-02-04 15:03:54 +08:00
|
|
|
std::array<float,MaxAmbiOrder+1> AmbiScale::GetHFOrderScales(const uint src_order,
|
|
|
|
|
const uint dev_order, const bool horizontalOnly) noexcept
|
|
|
|
|
{
|
|
|
|
|
std::array<float,MaxAmbiOrder+1> res{};
|
2021-05-14 10:15:42 +08:00
|
|
|
|
2023-02-04 15:03:54 +08:00
|
|
|
if(!horizontalOnly)
|
|
|
|
|
{
|
|
|
|
|
for(size_t i{0};i < MaxAmbiOrder+1;++i)
|
|
|
|
|
res[i] = HFScales[src_order][i] / HFScales[dev_order][i];
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
for(size_t i{0};i < MaxAmbiOrder+1;++i)
|
|
|
|
|
res[i] = HFScales2D[src_order][i] / HFScales2D[dev_order][i];
|
|
|
|
|
}
|
2021-05-14 10:15:42 +08:00
|
|
|
|
2023-02-04 15:03:54 +08:00
|
|
|
return res;
|
2021-05-14 10:15:42 +08:00
|
|
|
}
|
