History

Merge pull request #3107 from wangyix/master

prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;

Brad Hefta-Gaub committed 12 years ago

Commit dbdce322 parents 6109b72 94c0c1518 files · +74 −39Browse files

Showing the changes to interface/src/Application.cpp (1 of 18 files). Show all

Unified · Split

interface/src/Application.cpp+4−4
@@ -2184,11 +2184,11 @@ int Application::sendNackPackets() { · 2183 unmodified lines
2184 _octreeSceneStatsLock.unlock();2184 _octreeSceneStatsLock.unlock();
2185 continue;2185 continue;
2186 }2186 }
2187 OctreeSceneStats& stats = _octreeServerSceneStats[nodeUUID];
2188 2187
2189 // make copy of missing sequence numbers from stats2188 // get sequence number stats of node, prune its missing set, and make a copy of the missing set
2190 const QSet<OCTREE_PACKET_SEQUENCE> missingSequenceNumbers =2189 SequenceNumberStats& sequenceNumberStats = _octreeServerSceneStats[nodeUUID].getIncomingOctreeSequenceNumberStats();
2191 stats.getIncomingOctreeSequenceNumberStats().getMissingSet();2190 sequenceNumberStats.pruneMissingSet();
2191 const QSet<OCTREE_PACKET_SEQUENCE> missingSequenceNumbers = sequenceNumberStats.getMissingSet();
2192 2192
2193 _octreeSceneStatsLock.unlock();2193 _octreeSceneStatsLock.unlock();
2194 2194

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t