moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2025-07-02 07:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ALSA and PA mappings for 7.1 surround sound

Browse Source
This commit is contained in:
Cameron Gutman 2021-07-24 15:35:27 -05:00
parent 0ebd86184b
commit 2fa276182f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/audio/alsa.c
View File

@ -33,18 +33,20 @@ static int alsa_renderer_init(int audioConfiguration, POPUS_MULTISTREAM_CONFIGUR
int rc; int rc;
unsigned char alsaMapping[MAX_CHANNEL_COUNT]; unsigned char alsaMapping[MAX_CHANNEL_COUNT];
/* The supplied mapping array has order: FL-FR-C-LFE-RL-RR /* The supplied mapping array has order: FL-FR-C-LFE-RL-RR-SL-SR
* ALSA expects the order: FL-FR-RL-RR-C-LFE * ALSA expects the order: FL-FR-RL-RR-C-LFE-SL-SR
* We need copy the mapping locally and swap the channels around. * We need copy the mapping locally and swap the channels around.
*/ */
alsaMapping[0] = opusConfig->mapping[0]; alsaMapping[0] = opusConfig->mapping[0];
alsaMapping[1] = opusConfig->mapping[1]; alsaMapping[1] = opusConfig->mapping[1];
if (opusConfig->channelCount == 6) { if (opusConfig->channelCount >= 6) {
alsaMapping[2] = opusConfig->mapping[4]; alsaMapping[2] = opusConfig->mapping[4];
alsaMapping[3] = opusConfig->mapping[5]; alsaMapping[3] = opusConfig->mapping[5];
alsaMapping[4] = opusConfig->mapping[2]; alsaMapping[4] = opusConfig->mapping[2];
alsaMapping[5] = opusConfig->mapping[3]; alsaMapping[5] = opusConfig->mapping[3];
} }
alsaMapping[6] = opusConfig->mapping[6];
alsaMapping[7] = opusConfig->mapping[7];
decoder = opus_multistream_decoder_create(opusConfig->sampleRate, opusConfig->channelCount, opusConfig->streams, opusConfig->coupledStreams, alsaMapping, &rc); decoder = opus_multistream_decoder_create(opusConfig->sampleRate, opusConfig->channelCount, opusConfig->streams, opusConfig->coupledStreams, alsaMapping, &rc);

8
src/audio/pulse.c
View File

@ -53,18 +53,20 @@ static int pulse_renderer_init(int audioConfiguration, POPUS_MULTISTREAM_CONFIGU
channelCount = opusConfig->channelCount; channelCount = opusConfig->channelCount;
/* The supplied mapping array has order: FL-FR-C-LFE-RL-RR /* The supplied mapping array has order: FL-FR-C-LFE-RL-RR-SL-SR
* ALSA expects the order: FL-FR-RL-RR-C-LFE * ALSA expects the order: FL-FR-RL-RR-C-LFE-SL-SR
* We need copy the mapping locally and swap the channels around. * We need copy the mapping locally and swap the channels around.
*/ */
alsaMapping[0] = opusConfig->mapping[0]; alsaMapping[0] = opusConfig->mapping[0];
alsaMapping[1] = opusConfig->mapping[1]; alsaMapping[1] = opusConfig->mapping[1];
if (opusConfig->channelCount == 6) { if (opusConfig->channelCount >= 6) {
alsaMapping[2] = opusConfig->mapping[4]; alsaMapping[2] = opusConfig->mapping[4];
alsaMapping[3] = opusConfig->mapping[5]; alsaMapping[3] = opusConfig->mapping[5];
alsaMapping[4] = opusConfig->mapping[2]; alsaMapping[4] = opusConfig->mapping[2];
alsaMapping[5] = opusConfig->mapping[3]; alsaMapping[5] = opusConfig->mapping[3];
} }
alsaMapping[6] = opusConfig->mapping[6];
alsaMapping[7] = opusConfig->mapping[7];
decoder = opus_multistream_decoder_create(opusConfig->sampleRate, opusConfig->channelCount, opusConfig->streams, opusConfig->coupledStreams, alsaMapping, &rc); decoder = opus_multistream_decoder_create(opusConfig->sampleRate, opusConfig->channelCount, opusConfig->streams, opusConfig->coupledStreams, alsaMapping, &rc);