From 6f2e9f48998d0674ae19f30b83ecf730895f48ed Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 9 Jul 2015 13:06:34 -0700 Subject: [PATCH 1/3] cleanup return in SentPacketHistory --- libraries/networking/src/SentPacketHistory.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libraries/networking/src/SentPacketHistory.cpp b/libraries/networking/src/SentPacketHistory.cpp index bea144e6aa..c6eec8eb63 100644 --- a/libraries/networking/src/SentPacketHistory.cpp +++ b/libraries/networking/src/SentPacketHistory.cpp @@ -48,10 +48,6 @@ const NLPacket* SentPacketHistory::getPacket(uint16_t sequenceNumber) const { if (seqDiff < 0) { seqDiff += UINT16_RANGE; } - auto packet = _sentPackets.get(seqDiff); - if (packet) { - return packet->get(); - } else { - return nullptr; - } + + return _sentPackets.get(seqDiff)->get(); } From 7ee08130f02bccdbd3de04391803751d638aeb07 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 9 Jul 2015 13:18:11 -0700 Subject: [PATCH 2/3] fix for avatar packet size in ScriptEngine --- libraries/script-engine/src/ScriptEngine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index e265fd3c8d..73aede85f7 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -588,7 +588,7 @@ void ScriptEngine::run() { const int SCRIPT_AUDIO_BUFFER_BYTES = SCRIPT_AUDIO_BUFFER_SAMPLES * sizeof(int16_t); QByteArray avatarByteArray = _avatarData->toByteArray(); - auto avatarPacket = NLPacket::create(PacketType::AvatarData); + auto avatarPacket = NLPacket::create(PacketType::AvatarData, avatarByteArray.size()); avatarPacket->write(avatarByteArray); From 16e7b2625bac3b2d5e1a13db12b174535c19d6f8 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 9 Jul 2015 13:20:10 -0700 Subject: [PATCH 3/3] don't sink the audioPacket in ScriptEngine --- libraries/script-engine/src/ScriptEngine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 73aede85f7..d24b7af714 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -588,7 +588,7 @@ void ScriptEngine::run() { const int SCRIPT_AUDIO_BUFFER_BYTES = SCRIPT_AUDIO_BUFFER_SAMPLES * sizeof(int16_t); QByteArray avatarByteArray = _avatarData->toByteArray(); - auto avatarPacket = NLPacket::create(PacketType::AvatarData, avatarByteArray.size()); + auto avatarPacket = NLPacket::create(PacketType::AvatarData); avatarPacket->write(avatarByteArray); @@ -675,7 +675,7 @@ void ScriptEngine::run() { audioPacket->writePrimitive(sequence); // send audio packet - nodeList->sendPacket(std::move(audioPacket), node); + nodeList->sendUnreliablePacket(audioPacket, node); } }); }