From 7c5085bd24d470f8f8f3f9d03091dc875d4aeb0e Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Thu, 11 Jan 2018 16:10:50 -0800
Subject: [PATCH] Handle stereo changes while active, by restarting the codec
 on both ends

---
 assignment-client/src/audio/AudioMixerClientData.cpp |  1 +
 assignment-client/src/audio/AvatarAudioStream.cpp    | 10 ++++++++++
 libraries/audio-client/src/AudioClient.cpp           | 11 ++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp
index f6298ce1b9..2560f43337 100644
--- a/assignment-client/src/audio/AudioMixerClientData.cpp
+++ b/assignment-client/src/audio/AudioMixerClientData.cpp
@@ -579,6 +579,7 @@ void AudioMixerClientData::setupCodec(CodecPluginPointer codec, const QString& c
     auto avatarAudioStream = getAvatarAudioStream();
     if (avatarAudioStream) {
         avatarAudioStream->setupCodec(codec, codecName, avatarAudioStream->isStereo() ? AudioConstants::STEREO : AudioConstants::MONO);
+        qCDebug(audio) << "setting AvatarAudioStream... codec:" << _selectedCodecName << "isStereo:" << avatarAudioStream->isStereo();
     }
 
 #if INJECTORS_SUPPORT_CODECS
diff --git a/assignment-client/src/audio/AvatarAudioStream.cpp b/assignment-client/src/audio/AvatarAudioStream.cpp
index 1e0c3ed9e6..42495b4dd0 100644
--- a/assignment-client/src/audio/AvatarAudioStream.cpp
+++ b/assignment-client/src/audio/AvatarAudioStream.cpp
@@ -11,6 +11,7 @@
 
 #include <udt/PacketHeaders.h>
 
+#include "AudioLogging.h"
 #include "AvatarAudioStream.h"
 
 AvatarAudioStream::AvatarAudioStream(bool isStereo, int numStaticJitterFrames) :
@@ -41,6 +42,15 @@ int AvatarAudioStream::parseStreamProperties(PacketType type, const QByteArray&
             _ringBuffer.resizeForFrameSize(isStereo
                                            ? AudioConstants::NETWORK_FRAME_SAMPLES_STEREO
                                            : AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL);
+            // restart the codec
+            if (_codec) {
+                if (_decoder) {
+                    _codec->releaseDecoder(_decoder);
+                }
+                _decoder = _codec->createDecoder(AudioConstants::SAMPLE_RATE, isStereo ? AudioConstants::STEREO : AudioConstants::MONO);
+            }
+            qCDebug(audio) << "resetting AvatarAudioStream... codec:" << _selectedCodecName << "isStereo:" << isStereo;
+
             _isStereo = isStereo;
         }
 
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 2e347f88df..c274f53dca 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -1382,7 +1382,16 @@ void AudioClient::setIsStereoInput(bool isStereoInput) {
             _desiredInputFormat.setChannelCount(1);
         }
 
-        // change in channel count for desired input format, restart the input device
+        // restart the codec
+        if (_codec) {
+            if (_encoder) {
+                _codec->releaseEncoder(_encoder);
+            }
+            _encoder = _codec->createEncoder(AudioConstants::SAMPLE_RATE, _isStereoInput ? AudioConstants::STEREO : AudioConstants::MONO);
+        }
+        qCDebug(audioclient) << "Reset Codec:" << _selectedCodecName << "isStereoInput:" << _isStereoInput;
+
+        // restart the input device
         switchInputToAudioDevice(_inputDeviceInfo);
     }
 }