ZappoMan
c4fe36b13d
more Models->Entities renaming
2014-06-26 17:01:07 -07:00
ZappoMan
a60e66bcfd
more file renaming models->entities
2014-06-26 16:47:51 -07:00
ZappoMan
8b13bc564f
renaming some files
2014-06-26 16:42:13 -07:00
ZappoMan
ccc9eabd33
first cut at renaming Models to Entities
2014-06-26 16:39:52 -07:00
ZappoMan
b4bb1ef6f5
revert whitespace change
2014-06-25 16:54:40 -07:00
ZappoMan
a019b70e58
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
...
Conflicts:
tests/octree/CMakeLists.txt
tests/octree/src/ModelTests.cpp
tests/octree/src/main.cpp
2014-06-24 15:59:17 -07:00
ZappoMan
1d390faad8
add support for commandline/config value for dynamic jitter buffers
2014-06-24 10:29:38 -07:00
ZappoMan
5c188ea81e
adding more stats
2014-06-24 09:41:29 -07:00
ZappoMan
6434c0a2a4
add more stats
2014-06-23 17:28:39 -07:00
ZappoMan
4becb66e2a
use node uuid in stats
2014-06-23 16:10:51 -07:00
ZappoMan
b2c982976e
break up audio mixer stats across multiple packets
2014-06-23 15:46:58 -07:00
ZappoMan
076bc11545
added server side audio mixer jitter stats
2014-06-23 15:19:13 -07:00
wangyix
ffc20b8876
changed InterframeTimeGapHistory to InterframeTimeGapStats
2014-06-23 11:22:04 -07:00
wangyix
e5d7d471e3
removed debug code
2014-06-23 10:55:30 -07:00
wangyix
7196814ec3
added debug prints to look at injected ring buffers
2014-06-23 10:22:16 -07:00
wangyix
a5457eb86b
fixed bug in Audio.cpp where numSilentSamples was written to wrong place in packet
...
added more debug stuff, other minor changes and fixes
2014-06-20 14:43:18 -07:00
ZappoMan
f50395f8db
improve ModelItemID to ModelTreeElment map to not require rewriting when locel model ids are assigned values
2014-06-19 22:11:10 -07:00
wangyix
435b5094a0
moved time gap history to PositionalAudioRingBuffer, untested
...
removed hard-coded jitter buffer length.
2014-06-19 17:58:38 -07:00
ZappoMan
2d1d4de174
hacking more on the modelID to element map
2014-06-19 16:47:33 -07:00
wangyix
100bc022ec
fixed a for loop that erased elements while iterating
2014-06-19 16:42:51 -07:00
wangyix
aa3602f0fb
added InterframeTimeGapHistory and frameReceived() calls
2014-06-19 14:35:02 -07:00
ZappoMan
28c7c24399
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
...
Conflicts:
libraries/octree/src/AABox.h
2014-06-18 15:27:36 -07:00
Brad Hefta-Gaub
c7b1b504b4
Merge pull request #3047 from birarda/master
...
allow a payload to define a zone of unattenuated audio
2014-06-18 15:25:41 -07:00
ZappoMan
c54bdb3e8d
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
2014-06-18 15:20:08 -07:00
Stephen Birarda
dd5d59208e
fix a crash when grabbing AABox from buffer
2014-06-18 15:05:38 -07:00
Brad Hefta-Gaub
f2b2784fa9
Merge pull request #3045 from wangyix/edit_nack_pull
...
Changed octree data NACK handling to repeatedly NACK missing seq numbers, like edit NACKs
2014-06-18 15:02:40 -07:00
Stephen Birarda
1228bd4a1e
handle addition of samples for an unattenuated listener
2014-06-18 14:18:39 -07:00
Stephen Birarda
db1031144b
fix passing of unattenuated zones to buffers
2014-06-18 13:46:03 -07:00
wangyix
c7788b793c
removed erroneous call updateNodeWithDataFromPacket for octree data nacks
2014-06-18 13:36:54 -07:00
wangyix
29723d0ef3
changed octree data nacks to repeatedly nack missing seq nums
2014-06-18 13:36:54 -07:00
Stephen Birarda
5878b4af59
setup listener unattenuated zones for source ring buffers
2014-06-18 12:50:16 -07:00
Brad Hefta-Gaub
c49ff59725
Merge pull request #3037 from wangyix/edit_nack_pull
...
Edit nack pull
2014-06-18 11:43:25 -07:00
wangyix
d78ed66616
removed spaces before comments in OctreeInboundPacketProcessor
2014-06-18 11:37:54 -07:00
wangyix
7cef5eeeec
replaced UINT16_MAX at 2 other places
2014-06-18 10:27:02 -07:00
wangyix
8c4e365958
added forgotten i++ in sendNackPackets()
...
plus minor style fixes
2014-06-18 09:28:42 -07:00
ZappoMan
5a246fab26
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
...
Conflicts:
tests/octree/src/main.cpp
2014-06-17 17:45:06 -07:00
wangyix
604b17185b
call writeUnverifiedDatagram for sending edit nacks
2014-06-17 14:43:13 -07:00
Andrew Meadows
3f36325642
remove warnings about signed/unsigned comparison
2014-06-17 11:59:37 -07:00
wangyix
011e7c2de2
removed debug code
2014-06-17 11:53:09 -07:00
wangyix
8187912384
added qDebug() check in SentPacketHistory for seq numbers
...
used (unsigned short int)1 instead of 1 when calculating
expectedSequence
2014-06-17 11:34:35 -07:00
wangyix
dc71f87ea4
edit nacks seem to be working;
...
added mutex for releaseQueuedPacket() to prevent duplicate packets being
queued up due to the steps of queueing the packet and clearing it not
being atomic.
2014-06-17 10:42:56 -07:00
wangyix
06f8464ec9
edit nacks ready for test; seq numbers sometimes repeat??
2014-06-16 17:17:48 -07:00
wangyix
95b2524784
removed magic number 65536 from OctreeInboundPacketProcessor
2014-06-16 16:08:48 -07:00
wangyix
14f50f4576
removed old SentPacketHistory
2014-06-16 14:05:27 -07:00
wangyix
ebfd65dea8
added OctreeInboundPacketProcessor::process() override to send nack periodically
...
added code to remove dead nodes' stats in sendNackPackets()
2014-06-16 12:30:16 -07:00
wangyix
2b20720f51
added sendNackPackets() to OctreeInboundPacketProcessor
...
added rollover handling in _missingSequenceNumbers pruning; added
EditNack packet types; added getMyEditNackType() to OctreeServer
subclasses; added code to randomly skip edit packet sequence numbers for
testing in OctreeEditPacketSender
2014-06-16 09:57:05 -07:00
wangyix
b210b07b81
rollovers are now handled in SingleSenderStats::trackInboundPacket
2014-06-13 11:08:15 -07:00
wangyix
3d4fae4b3f
Revert "added code for AC to send nack packets; no locking yet"
...
This reverts commit 15bd0878c4
2014-06-13 09:58:56 -07:00
wangyix
1491216962
Revert "added locking on _singleSenderStats; untested!"
...
This reverts commit c542da9707
2014-06-13 09:58:45 -07:00
John Grosen
47a88a2713
Updated AssignmentClient to use HifiConfigVariantMap...
...
...and also updated DomainServer to appropriately use boolean options
2014-06-12 17:08:23 -07:00
