diff options
| author | Chris Robinson <[email protected]> | 2023-11-18 06:46:18 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2023-11-18 06:46:35 -0800 |
| commit | 3ff5cb1f969f798450acb81359c7ff4f76c04e1e (patch) | |
| tree | 05a7eab5a84083a71864df5bedc7e9f5b02b07b4 | |
| parent | 6e224443096a85f5eefa8d815d6905824f230604 (diff) | |
Fix definition types
| -rw-r--r-- | core/ambidefs.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/ambidefs.cpp b/core/ambidefs.cpp index ffb45e09..2389ce6b 100644 --- a/core/ambidefs.cpp +++ b/core/ambidefs.cpp @@ -279,13 +279,13 @@ constexpr auto CalcAmbiUpsampler(const std::array<std::array<float,N>,M> &decode } // namespace -const std::array AmbiScale::FirstOrderUp = CalcAmbiUpsampler(FirstOrderDecoder, FirstOrderEncoder); -const std::array AmbiScale::FirstOrder2DUp = CalcAmbiUpsampler(FirstOrder2DDecoder, FirstOrder2DEncoder); -const std::array AmbiScale::SecondOrderUp = CalcAmbiUpsampler(SecondOrderDecoder, SecondOrderEncoder); -const std::array AmbiScale::SecondOrder2DUp = CalcAmbiUpsampler(SecondOrder2DDecoder, SecondOrder2DEncoder); -const std::array AmbiScale::ThirdOrderUp = CalcAmbiUpsampler(ThirdOrderDecoder, ThirdOrderEncoder); -const std::array AmbiScale::ThirdOrder2DUp = CalcAmbiUpsampler(ThirdOrder2DDecoder, ThirdOrder2DEncoder); -const std::array AmbiScale::FourthOrder2DUp = CalcAmbiUpsampler(FourthOrder2DDecoder, FourthOrder2DEncoder); +const std::array<std::array<float,MaxAmbiChannels>,4> AmbiScale::FirstOrderUp{CalcAmbiUpsampler(FirstOrderDecoder, FirstOrderEncoder)}; +const std::array<std::array<float,MaxAmbiChannels>,4> AmbiScale::FirstOrder2DUp{CalcAmbiUpsampler(FirstOrder2DDecoder, FirstOrder2DEncoder)}; +const std::array<std::array<float,MaxAmbiChannels>,9> AmbiScale::SecondOrderUp{CalcAmbiUpsampler(SecondOrderDecoder, SecondOrderEncoder)}; +const std::array<std::array<float,MaxAmbiChannels>,9> AmbiScale::SecondOrder2DUp{CalcAmbiUpsampler(SecondOrder2DDecoder, SecondOrder2DEncoder)}; +const std::array<std::array<float,MaxAmbiChannels>,16> AmbiScale::ThirdOrderUp{CalcAmbiUpsampler(ThirdOrderDecoder, ThirdOrderEncoder)}; +const std::array<std::array<float,MaxAmbiChannels>,16> AmbiScale::ThirdOrder2DUp{CalcAmbiUpsampler(ThirdOrder2DDecoder, ThirdOrder2DEncoder)}; +const std::array<std::array<float,MaxAmbiChannels>,25> AmbiScale::FourthOrder2DUp{CalcAmbiUpsampler(FourthOrder2DDecoder, FourthOrder2DEncoder)}; std::array<float,MaxAmbiOrder+1> AmbiScale::GetHFOrderScales(const uint src_order, |