diff options
| author | Chris Robinson <[email protected]> | 2018-12-15 23:28:49 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2018-12-15 23:28:49 -0800 |
| commit | 741861eaa62bd555255f19467fa115a12b7fd577 (patch) | |
| tree | 355ace44252d63c55760ad1747bff8a24b089cf2 /Alc/bformatdec.h | |
| parent | a6a5634adb1bdec44fa7cb8557e5b6d59642d7aa (diff) | |
Put the ACN index map in a header
Also put it and the Ambisonic scales in a more appropriate header.
Diffstat (limited to 'Alc/bformatdec.h')
| -rw-r--r-- | Alc/bformatdec.h | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/Alc/bformatdec.h b/Alc/bformatdec.h index d855041d..4da5547e 100644 --- a/Alc/bformatdec.h +++ b/Alc/bformatdec.h @@ -26,53 +26,6 @@ struct AmbDecConf; #define XYZ_SCALE_3H3P 1.136697713f -/* NOTE: These are scale factors as applied to Ambisonics content. Decoder - * coefficients should be divided by these values to get proper N3D scalings. - */ -struct AmbiScale { - static constexpr float N3D2N3D[MAX_AMBI_COEFFS]{ - 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 constexpr float SN3D2N3D[MAX_AMBI_COEFFS]{ - 1.000000000f, /* ACN 0 (W), sqrt(1) */ - 1.732050808f, /* ACN 1 (Y), sqrt(3) */ - 1.732050808f, /* ACN 2 (Z), sqrt(3) */ - 1.732050808f, /* ACN 3 (X), sqrt(3) */ - 2.236067978f, /* ACN 4 (V), sqrt(5) */ - 2.236067978f, /* ACN 5 (T), sqrt(5) */ - 2.236067978f, /* ACN 6 (R), sqrt(5) */ - 2.236067978f, /* ACN 7 (S), sqrt(5) */ - 2.236067978f, /* ACN 8 (U), sqrt(5) */ - 2.645751311f, /* ACN 9 (Q), sqrt(7) */ - 2.645751311f, /* ACN 10 (O), sqrt(7) */ - 2.645751311f, /* ACN 11 (M), sqrt(7) */ - 2.645751311f, /* ACN 12 (K), sqrt(7) */ - 2.645751311f, /* ACN 13 (L), sqrt(7) */ - 2.645751311f, /* ACN 14 (N), sqrt(7) */ - 2.645751311f, /* ACN 15 (P), sqrt(7) */ - }; - static constexpr float FuMa2N3D[MAX_AMBI_COEFFS]{ - 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) */ - }; -}; - - class BFormatDec { public: static constexpr size_t sNumBands{2}; |