Use the 2D channel orders for 2- and 3-channel UHJ

This commit is contained in:
Chris Robinson 2021-07-13 13:56:22 -07:00
parent 0977627ca6
commit 604bf609d0

View File

@ -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);