diff options
| author | Chris Robinson <[email protected]> | 2014-11-07 00:54:16 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2014-11-07 00:54:16 -0800 |
| commit | 0051a9637644795c721945faf64f9917ec5aa788 (patch) | |
| tree | d5eb47396290ee0f51513e9c01574ffc7cd5cd88 /Alc/backends/pulseaudio.c | |
| parent | 7a98e92117200ef1071dbf4ef2982141fe84e788 (diff) | |
Fix 5.1 surround sound
Apparently, 5.1 surround sound is supposed to use the "side" channels, not the
back channels, and we've been wrong this whole time. That means the "5.1 Side"
is actually the correct 5.1 setup, and using the back channels is anomalous.
Additionally, this means the 5.1 buffer format should also use the the side
channels instead of the back channels.
A final note: the 5.1 mixing coefficients are changed so both use the original
5.1 surround sound set (with the surround channels at +/-110 degrees). So the
only difference now between 5.1 "side" and 5.1 "back" is the channel labels.
Diffstat (limited to 'Alc/backends/pulseaudio.c')
| -rw-r--r-- | Alc/backends/pulseaudio.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Alc/backends/pulseaudio.c b/Alc/backends/pulseaudio.c index a8fb64fb..a90e06c1 100644 --- a/Alc/backends/pulseaudio.c +++ b/Alc/backends/pulseaudio.c @@ -671,10 +671,10 @@ static void ALCpulsePlayback_sinkInfoCallback(pa_context *UNUSED(context), const DevFmtX71 }, { "front-left,front-right,front-center,lfe,rear-center,side-left,side-right", DevFmtX61 }, - { "front-left,front-right,front-center,lfe,rear-left,rear-right", - DevFmtX51 }, { "front-left,front-right,front-center,lfe,side-left,side-right", - DevFmtX51Side }, + DevFmtX51 }, + { "front-left,front-right,front-center,lfe,rear-left,rear-right", + DevFmtX51Rear }, { "front-left,front-right,rear-left,rear-right", DevFmtQuad }, { "front-left,front-right", DevFmtStereo }, { "mono", DevFmtMono }, @@ -994,11 +994,11 @@ static ALCboolean ALCpulsePlayback_reset(ALCpulsePlayback *self) mapname = "front-left,front-right,rear-left,rear-right"; break; case DevFmtX51: - mapname = "front-left,front-right,front-center,lfe,rear-left,rear-right"; - break; - case DevFmtX51Side: mapname = "front-left,front-right,front-center,lfe,side-left,side-right"; break; + case DevFmtX51Rear: + mapname = "front-left,front-right,front-center,lfe,rear-left,rear-right"; + break; case DevFmtX61: mapname = "front-left,front-right,front-center,lfe,rear-center,side-left,side-right"; break; |