Use inline variables instead of functions with static variables

1 files changed, 91 insertions, 130 deletions

diff --git a/core/ambidefs.h b/core/ambidefs.h
index 3af26258..bea1a312 100644
--- a/core/ambidefs.h
+++ b/core/ambidefs.h
@@ -48,70 +48,54 @@ inline constexpr size_t MaxAmbi2DChannels{Ambi2DChannelsFromOrder(MaxAmbiOrder)}
  * coefficients should be divided by these values to get proper scalings.
  */
 struct AmbiScale {
-    static auto& FromN3D() noexcept
-    {
-        static constexpr const std::array<float,MaxAmbiChannels> ret{{
-            1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
-            1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f
-        }};
-        return ret;
-    }
-    static auto& FromSN3D() noexcept
-    {
-        static constexpr const std::array<float,MaxAmbiChannels> ret{{
-            1.000000000f, /* ACN  0, sqrt(1) */
-            1.732050808f, /* ACN  1, sqrt(3) */
-            1.732050808f, /* ACN  2, sqrt(3) */
-            1.732050808f, /* ACN  3, sqrt(3) */
-            2.236067978f, /* ACN  4, sqrt(5) */
-            2.236067978f, /* ACN  5, sqrt(5) */
-            2.236067978f, /* ACN  6, sqrt(5) */
-            2.236067978f, /* ACN  7, sqrt(5) */
-            2.236067978f, /* ACN  8, sqrt(5) */
-            2.645751311f, /* ACN  9, sqrt(7) */
-            2.645751311f, /* ACN 10, sqrt(7) */
-            2.645751311f, /* ACN 11, sqrt(7) */
-            2.645751311f, /* ACN 12, sqrt(7) */
-            2.645751311f, /* ACN 13, sqrt(7) */
-            2.645751311f, /* ACN 14, sqrt(7) */
-            2.645751311f, /* ACN 15, sqrt(7) */
-        }};
-        return ret;
-    }
-    static auto& FromFuMa() noexcept
-    {
-        static constexpr const std::array<float,MaxAmbiChannels> ret{{
-            1.414213562f, /* ACN  0 (W), sqrt(2) */
-            1.732050808f, /* ACN  1 (Y), sqrt(3) */
-            1.732050808f, /* ACN  2 (Z), sqrt(3) */
-            1.732050808f, /* ACN  3 (X), sqrt(3) */
-            1.936491673f, /* ACN  4 (V), sqrt(15)/2 */
-            1.936491673f, /* ACN  5 (T), sqrt(15)/2 */
-            2.236067978f, /* ACN  6 (R), sqrt(5) */
-            1.936491673f, /* ACN  7 (S), sqrt(15)/2 */
-            1.936491673f, /* ACN  8 (U), sqrt(15)/2 */
-            2.091650066f, /* ACN  9 (Q), sqrt(35/8) */
-            1.972026594f, /* ACN 10 (O), sqrt(35)/3 */
-            2.231093404f, /* ACN 11 (M), sqrt(224/45) */
-            2.645751311f, /* ACN 12 (K), sqrt(7) */
-            2.231093404f, /* ACN 13 (L), sqrt(224/45) */
-            1.972026594f, /* ACN 14 (N), sqrt(35)/3 */
-            2.091650066f, /* ACN 15 (P), sqrt(35/8) */
-        }};
-        return ret;
-    }
-    static auto& FromUHJ() noexcept
-    {
-        static constexpr const std::array<float,MaxAmbiChannels> ret{{
-            1.000000000f, /* ACN  0 (W), sqrt(1) */
-            1.224744871f, /* ACN  1 (Y), sqrt(3/2) */
-            1.224744871f, /* ACN  2 (Z), sqrt(3/2) */
-            1.224744871f, /* ACN  3 (X), sqrt(3/2) */
-            /* Higher orders not relevant for UHJ. */
-            1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
-        }};
-        return ret;
-    }
+    static inline constexpr std::array<float,MaxAmbiChannels> FromN3D{{
+        1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
+        1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f
+    }};
+    static inline constexpr std::array<float,MaxAmbiChannels> FromSN3D{{
+        1.000000000f, /* ACN  0, sqrt(1) */
+        1.732050808f, /* ACN  1, sqrt(3) */
+        1.732050808f, /* ACN  2, sqrt(3) */
+        1.732050808f, /* ACN  3, sqrt(3) */
+        2.236067978f, /* ACN  4, sqrt(5) */
+        2.236067978f, /* ACN  5, sqrt(5) */
+        2.236067978f, /* ACN  6, sqrt(5) */
+        2.236067978f, /* ACN  7, sqrt(5) */
+        2.236067978f, /* ACN  8, sqrt(5) */
+        2.645751311f, /* ACN  9, sqrt(7) */
+        2.645751311f, /* ACN 10, sqrt(7) */
+        2.645751311f, /* ACN 11, sqrt(7) */
+        2.645751311f, /* ACN 12, sqrt(7) */
+        2.645751311f, /* ACN 13, sqrt(7) */
+        2.645751311f, /* ACN 14, sqrt(7) */
+        2.645751311f, /* ACN 15, sqrt(7) */
+    }};
+    static inline constexpr std::array<float,MaxAmbiChannels> FromFuMa{{
+        1.414213562f, /* ACN  0 (W), sqrt(2) */
+        1.732050808f, /* ACN  1 (Y), sqrt(3) */
+        1.732050808f, /* ACN  2 (Z), sqrt(3) */
+        1.732050808f, /* ACN  3 (X), sqrt(3) */
+        1.936491673f, /* ACN  4 (V), sqrt(15)/2 */
+        1.936491673f, /* ACN  5 (T), sqrt(15)/2 */
+        2.236067978f, /* ACN  6 (R), sqrt(5) */
+        1.936491673f, /* ACN  7 (S), sqrt(15)/2 */
+        1.936491673f, /* ACN  8 (U), sqrt(15)/2 */
+        2.091650066f, /* ACN  9 (Q), sqrt(35/8) */
+        1.972026594f, /* ACN 10 (O), sqrt(35)/3 */
+        2.231093404f, /* ACN 11 (M), sqrt(224/45) */
+        2.645751311f, /* ACN 12 (K), sqrt(7) */
+        2.231093404f, /* ACN 13 (L), sqrt(224/45) */
+        1.972026594f, /* ACN 14 (N), sqrt(35)/3 */
+        2.091650066f, /* ACN 15 (P), sqrt(35/8) */
+    }};
+    static inline constexpr std::array<float,MaxAmbiChannels> FromUHJ{{
+        1.000000000f, /* ACN  0 (W), sqrt(1) */
+        1.224744871f, /* ACN  1 (Y), sqrt(3/2) */
+        1.224744871f, /* ACN  2 (Z), sqrt(3/2) */
+        1.224744871f, /* ACN  3 (X), sqrt(3/2) */
+        /* Higher orders not relevant for UHJ. */
+        1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
+    }};
 
     /* Retrieves per-order HF scaling factors for "upsampling" ambisonic data. */
     static std::array<float,MaxAmbiOrder+1> GetHFOrderScales(const uint src_order,
@@ -127,72 +111,49 @@ struct AmbiScale {
 };
 
 struct AmbiIndex {
-    static auto& FromFuMa() noexcept
-    {
-        static constexpr const std::array<uint8_t,MaxAmbiChannels> ret{{
-            0,  /* W */
-            3,  /* X */
-            1,  /* Y */
-            2,  /* Z */
-            6,  /* R */
-            7,  /* S */
-            5,  /* T */
-            8,  /* U */
-            4,  /* V */
-            12, /* K */
-            13, /* L */
-            11, /* M */
-            14, /* N */
-            10, /* O */
-            15, /* P */
-            9,  /* Q */
-        }};
-        return ret;
-    }
-    static auto& FromFuMa2D() noexcept
-    {
-        static constexpr const std::array<uint8_t,MaxAmbi2DChannels> ret{{
-            0,  /* W */
-            3,  /* X */
-            1,  /* Y */
-            8,  /* U */
-            4,  /* V */
-            15, /* P */
-            9,  /* Q */
-        }};
-        return ret;
-    }
-
-    static auto& FromACN() noexcept
-    {
-        static constexpr const std::array<uint8_t,MaxAmbiChannels> ret{{
-            0,  1,  2,  3,  4,  5,  6,  7,
-            8,  9, 10, 11, 12, 13, 14, 15
-        }};
-        return ret;
-    }
-    static auto& FromACN2D() noexcept
-    {
-        static constexpr const std::array<uint8_t,MaxAmbi2DChannels> ret{{
-            0, 1,3, 4,8, 9,15
-        }};
-        return ret;
-    }
-
-    static auto& OrderFromChannel() noexcept
-    {
-        static constexpr const std::array<uint8_t,MaxAmbiChannels> ret{{
-            0, 1,1,1, 2,2,2,2,2, 3,3,3,3,3,3,3,
-        }};
-        return ret;
-    }
-    static auto& OrderFrom2DChannel() noexcept
-    {
-        static constexpr const std::array<uint8_t,MaxAmbi2DChannels> ret{{
-            0, 1,1, 2,2, 3,3,
-        }};
-        return ret;
-    }
+    static inline constexpr std::array<uint8_t,MaxAmbiChannels> FromFuMa{{
+        0,  /* W */
+        3,  /* X */
+        1,  /* Y */
+        2,  /* Z */
+        6,  /* R */
+        7,  /* S */
+        5,  /* T */
+        8,  /* U */
+        4,  /* V */
+        12, /* K */
+        13, /* L */
+        11, /* M */
+        14, /* N */
+        10, /* O */
+        15, /* P */
+        9,  /* Q */
+    }};
+    static inline constexpr std::array<uint8_t,MaxAmbi2DChannels> FromFuMa2D{{
+        0,  /* W */
+        3,  /* X */
+        1,  /* Y */
+        8,  /* U */
+        4,  /* V */
+        15, /* P */
+        9,  /* Q */
+    }};
+
+    static inline constexpr std::array<uint8_t,MaxAmbiChannels> FromACN{{
+        0,  1,  2,  3,  4,  5,  6,  7,
+        8,  9, 10, 11, 12, 13, 14, 15
+    }};
+    static inline constexpr std::array<uint8_t,MaxAmbi2DChannels> FromACN2D{{
+        0, 1,3, 4,8, 9,15
+    }};
+
+
+    static inline constexpr std::array<uint8_t,MaxAmbiChannels> OrderFromChannel{{
+        0, 1,1,1, 2,2,2,2,2, 3,3,3,3,3,3,3,
+    }};
+    static inline constexpr std::array<uint8_t,MaxAmbi2DChannels> OrderFrom2DChannel{{
+        0, 1,1, 2,2, 3,3,
+    }};
 };