From b5abf44aa36b83f9b1b347cc08116855233be0e6 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 19 Nov 2014 14:31:49 -0800
Subject: [PATCH 1/2] Comment packt type number every 5

---
 libraries/networking/src/PacketHeaders.h | 26 ++++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/libraries/networking/src/PacketHeaders.h b/libraries/networking/src/PacketHeaders.h
index 6cca5b505d..7557ea31e1 100644
--- a/libraries/networking/src/PacketHeaders.h
+++ b/libraries/networking/src/PacketHeaders.h
@@ -21,57 +21,57 @@
 // NOTE: if adding a new packet type, you can replace one marked usable or add at the end
 // NOTE: if you want the name of the packet type to be available for debugging or logging, update nameForPacketType() as well
 enum PacketType {
-    PacketTypeUnknown,
+    PacketTypeUnknown, // 0
     PacketTypeStunResponse,
     PacketTypeDomainList,
     PacketTypePing,
     PacketTypePingReply,
-    PacketTypeKillAvatar,
+    PacketTypeKillAvatar, // 5
     PacketTypeAvatarData,
     PacketTypeInjectAudio,
     PacketTypeMixedAudio,
     PacketTypeMicrophoneAudioNoEcho,
-    PacketTypeMicrophoneAudioWithEcho,
+    PacketTypeMicrophoneAudioWithEcho, // 10
     PacketTypeBulkAvatarData,
     PacketTypeSilentAudioFrame,
     PacketTypeEnvironmentData,
     PacketTypeDomainListRequest,
-    PacketTypeRequestAssignment,
+    PacketTypeRequestAssignment, // 15
     PacketTypeCreateAssignment,
     PacketTypeDomainConnectionDenied,
     PacketTypeMuteEnvironment,
     PacketTypeAudioStreamStats,
-    PacketTypeDataServerConfirm,
+    PacketTypeDataServerConfirm, // 20
     PacketTypeVoxelQuery,
     PacketTypeVoxelData,
     PacketTypeVoxelSet,
     PacketTypeVoxelSetDestructive,
-    PacketTypeVoxelErase,
-    PacketTypeOctreeStats, // 26
+    PacketTypeVoxelErase, // 25
+    PacketTypeOctreeStats,
     PacketTypeJurisdiction,
     PacketTypeJurisdictionRequest,
     UNUSED_1,
-    UNUSED_2,
+    UNUSED_2, // 30
     UNUSED_3,
     UNUSED_4,
     PacketTypeNoisyMute,
     PacketTypeMetavoxelData,
-    PacketTypeAvatarIdentity,
+    PacketTypeAvatarIdentity, // 35
     PacketTypeAvatarBillboard,
     PacketTypeDomainConnectRequest,
     PacketTypeDomainServerRequireDTLS,
     PacketTypeNodeJsonStats,
-    PacketTypeEntityQuery,
-    PacketTypeEntityData, // 41
+    PacketTypeEntityQuery, // 40
+    PacketTypeEntityData,
     PacketTypeEntityAddOrEdit,
     PacketTypeEntityErase,
     PacketTypeEntityAddResponse,
     PacketTypeOctreeDataNack, // 45
     PacketTypeVoxelEditNack,
     PacketTypeAudioEnvironment,
-    PacketTypeEntityEditNack, // 48
+    PacketTypeEntityEditNack,
     PacketTypeSignedTransactionPayment,
-    PacketTypeIceServerHeartbeat,
+    PacketTypeIceServerHeartbeat, // 50
     PacketTypeIceServerHeartbeatResponse,
     PacketTypeUnverifiedPing,
     PacketTypeUnverifiedPingReply

From 0a9a6f1ef897238cf773a7baea58a008a3bf4266 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 19 Nov 2014 14:32:50 -0800
Subject: [PATCH 2/2] Fix parsing of silent packets properties

---
 libraries/audio/src/InboundAudioStream.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/libraries/audio/src/InboundAudioStream.cpp b/libraries/audio/src/InboundAudioStream.cpp
index 366659b633..666cdee6b3 100644
--- a/libraries/audio/src/InboundAudioStream.cpp
+++ b/libraries/audio/src/InboundAudioStream.cpp
@@ -169,9 +169,16 @@ int InboundAudioStream::parseData(const QByteArray& packet) {
 }
 
 int InboundAudioStream::parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples) {
-    // mixed audio packets do not have any info between the seq num and the audio data.
-    numAudioSamples = packetAfterSeqNum.size() / sizeof(int16_t);
-    return 0;
+    if (type == PacketTypeSilentAudioFrame) {
+        quint16 numSilentSamples = 0;
+        memcpy(&numSilentSamples, packetAfterSeqNum.constData(), sizeof(quint16));
+        numAudioSamples = numSilentSamples;
+        return sizeof(quint16);
+    } else {
+        // mixed audio packets do not have any info between the seq num and the audio data.
+        numAudioSamples = packetAfterSeqNum.size() / sizeof(int16_t);
+        return 0;
+    }
 }
 
 int InboundAudioStream::parseAudioData(PacketType type, const QByteArray& packetAfterStreamProperties, int numAudioSamples) {