diff options
| author | Chris Robinson <[email protected]> | 2021-07-13 13:56:22 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2021-07-13 13:56:22 -0700 |
| commit | 604bf609d0c9cb7b4061177b74c57b44b223bb71 (patch) | |
| tree | 3d91f79dccb3908a8c46d1cbc77fc74ac7241c80 /core | |
| parent | 0977627ca66b46ea5e5f817cbf47d14b36566373 (diff) | |
Use the 2D channel orders for 2- and 3-channel UHJ
Diffstat (limited to 'core')
| -rw-r--r-- | core/voice.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/voice.cpp b/core/voice.cpp index 261e9a79..ea99f8ad 100644 --- a/core/voice.cpp +++ b/core/voice.cpp @@ -830,7 +830,8 @@ void Voice::prepare(DeviceBase *device) */ if(mAmbiOrder && device->mAmbiOrder > mAmbiOrder) { - const uint8_t *OrderFromChan{(mFmtChannels == FmtBFormat2D) ? + const uint8_t *OrderFromChan{(mFmtChannels == FmtBFormat2D + || mFmtChannels == FmtUHJ2 || mFmtChannels == FmtUHJ3) ? AmbiIndex::OrderFrom2DChannel().data() : AmbiIndex::OrderFromChannel().data()}; const auto scales = AmbiScale::GetHFOrderScales(mAmbiOrder, device->mAmbiOrder); |