From e3a22618d1abaea263fc5f87cd0d0e6e1273e3be Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Thu, 27 Oct 2016 17:49:43 -0700
Subject: [PATCH] CR feedback

---
 assignment-client/src/Agent.cpp                      | 9 +++------
 assignment-client/src/Agent.h                        | 2 +-
 assignment-client/src/audio/AudioMixer.cpp           | 5 +++--
 assignment-client/src/audio/AudioMixerClientData.cpp | 2 +-
 assignment-client/src/audio/AudioMixerClientData.h   | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 5b299ea6a9..23bee2c91a 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -474,7 +474,7 @@ void Agent::processAgentAvatar() {
         nodeList->broadcastToNodes(std::move(avatarPacket), NodeSet() << NodeType::AvatarMixer);
     }
 }
-void Agent::flushEncoder(QByteArray& encodedZeros) {
+void Agent::encodeFrameOfZeros(QByteArray& encodedZeros) {
     _flushEncoder = false;
     static const QByteArray zeros(AudioConstants::NETWORK_FRAME_BYTES_PER_CHANNEL, 0);
     if (_encoder) {
@@ -560,14 +560,11 @@ void Agent::processAgentAvatarAudio() {
 
             QByteArray encodedBuffer;
             if (_flushEncoder) {
-                // after sound is done playing, encoder has a bit of state in it, 
-                // and needs some 0s to forget or you get a little click next time
-                // you play something.  So, basically 0-pad the end of the sound buffer
-                flushEncoder(encodedBuffer);
+                encodeFrameOfZeros(encodedBuffer);
             } else {
-                // encode it
                 QByteArray decodedBuffer(reinterpret_cast<const char*>(nextSoundOutput), numAvailableSamples*sizeof(int16_t));
                 if (_encoder) {
+                    // encode it
                     _encoder->encode(decodedBuffer, encodedBuffer);
                 } else {
                     encodedBuffer = decodedBuffer;
diff --git a/assignment-client/src/Agent.h b/assignment-client/src/Agent.h
index b11e492136..939b51625a 100644
--- a/assignment-client/src/Agent.h
+++ b/assignment-client/src/Agent.h
@@ -81,7 +81,7 @@ signals:
 private:
     void negotiateAudioFormat();
     void selectAudioFormat(const QString& selectedCodecName);
-    void flushEncoder(QByteArray& encodedZeros);
+    void encodeFrameOfZeros(QByteArray& encodedZeros);
 
     std::unique_ptr<ScriptEngine> _scriptEngine;
     EntityEditPacketSender _entityEditSender;
diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 2f26042266..bc356b8ce1 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -825,15 +825,16 @@ void AudioMixer::broadcastMixes() {
                         mixPacket->writeString(codecInPacket);
 
                         QByteArray encodedBuffer;
-                        if ( mixHasAudio) {
+                        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);
+                            nodeData->encodeFrameOfZeros(encodedBuffer);
                         }
                         // pack mixed audio samples
                         mixPacket->write(encodedBuffer.constData(), encodedBuffer.size());
+                    
                     } else {
                         int silentPacketBytes = sizeof(quint16) + sizeof(quint16) + AudioConstants::MAX_CODEC_NAME_LENGTH_ON_WIRE;
                         mixPacket = NLPacket::create(PacketType::SilentAudioFrame, silentPacketBytes);
diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp
index 836cf9321b..58d89697af 100644
--- a/assignment-client/src/audio/AudioMixerClientData.cpp
+++ b/assignment-client/src/audio/AudioMixerClientData.cpp
@@ -371,7 +371,7 @@ void AudioMixerClientData::sendSelectAudioFormat(SharedNodePointer node, const Q
     nodeList->sendPacket(std::move(replyPacket), *node);
 }
 
-void AudioMixerClientData::flushEncoder(QByteArray& encodedZeros) {
+void AudioMixerClientData::encodeFrameOfZeros(QByteArray& encodedZeros) {
     static QByteArray zeros(AudioConstants::NETWORK_FRAME_BYTES_STEREO, 0);
     if (_shouldFlushEncoder) {
         if (_encoder) {
diff --git a/assignment-client/src/audio/AudioMixerClientData.h b/assignment-client/src/audio/AudioMixerClientData.h
index 682c99584e..34263f9cbe 100644
--- a/assignment-client/src/audio/AudioMixerClientData.h
+++ b/assignment-client/src/audio/AudioMixerClientData.h
@@ -80,7 +80,7 @@ public:
         // once you have encoded, you need to flush eventually.
         _shouldFlushEncoder = true;
     }
-    void flushEncoder(QByteArray& encodedZeros);
+    void encodeFrameOfZeros(QByteArray& encodedZeros);
     bool shouldFlushEncoder() { return _shouldFlushEncoder; }
 
     QString getCodecName() { return _selectedCodecName; }