diff options
| author | Chris Robinson <chris.kcat@gmail.com> | 2020-05-06 22:36:29 -0700 |
|---|---|---|
| committer | Chris Robinson <chris.kcat@gmail.com> | 2020-05-06 22:36:29 -0700 |
| commit | ca851298ad99be481fd324708bdb5642f14c5f02 (patch) | |
| tree | 1328d68efda8ca6370ae3bd75e2bb972df6d84cc /alc/panning.cpp | |
| parent | bef25361f1f43382a751e2ccba124871e25da17b (diff) | |
Update the quad and 7.1 decoders
Diffstat (limited to 'alc/panning.cpp')
| -rw-r--r-- | alc/panning.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/alc/panning.cpp b/alc/panning.cpp index 05fdff92..e82d4b91 100644 --- a/alc/panning.cpp +++ b/alc/panning.cpp @@ -373,16 +373,16 @@ constexpr DecoderConfig<2> StereoConfig{ }} }; constexpr DecoderConfig<4> QuadConfig{ - 1, {{BackLeft, FrontLeft, FrontRight, BackRight}}, - {{1.0f, 1.0f}}, + 2, {{BackLeft, FrontLeft, FrontRight, BackRight}}, + {{1.15470054e+0f, 1.00000000e+0f, 5.77350269e-1f}}, {{ - {{3.53553391e-1f, 2.04124145e-1f, -2.04124145e-1f}}, - {{3.53553391e-1f, 2.04124145e-1f, 2.04124145e-1f}}, - {{3.53553391e-1f, -2.04124145e-1f, 2.04124145e-1f}}, - {{3.53553391e-1f, -2.04124145e-1f, -2.04124145e-1f}}, + {{2.50000000e-1f, 2.04124145e-1f, -2.04124145e-1f, -1.29099445e-1f, 0.00000000e+0f}}, + {{2.50000000e-1f, 2.04124145e-1f, 2.04124145e-1f, 1.29099445e-1f, 0.00000000e+0f}}, + {{2.50000000e-1f, -2.04124145e-1f, 2.04124145e-1f, -1.29099445e-1f, 0.00000000e+0f}}, + {{2.50000000e-1f, -2.04124145e-1f, -2.04124145e-1f, 1.29099445e-1f, 0.00000000e+0f}}, }} }; -constexpr DecoderConfig<6> X51Config{ +constexpr DecoderConfig<4> X51Config{ 2, {{SideLeft, FrontLeft, FrontRight, SideRight}}, {{1.0f, 1.0f, 1.0f}}, {{ @@ -392,7 +392,7 @@ constexpr DecoderConfig<6> X51Config{ {{3.33000782e-1f, -1.89084803e-1f, -2.00042375e-1f, 2.12307769e-2f, -1.14579885e-2f}}, }} }; -constexpr DecoderConfig<6> X51RearConfig{ +constexpr DecoderConfig<4> X51RearConfig{ 2, {{BackLeft, FrontLeft, FrontRight, BackRight}}, {{1.0f, 1.0f, 1.0f}}, {{ @@ -402,7 +402,7 @@ constexpr DecoderConfig<6> X51RearConfig{ {{3.33000782e-1f, -1.89084803e-1f, -2.00042375e-1f, 2.12307769e-2f, -1.14579885e-2f}}, }} }; -constexpr DecoderConfig<7> X61Config{ +constexpr DecoderConfig<5> X61Config{ 2, {{SideLeft, FrontLeft, FrontRight, SideRight, BackCenter}}, {{1.0f, 1.0f, 1.0f}}, {{ @@ -413,16 +413,16 @@ constexpr DecoderConfig<7> X61Config{ {{2.50001688e-1f, 0.00000000e+0f, -2.50000094e-1f, 0.00000000e+0f, 6.05133395e-2f}}, }} }; -constexpr DecoderConfig<8> X71Config{ +constexpr DecoderConfig<6> X71Config{ 3, {{BackLeft, SideLeft, FrontLeft, FrontRight, SideRight, BackRight}}, - {{1.0f, 1.0f, 1.0f, 1.0f}}, + {{1.22474487e+0f, 1.13151672e+0f, 8.66025404e-1f, 4.68689571e-1f}}, {{ - {{2.04124145e-1f, 1.08880247e-1f, -1.88586120e-1f, -1.29099444e-1f, 7.45355993e-2f, 3.73460789e-2f, 0.00000000e+0f}}, - {{2.04124145e-1f, 2.17760495e-1f, 0.00000000e+0f, 0.00000000e+0f, -1.49071198e-1f, -3.73460789e-2f, 0.00000000e+0f}}, - {{2.04124145e-1f, 1.08880247e-1f, 1.88586120e-1f, 1.29099444e-1f, 7.45355993e-2f, 3.73460789e-2f, 0.00000000e+0f}}, - {{2.04124145e-1f, -1.08880247e-1f, 1.88586120e-1f, -1.29099444e-1f, 7.45355993e-2f, -3.73460789e-2f, 0.00000000e+0f}}, - {{2.04124145e-1f, -2.17760495e-1f, 0.00000000e+0f, 0.00000000e+0f, -1.49071198e-1f, 3.73460789e-2f, 0.00000000e+0f}}, - {{2.04124145e-1f, -1.08880247e-1f, -1.88586120e-1f, 1.29099444e-1f, 7.45355993e-2f, -3.73460789e-2f, 0.00000000e+0f}}, + {{1.66666667e-1f, 9.62250449e-2f, -1.66666667e-1f, -1.49071198e-1f, 8.60662966e-2f, 7.96819073e-2f, 0.00000000e+0f}}, + {{1.66666667e-1f, 1.92450090e-1f, 0.00000000e+0f, 0.00000000e+0f, -1.72132593e-1f, -7.96819073e-2f, 0.00000000e+0f}}, + {{1.66666667e-1f, 9.62250449e-2f, 1.66666667e-1f, 1.49071198e-1f, 8.60662966e-2f, 7.96819073e-2f, 0.00000000e+0f}}, + {{1.66666667e-1f, -9.62250449e-2f, 1.66666667e-1f, -1.49071198e-1f, 8.60662966e-2f, -7.96819073e-2f, 0.00000000e+0f}}, + {{1.66666667e-1f, -1.92450090e-1f, 0.00000000e+0f, 0.00000000e+0f, -1.72132593e-1f, 7.96819073e-2f, 0.00000000e+0f}}, + {{1.66666667e-1f, -9.62250449e-2f, -1.66666667e-1f, 1.49071198e-1f, 8.60662966e-2f, -7.96819073e-2f, 0.00000000e+0f}}, }} }; |