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

Mix each frequency band individually for ambisonic upsampling

Browse Source
This commit is contained in:
Chris Robinson
2018-12-16 22:37:29 -08:00
parent 3b0fd20bee
commit a359cb85e6
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/bformatdec.cpp
+6 -7
View File
@@ -270,22 +270,21 @@ void AmbiUpsampler::reset(const ALCdevice *device)
ALdouble gain{0.0};
for(size_t k{0u};k < COUNTOF(Ambi3DDecoder);k++)
gain += (ALdouble)Ambi3DDecoder[k][i] * encgains[k][j];
mGains[i][j][HF_BAND] = (ALfloat)(gain * Ambi3DDecoderHFScale[i]);
mGains[i][j][LF_BAND] = (ALfloat)gain;
mGains[i][HF_BAND][j] = (ALfloat)(gain * Ambi3DDecoderHFScale[i]);
mGains[i][LF_BAND][j] = (ALfloat)gain;
}
}
}
void AmbiUpsampler::process(ALfloat (*RESTRICT OutBuffer)[BUFFERSIZE], const ALsizei OutChannels, const ALfloat (*RESTRICT InSamples)[BUFFERSIZE], const ALsizei SamplesToDo)
{
ASSUME(OutChannels > 0);
ASSUME(SamplesToDo > 0);
for(ALsizei i{0};i < 4;i++)
{
mXOver[i].process(mSamples[HF_BAND], mSamples[LF_BAND], InSamples[i], SamplesToDo);
for(ALsizei j{0};j < OutChannels;j++)
MixRowSamples(OutBuffer[j], mGains[i][j].data(), mSamples, sNumBands, 0, SamplesToDo);
MixSamples(mSamples[HF_BAND], OutChannels, OutBuffer, mGains[i][HF_BAND].data(),
mGains[i][HF_BAND].data(), 0, 0, SamplesToDo);
MixSamples(mSamples[LF_BAND], OutChannels, OutBuffer, mGains[i][LF_BAND].data(),
mGains[i][LF_BAND].data(), 0, 0, SamplesToDo);
}
}
Alc/bformatdec.h
+1 -1
View File
@@ -81,7 +81,7 @@ private:
BandSplitter mXOver[4];
std::array<std::array<std::array<ALfloat,sNumBands>,MAX_OUTPUT_CHANNELS>,4> mGains;
std::array<std::array<std::array<ALfloat,MAX_OUTPUT_CHANNELS>,sNumBands>,4> mGains;
public:
void reset(const ALCdevice *device);