moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-06-16 21:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix surround sound channel mapping on ALSA" since it can be handled inside PortAudio

Browse Source
This commit is contained in:
Cameron Gutman
2018-10-02 01:09:13 -07:00
parent 8dddcd04d5
commit a614a693e5
6 changed files with 7 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/streaming/audio/audio.cpp
+7 -11
View File
@@ -77,27 +77,23 @@ int Session::arInit(int /* audioConfiguration */,
SDL_memcpy(&s_ActiveSession->m_AudioConfig, opusConfig, sizeof(*opusConfig));
s_ActiveSession->m_AudioRenderer = s_ActiveSession->createAudioRenderer();
if (s_ActiveSession->m_AudioRenderer == nullptr) {
return -1;
}
// Allow the audio renderer to adjust the channel mapping to fit its
// preferred channel order
s_ActiveSession->m_AudioRenderer->adjustOpusChannelMapping(&s_ActiveSession->m_AudioConfig);
s_ActiveSession->m_OpusDecoder =
opus_multistream_decoder_create(opusConfig->sampleRate,
opusConfig->channelCount,
opusConfig->streams,
opusConfig->coupledStreams,
s_ActiveSession->m_AudioConfig.mapping,
opusConfig->mapping,
&error);
if (s_ActiveSession->m_OpusDecoder == NULL) {
delete s_ActiveSession->m_AudioRenderer;
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"Failed to create decoder: %d",
error);
return -1;
}
s_ActiveSession->m_AudioRenderer = s_ActiveSession->createAudioRenderer();
if (s_ActiveSession->m_AudioRenderer == nullptr) {
opus_multistream_decoder_destroy(s_ActiveSession->m_OpusDecoder);
return -2;
}