From 42b7fd35ced6721c6fdbdbac601c43cdda27dce7 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Thu, 29 Aug 2019 21:07:10 -0700 Subject: [PATCH] Fix surround sound audio playing back silence --- Limelight/Stream/Connection.m | 4 +++- Limelight/ViewControllers/MainFrameViewController.m | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Limelight/Stream/Connection.m b/Limelight/Stream/Connection.m index fcec8a2d..b7155383 100644 --- a/Limelight/Stream/Connection.m +++ b/Limelight/Stream/Connection.m @@ -112,9 +112,11 @@ int ArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig, v [audioSession setPreferredSampleRate:opusConfig->sampleRate error:&audioSessionError]; [audioSession setCategory: AVAudioSessionCategoryPlayback error: &audioSessionError]; - [audioSession setPreferredOutputNumberOfChannels:opusConfig->channelCount error:&audioSessionError]; [audioSession setPreferredIOBufferDuration:0.005 error:&audioSessionError]; [audioSession setActive: YES error: &audioSessionError]; + + // FIXME: Calling this breaks surround audio for some reason + //[audioSession setPreferredOutputNumberOfChannels:opusConfig->channelCount error:&audioSessionError]; #endif OSStatus status; diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m index 3ff4e667..ef32bb11 100644 --- a/Limelight/ViewControllers/MainFrameViewController.m +++ b/Limelight/ViewControllers/MainFrameViewController.m @@ -481,7 +481,7 @@ static NSMutableSet* hostList; // Probe for supported channel configurations - Log(LOG_I, @"Audio devices supports %d channels", [AVAudioSession sharedInstance].maximumOutputNumberOfChannels); + Log(LOG_I, @"Audio device supports %d channels", [AVAudioSession sharedInstance].maximumOutputNumberOfChannels); if ([AVAudioSession sharedInstance].maximumOutputNumberOfChannels >= 6) { _streamConfig.audioChannelCount = 6; _streamConfig.audioChannelMask = 0xFC;