From 333cd77d9cf94eeb1c889d457c1e3313f8b61110 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 15 Jul 2015 17:20:02 -0700
Subject: [PATCH] cleanup call to parseAudioData

---
 libraries/audio-client/src/AudioClient.cpp | 4 ++--
 libraries/audio/src/InboundAudioStream.cpp | 7 ++++---
 libraries/networking/src/udt/Packet.cpp    | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 42829e2521..908310d504 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -934,12 +934,12 @@ void AudioClient::handleAudioInput() {
 
             // pack the orientation
             _audioPacket->writePrimitive(headOrientation);
-
+            
             if (_audioPacket->getType() != PacketType::SilentAudioFrame) {
                 // audio samples have already been packed (written to networkAudioSamples)
                 _audioPacket->setPayloadSize(_audioPacket->getPayloadSize() + numNetworkBytes);
             }
-
+            
             _stats.sentPacket();
 
             nodeList->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SendAudioPacket);
diff --git a/libraries/audio/src/InboundAudioStream.cpp b/libraries/audio/src/InboundAudioStream.cpp
index b7c5febb50..deb12a6649 100644
--- a/libraries/audio/src/InboundAudioStream.cpp
+++ b/libraries/audio/src/InboundAudioStream.cpp
@@ -100,7 +100,7 @@ void InboundAudioStream::perSecondCallbackForUpdatingStats() {
 }
 
 int InboundAudioStream::parseData(NLPacket& packet) {
-
+    
     // parse sequence number and track it
     quint16 sequence;
     packet.readPrimitive(&sequence);
@@ -133,8 +133,9 @@ int InboundAudioStream::parseData(NLPacket& packet) {
             if (packet.getType() == PacketType::SilentAudioFrame) {
                 writeDroppableSilentSamples(networkSamples);
             } else {
-                int audioBytes = parseAudioData(packet.getType(), QByteArray::fromRawData(packet.getPayload() + packet.pos(),
-                                                                                          packet.bytesLeftToRead()),
+                int audioBytes = parseAudioData(packet.getType(),
+                                                QByteArray::fromRawData(packet.getPayload() + packet.pos(),
+                                                                        packet.bytesLeftToRead()),
                                                 networkSamples);
                 packet.seek(packet.pos() + audioBytes);
             }
diff --git a/libraries/networking/src/udt/Packet.cpp b/libraries/networking/src/udt/Packet.cpp
index f3448b15ad..56c5a1c389 100644
--- a/libraries/networking/src/udt/Packet.cpp
+++ b/libraries/networking/src/udt/Packet.cpp
@@ -138,7 +138,7 @@ Packet& Packet::operator=(Packet&& other) {
 void Packet::setPayloadSize(qint64 payloadSize) {
     if (isWritable()) {
         Q_ASSERT(payloadSize <= _payloadCapacity);
-        _payloadSize = std::max(payloadSize, _payloadCapacity);
+        _payloadSize = payloadSize;
     } else {
         qDebug() << "You can not call setPayloadSize for a non-writeable Packet.";
         Q_ASSERT(false);