aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Alc/ambidefs.h12
-rw-r--r--Alc/bformatdec.cpp6
-rw-r--r--Alc/panning.cpp44
3 files changed, 31 insertions, 31 deletions
diff --git a/Alc/ambidefs.h b/Alc/ambidefs.h
index bdeac18e..bbf11403 100644
--- a/Alc/ambidefs.h
+++ b/Alc/ambidefs.h
@@ -32,14 +32,14 @@
/* NOTE: These are scale factors as applied to Ambisonics content. Decoder
- * coefficients should be divided by these values to get proper N3D scalings.
+ * coefficients should be divided by these values to get proper scalings.
*/
struct AmbiScale {
- static constexpr float N3D2N3D[MAX_AMBI_COEFFS]{
+ static constexpr float FromN3D[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]{
+ static constexpr float FromSN3D[MAX_AMBI_COEFFS]{
1.000000000f, /* ACN 0, sqrt(1) */
1.732050808f, /* ACN 1, sqrt(3) */
1.732050808f, /* ACN 2, sqrt(3) */
@@ -57,7 +57,7 @@ struct AmbiScale {
2.645751311f, /* ACN 14, sqrt(7) */
2.645751311f, /* ACN 15, sqrt(7) */
};
- static constexpr float FuMa2N3D[MAX_AMBI_COEFFS]{
+ static constexpr float FromFuMa[MAX_AMBI_COEFFS]{
1.414213562f, /* ACN 0 (W), sqrt(2) */
1.732050808f, /* ACN 1 (Y), sqrt(3) */
1.732050808f, /* ACN 2 (Z), sqrt(3) */
@@ -78,7 +78,7 @@ struct AmbiScale {
};
struct AmbiIndex {
- static constexpr int FuMa2ACN[MAX_AMBI_COEFFS]{
+ static constexpr int FromFuMa[MAX_AMBI_COEFFS]{
0, /* W */
3, /* X */
1, /* Y */
@@ -96,7 +96,7 @@ struct AmbiIndex {
15, /* P */
9, /* Q */
};
- static constexpr int ACN2ACN[MAX_AMBI_COEFFS]{
+ static constexpr int FromACN[MAX_AMBI_COEFFS]{
0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15
};
diff --git a/Alc/bformatdec.cpp b/Alc/bformatdec.cpp
index 2be6eae8..aeaa89a0 100644
--- a/Alc/bformatdec.cpp
+++ b/Alc/bformatdec.cpp
@@ -53,9 +53,9 @@ constexpr ALfloat Ambi3DDecoderHFScale[MAX_AMBI_COEFFS] = {
auto GetAmbiScales(AmbDecScale scaletype) noexcept -> const float(&)[MAX_AMBI_COEFFS]
{
- if(scaletype == AmbDecScale::FuMa) return AmbiScale::FuMa2N3D;
- if(scaletype == AmbDecScale::SN3D) return AmbiScale::SN3D2N3D;
- return AmbiScale::N3D2N3D;
+ if(scaletype == AmbDecScale::FuMa) return AmbiScale::FromFuMa;
+ if(scaletype == AmbDecScale::SN3D) return AmbiScale::FromSN3D;
+ return AmbiScale::FromN3D;
}
} // namespace
diff --git a/Alc/panning.cpp b/Alc/panning.cpp
index 5163f59a..819b5eb4 100644
--- a/Alc/panning.cpp
+++ b/Alc/panning.cpp
@@ -42,11 +42,11 @@
#include "bs2b.h"
-constexpr float AmbiScale::N3D2N3D[MAX_AMBI_COEFFS];
-constexpr float AmbiScale::SN3D2N3D[MAX_AMBI_COEFFS];
-constexpr float AmbiScale::FuMa2N3D[MAX_AMBI_COEFFS];
-constexpr int AmbiIndex::FuMa2ACN[MAX_AMBI_COEFFS];
-constexpr int AmbiIndex::ACN2ACN[MAX_AMBI_COEFFS];
+constexpr float AmbiScale::FromN3D[MAX_AMBI_COEFFS];
+constexpr float AmbiScale::FromSN3D[MAX_AMBI_COEFFS];
+constexpr float AmbiScale::FromFuMa[MAX_AMBI_COEFFS];
+constexpr int AmbiIndex::FromFuMa[MAX_AMBI_COEFFS];
+constexpr int AmbiIndex::FromACN[MAX_AMBI_COEFFS];
namespace {
@@ -326,22 +326,22 @@ void InitDistanceComp(ALCdevice *device, const AmbDecConf *conf, const ALsizei (
auto GetAmbiScales(AmbDecScale scaletype) noexcept -> const float(&)[MAX_AMBI_COEFFS]
{
- if(scaletype == AmbDecScale::FuMa) return AmbiScale::FuMa2N3D;
- if(scaletype == AmbDecScale::SN3D) return AmbiScale::SN3D2N3D;
- return AmbiScale::N3D2N3D;
+ if(scaletype == AmbDecScale::FuMa) return AmbiScale::FromFuMa;
+ if(scaletype == AmbDecScale::SN3D) return AmbiScale::FromSN3D;
+ return AmbiScale::FromN3D;
}
auto GetAmbiScales(AmbiNorm scaletype) noexcept -> const float(&)[MAX_AMBI_COEFFS]
{
- if(scaletype == AmbiNorm::FuMa) return AmbiScale::FuMa2N3D;
- if(scaletype == AmbiNorm::SN3D) return AmbiScale::SN3D2N3D;
- return AmbiScale::N3D2N3D;
+ if(scaletype == AmbiNorm::FuMa) return AmbiScale::FromFuMa;
+ if(scaletype == AmbiNorm::SN3D) return AmbiScale::FromSN3D;
+ return AmbiScale::FromN3D;
}
auto GetAmbiLayout(AmbiLayout layouttype) noexcept -> const int(&)[MAX_AMBI_COEFFS]
{
- if(layouttype == AmbiLayout::FuMa) return AmbiIndex::FuMa2ACN;
- return AmbiIndex::ACN2ACN;
+ if(layouttype == AmbiLayout::FuMa) return AmbiIndex::FromFuMa;
+ return AmbiIndex::FromACN;
}
@@ -428,8 +428,8 @@ void InitPanning(ALCdevice *device)
* The upsampler expects this and will convert it for output.
*/
device->FOAOut.Ambi = AmbiConfig{};
- acnmap_end = std::begin(AmbiIndex::ACN2ACN) + 4;
- std::transform(std::begin(AmbiIndex::ACN2ACN), acnmap_end, std::begin(device->FOAOut.Ambi.Map),
+ std::transform(std::begin(AmbiIndex::FromACN), std::begin(AmbiIndex::FromACN)+4,
+ std::begin(device->FOAOut.Ambi.Map),
[](const ALsizei &acn) noexcept { return BFChannelConfig{1.0f, acn}; }
);
device->FOAOut.CoeffCount = 0;
@@ -463,8 +463,8 @@ void InitPanning(ALCdevice *device)
else
{
device->FOAOut.Ambi = AmbiConfig{};
- auto acnmap_end = std::begin(AmbiIndex::ACN2ACN) + 4;
- std::transform(std::begin(AmbiIndex::ACN2ACN), acnmap_end, std::begin(device->FOAOut.Ambi.Map),
+ std::transform(std::begin(AmbiIndex::FromACN), std::begin(AmbiIndex::FromACN)+4,
+ std::begin(device->FOAOut.Ambi.Map),
[](const ALsizei &acn) noexcept { return BFChannelConfig{1.0f, acn}; }
);
device->FOAOut.CoeffCount = 0;
@@ -747,10 +747,10 @@ void InitUhjPanning(ALCdevice *device)
{
static constexpr ALsizei count{3};
- auto acnmap_end = std::begin(AmbiIndex::FuMa2ACN) + count;
- std::transform(std::begin(AmbiIndex::FuMa2ACN), acnmap_end, std::begin(device->Dry.Ambi.Map),
+ auto acnmap_end = std::begin(AmbiIndex::FromFuMa) + count;
+ std::transform(std::begin(AmbiIndex::FromFuMa), acnmap_end, std::begin(device->Dry.Ambi.Map),
[](const ALsizei &acn) noexcept -> BFChannelConfig
- { return BFChannelConfig{1.0f/AmbiScale::FuMa2N3D[acn], acn}; }
+ { return BFChannelConfig{1.0f/AmbiScale::FromFuMa[acn], acn}; }
);
device->Dry.CoeffCount = 0;
device->Dry.NumChannels = count;
@@ -1146,8 +1146,8 @@ no_hrtf:
void aluInitEffectPanning(ALeffectslot *slot)
{
const size_t count{countof(slot->ChanMap)};
- auto acnmap_end = std::begin(AmbiIndex::ACN2ACN) + count;
- std::transform(std::begin(AmbiIndex::ACN2ACN), acnmap_end, std::begin(slot->ChanMap),
+ auto acnmap_end = std::begin(AmbiIndex::FromACN) + count;
+ std::transform(std::begin(AmbiIndex::FromACN), acnmap_end, std::begin(slot->ChanMap),
[](const ALsizei &acn) noexcept { return BFChannelConfig{1.0f, acn}; }
);
slot->NumChannels = static_cast<ALsizei>(count);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 21:59:23 +0000