From 05d2bf6060e26d3507bbb6f285c452a328101780 Mon Sep 17 00:00:00 2001 From: "Adam D. Moss" Date: Sun, 18 Jan 2015 23:11:45 +0000 Subject: Audio: Drop the LFE/subwoofer channel from the decoded surround DPL2Decode still doesn't decode 5.1 properly, leaving bass in all channels, but its 5.0 is pretty good, so leave it at that. --- Source/Core/AudioCommon/OpenALStream.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Source/Core/AudioCommon/OpenALStream.cpp') diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp index 0752e54b6c..d56be05672 100644 --- a/Source/Core/AudioCommon/OpenALStream.cpp +++ b/Source/Core/AudioCommon/OpenALStream.cpp @@ -251,6 +251,14 @@ void OpenALStream::SoundLoop() { float dpl2[OAL_MAX_SAMPLES * OAL_MAX_BUFFERS * SURROUND_CHANNELS]; DPL2Decode(sampleBuffer, nSamples, dpl2); + // zero-out the subwoofer channel - DPL2Decode generates a pretty + // good 5.0 but not a good 5.1 output. Sadly there is not a 5.0 + // AL_FORMAT_50CHN32 to make this super-explicit. + // DPL2Decode output: LEFTFRONT, RIGHTFRONT, CENTREFRONT, (sub), LEFTREAR, RIGHTREAR + for (u32 i=0; i < nSamples; ++i) + { + dpl2[i*SURROUND_CHANNELS + 3 /*sub/lfe*/] = 0.0f; + } alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_51CHN32, dpl2, nSamples * FRAME_SURROUND_FLOAT, ulFrequency); ALenum err = alGetError(); if (err == AL_INVALID_ENUM) -- cgit v1.2.3