From 5e4f5391442ecf233934a744c213cc2e7fe22154 Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Thu, 27 Oct 2016 14:46:04 -0700
Subject: [PATCH] AudioMixer flushes now

And protected agent from case with no codec
---
 assignment-client/src/Agent.cpp                    |  2 ++
 assignment-client/src/audio/AudioMixer.cpp         | 14 ++++++++------
 .../src/audio/AudioMixerClientData.cpp             |  7 ++++---
 assignment-client/src/audio/AudioMixerClientData.h |  6 ++++--
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 5459a0a148..5b299ea6a9 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -479,6 +479,8 @@ void Agent::flushEncoder(QByteArray& encodedZeros) {
     static const QByteArray zeros(AudioConstants::NETWORK_FRAME_BYTES_PER_CHANNEL, 0);
     if (_encoder) {
         _encoder->encode(zeros, encodedZeros);
+    } else {
+        encodedZeros = zeros;
     }
 }
 
diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index e580c62905..ad4e6c5138 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -818,9 +818,7 @@ void AudioMixer::broadcastMixes() {
 
                     std::unique_ptr<NLPacket> mixPacket;
 
-                    if (mixHasAudio) {
-                        // may need to flush, this checks
-                        nodeData->flushEncoder();
+                    if (mixHasAudio || nodeData->shouldFlushEncoder()) {
                         
                         int mixPacketBytes = sizeof(quint16) + AudioConstants::MAX_CODEC_NAME_LENGTH_ON_WIRE 
                                                              + AudioConstants::NETWORK_FRAME_BYTES_STEREO;
@@ -834,10 +832,14 @@ void AudioMixer::broadcastMixes() {
                         QString codecInPacket = nodeData->getCodecName();
                         mixPacket->writeString(codecInPacket);
 
-                        QByteArray decodedBuffer(reinterpret_cast<char*>(_clampedSamples), AudioConstants::NETWORK_FRAME_BYTES_STEREO);
                         QByteArray encodedBuffer;
-                        nodeData->encode(decodedBuffer, encodedBuffer);
-
+                        if ( mixHasAudio) {
+                            QByteArray decodedBuffer(reinterpret_cast<char*>(_clampedSamples), AudioConstants::NETWORK_FRAME_BYTES_STEREO);
+                            nodeData->encode(decodedBuffer, encodedBuffer);
+                        } else {
+                            // time to flush, which resets the shouldFlush until next time we encode something
+                            nodeData->flushEncoder(encodedBuffer);
+                        }
                         // pack mixed audio samples
                         mixPacket->write(encodedBuffer.constData(), encodedBuffer.size());
                     } else {
diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp
index a0b96ff39b..4084df7090 100644
--- a/assignment-client/src/audio/AudioMixerClientData.cpp
+++ b/assignment-client/src/audio/AudioMixerClientData.cpp
@@ -366,15 +366,16 @@ void AudioMixerClientData::sendSelectAudioFormat(SharedNodePointer node, const Q
     nodeList->sendPacket(std::move(replyPacket), *node);
 }
 
-void AudioMixerClientData::flushEncoder() {
+void AudioMixerClientData::flushEncoder(QByteArray& encodedZeros) {
     static QByteArray zeros(AudioConstants::NETWORK_FRAME_BYTES_STEREO, 0);
-    static QByteArray encodedZeros;
     if (_shouldFlushEncoder) {
-        _shouldFlushEncoder = false;
         if (_encoder) {
             _encoder->encode(zeros, encodedZeros);
+        } else {
+            encodedZeros = zeros;
         }
     }
+    _shouldFlushEncoder = false;
 }
 
 void AudioMixerClientData::setupCodec(CodecPluginPointer codec, const QString& codecName) {
diff --git a/assignment-client/src/audio/AudioMixerClientData.h b/assignment-client/src/audio/AudioMixerClientData.h
index 51f06b41c4..ba8e5c021b 100644
--- a/assignment-client/src/audio/AudioMixerClientData.h
+++ b/assignment-client/src/audio/AudioMixerClientData.h
@@ -76,9 +76,11 @@ public:
         } else {
             encodedBuffer = decodedBuffer;
         }
+        // once you have encoded, you need to flush eventually.
+        _shouldFlushEncoder = true;
     }
-    void flushEncoder();
-    void shouldFlushEncoder() { _shouldFlushEncoder = true; }
+    void flushEncoder(QByteArray& encodedZeros);
+    bool shouldFlushEncoder() { return _shouldFlushEncoder; }
 
     QString getCodecName() { return _selectedCodecName; }