Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename From2D to FromACN2D

Browse Source
This commit is contained in:
Chris Robinson
2020-12-25 06:40:13 -08:00
parent 20820fd01b
commit 204f7d8811
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
alc/alu.cpp
+1 -1
View File
@@ -361,7 +361,7 @@ auto GetAmbiLayout(AmbiLayout layouttype) noexcept -> const std::array<uint8_t,M
auto GetAmbi2DLayout(AmbiLayout layouttype) noexcept -> const std::array<uint8_t,MaxAmbi2DChannels>& auto GetAmbi2DLayout(AmbiLayout layouttype) noexcept -> const std::array<uint8_t,MaxAmbi2DChannels>&
{ {
if(layouttype == AmbiLayout::FuMa) return AmbiIndex::FromFuMa2D; if(layouttype == AmbiLayout::FuMa) return AmbiIndex::FromFuMa2D;
return AmbiIndex::From2D; return AmbiIndex::FromACN2D;
} }
alc/bformatdec.cpp
+2 -2
View File
@@ -62,7 +62,7 @@ BFormatDec::BFormatDec(const AmbDecConf *conf, const bool allow_2band, const siz
{ {
for(size_t j{0},k{0};j < mChannelDec.size();++j) for(size_t j{0},k{0};j < mChannelDec.size();++j)
{ {
const size_t acn{periphonic ? j : AmbiIndex::From2D[j]}; const size_t acn{periphonic ? j : AmbiIndex::FromACN2D[j]};
if(!(conf->ChanMask&(1u<<acn))) continue; if(!(conf->ChanMask&(1u<<acn))) continue;
const size_t order{AmbiIndex::OrderFromChannel[acn]}; const size_t order{AmbiIndex::OrderFromChannel[acn]};
const float gain{conf->HFOrderGain[order] / coeff_scale[acn]}; const float gain{conf->HFOrderGain[order] / coeff_scale[acn]};
@@ -83,7 +83,7 @@ BFormatDec::BFormatDec(const AmbDecConf *conf, const bool allow_2band, const siz
const float ratio{std::pow(10.0f, conf->XOverRatio / 40.0f)}; const float ratio{std::pow(10.0f, conf->XOverRatio / 40.0f)};
for(size_t j{0},k{0};j < mChannelDec.size();++j) for(size_t j{0},k{0};j < mChannelDec.size();++j)
{ {
const size_t acn{periphonic ? j : AmbiIndex::From2D[j]}; const size_t acn{periphonic ? j : AmbiIndex::FromACN2D[j]};
if(!(conf->ChanMask&(1u<<acn))) continue; if(!(conf->ChanMask&(1u<<acn))) continue;
const size_t order{AmbiIndex::OrderFromChannel[acn]}; const size_t order{AmbiIndex::OrderFromChannel[acn]};
const float hfGain{conf->HFOrderGain[order] * ratio / coeff_scale[acn]}; const float hfGain{conf->HFOrderGain[order] * ratio / coeff_scale[acn]};
alc/effects/convolution.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ auto GetAmbiLayout(AmbiLayout layouttype) noexcept -> const std::array<uint8_t,M
auto GetAmbi2DLayout(AmbiLayout layouttype) noexcept -> const std::array<uint8_t,MaxAmbi2DChannels>& auto GetAmbi2DLayout(AmbiLayout layouttype) noexcept -> const std::array<uint8_t,MaxAmbi2DChannels>&
{ {
if(layouttype == AmbiLayout::FuMa) return AmbiIndex::FromFuMa2D; if(layouttype == AmbiLayout::FuMa) return AmbiIndex::FromFuMa2D;
return AmbiIndex::From2D; return AmbiIndex::FromACN2D;
} }
alc/panning.cpp
+2 -2
View File
@@ -547,7 +547,7 @@ void InitPanning(ALCdevice *device, const bool hqdec=false, const bool stablize=
/* Built-in speaker decoders are always 2D. */ /* Built-in speaker decoders are always 2D. */
const size_t ambicount{Ambi2DChannelsFromOrder(decoder.mOrder)}; const size_t ambicount{Ambi2DChannelsFromOrder(decoder.mOrder)};
std::transform(AmbiIndex::From2D.begin(), AmbiIndex::From2D.begin()+ambicount, std::transform(AmbiIndex::FromACN2D.begin(), AmbiIndex::FromACN2D.begin()+ambicount,
std::begin(device->Dry.AmbiMap), std::begin(device->Dry.AmbiMap),
[](const uint8_t &index) noexcept { return BFChannelConfig{1.0f, index}; } [](const uint8_t &index) noexcept { return BFChannelConfig{1.0f, index}; }
); );
@@ -611,7 +611,7 @@ void InitCustomPanning(ALCdevice *device, const bool hqdec, const bool stablize,
else else
{ {
count = Ambi2DChannelsFromOrder(order); count = Ambi2DChannelsFromOrder(order);
std::transform(AmbiIndex::From2D.begin(), AmbiIndex::From2D.begin()+count, std::transform(AmbiIndex::FromACN2D.begin(), AmbiIndex::FromACN2D.begin()+count,
std::begin(device->Dry.AmbiMap), std::begin(device->Dry.AmbiMap),
[](const uint8_t &index) noexcept { return BFChannelConfig{1.0f, index}; } [](const uint8_t &index) noexcept { return BFChannelConfig{1.0f, index}; }
); );
core/ambidefs.cpp
+1 -1
View File
@@ -10,6 +10,6 @@ constexpr std::array<float,MaxAmbiChannels> AmbiScale::FromFuMa;
constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::FromFuMa; constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::FromFuMa;
constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::FromFuMa2D; constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::FromFuMa2D;
constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::FromACN; constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::FromACN;
constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::From2D; constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::FromACN2D;
constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::OrderFromChannel; constexpr std::array<uint8_t,MaxAmbiChannels> AmbiIndex::OrderFromChannel;
constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::OrderFrom2DChannel; constexpr std::array<uint8_t,MaxAmbi2DChannels> AmbiIndex::OrderFrom2DChannel;
core/ambidefs.h
+1 -1
View File
@@ -120,7 +120,7 @@ struct AmbiIndex {
0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15 8, 9, 10, 11, 12, 13, 14, 15
}}; }};
static constexpr std::array<uint8_t,MaxAmbi2DChannels> From2D{{ static constexpr std::array<uint8_t,MaxAmbi2DChannels> FromACN2D{{
0, 1,3, 4,8, 9,15 0, 1,3, 4,8, 9,15
}}; }};