Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-15 14:39:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19696 commits 70 branches 59 tags 1.2 GiB
Commit graph

1016 commits

Author SHA1 Message Date
ZappoMan
e800d5457b Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 2014-07-08 13:02:31 -07:00
wangyix
2e73ac8bc1 changed Audio.cpp to not overflow _audioOutput buffer, and 2 other things 
added _consecutiveNotMixedCount to prevent premature injector stream
deletion;  made silent-frame drop only occur in dynamic jitter buffer
mode
 2014-07-08 11:16:39 -07:00
Andrzej Kapolka
6bf4182804 Fix for send timer. 2014-07-07 16:25:13 -07:00
Andrzej Kapolka
69e7a17f47 Rather than backing out when we find that the delta is too big, we can just 
write the whole thing and copy it over (with some mapping fiddlery) if it
turns out to be too big.
 2014-07-07 16:07:04 -07:00
Andrzej Kapolka
44befbb019 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-07 12:21:56 -07:00
Atlante45
a225df63f6 Removed deprecated moveToThread() 2014-07-07 11:40:03 -07:00
Andrzej Kapolka
fb64d22171 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-07 11:09:17 -07:00
Andrzej Kapolka
e15f003639 Bring reliable delta streaming code over from test. 2014-07-07 11:08:43 -07:00
Atlante45
b0e83c32ff Hopeful fix to ACs crash 2014-07-03 18:17:01 -07:00
Stephen Birarda
ecbd62104c cause sounds within an epsilon distance to be unattenuated 2014-07-03 16:43:12 -07:00
Stephen Birarda
7ff0648d8a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-03 16:32:46 -07:00
Stephen Birarda
438e0b501b fix the voices inside your head 2014-07-03 16:32:38 -07:00
Atlante45
8e1b8334a1 Fixed invokeMethod unable to find method + fixed children in different thread 2014-07-03 14:46:17 -07:00
ZappoMan
ec0c350f60 Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 
Conflicts:
	interface/src/Application.cpp
	interface/src/DatagramProcessor.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-03 14:20:40 -07:00
Stephen Birarda
04e7df1a3f change the audio rolloff function 2014-07-03 13:46:38 -07:00
Stephen Birarda
c0d0ca5066 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-rolloff 2014-07-03 13:37:06 -07:00
Brad Hefta-Gaub
dbdce32b68 Merge pull request #3107 from wangyix/master 
prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;
 2014-07-03 13:32:31 -07:00
Andrzej Kapolka
2bffff3275 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-03 11:39:27 -07:00
Stephen Birarda
411733feb7 make sure NetworkAccessManager singleton is on main AC thread 2014-07-03 11:34:39 -07:00
Andrzej Kapolka
38383effcc Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-03 11:33:22 -07:00
wangyix
507518f16d removed numFramesCapacity from being exposed everywhere 2014-07-03 11:11:56 -07:00
Stephen Birarda
0235b62324 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-rolloff 2014-07-03 11:05:20 -07:00
Stephen Birarda
fe52787572 implement a new rolloff function 2014-07-03 11:05:12 -07:00
Stephen Birarda
0af79c4d95 fix for script agent audio missing channel flag 2014-07-03 10:45:05 -07:00
ZappoMan
2c5209d1e7 virtual entities checkpoint 2014-07-03 09:07:11 -07:00
Andrzej Kapolka
154eb04336 Working on sending large deltas as reliable messages. 2014-07-02 17:13:39 -07:00
Atlante45
1ac38c9884 Switched call to setCache to invokeMethod 2014-07-02 14:31:19 -07:00
Atlante45
36fb530594 Switched DomainServer to NetworkAccessManager 2014-07-02 10:26:38 -07:00
Atlante45
d6a2cea756 Switched AudioMixer to NetworkAccessManager 2014-07-01 17:39:45 -07:00
Atlante45
231557a12c Switched Agent to NetworkAccessManager 2014-07-01 17:35:34 -07:00
wangyix
ab503583dd switched order of args in PositionalAudioRingBuffer 2014-07-01 17:33:38 -07:00
ZappoMan
865566414c Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities 
Conflicts:
	interface/src/entities/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTreeElement.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
 2014-07-01 16:32:47 -07:00
wangyix
a5943e3608 made AudioRingBuffer frames capacity variable 2014-07-01 16:24:31 -07:00
wangyix
fd051310da prune missing set before constructing nack packets; 
make MAX_REASONALBE_SEQUENCE_GAP global and sentPacketHistory to use
that value as the default history size
 2014-07-01 12:01:51 -07:00
Brad Hefta-Gaub
df51d26625 Merge pull request #3094 from wangyix/seqNumberStats 
Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;
 2014-07-01 10:54:35 -07:00
Andrzej Kapolka
0075bb89c4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-30 18:02:56 -07:00
wangyix
4abfd2b6b7 removed forgotten semicolon in stats string 2014-06-30 17:16:28 -07:00
wangyix
02f12c27c5 forgot to add early/late/lost domain page stats for mic stream 2014-06-30 16:20:29 -07:00
wangyix
ae2780dcab changed getAudioStreamStatsOfStream to return stats instead of taking pointer 2014-06-30 15:20:42 -07:00
wangyix
1bfe367020 fixed error with retrieving stream stats in AudioMixerClientData 2014-06-30 15:06:04 -07:00
wangyix
6b6dccda2f _resetCount to _overflowCount in AudioRingBuffer 2014-06-30 14:21:38 -07:00
wangyix
c789f3c6b9 merge with upstream 2014-06-30 14:13:34 -07:00
ZappoMan
687a81a223 fix crash in SendNack on server shutdown 2014-06-30 13:18:58 -07:00
wangyix
0711eb063e fix reference to temp object error? 2014-06-30 13:07:46 -07:00
wangyix
dbb370aecf added early/late/lost to domain page stats 2014-06-30 12:49:54 -07:00
wangyix
d2f86278b2 modified AudioStreamStats to per-stream with seq stats 
added AudioStreamStats info to interface overlay stats
 2014-06-30 12:31:58 -07:00
wangyix
de3c1ebf0f changed class name to AudioStreamStats, reverted ScriptEngine packing back to QDataStream 2014-06-30 09:42:22 -07:00
wangyix
a0795fd6e6 removed extra print 2014-06-27 16:52:15 -07:00
wangyix
4587828a3a removed debug prints 2014-06-27 16:48:21 -07:00
wangyix
0ae58bd7f9 added senderUUID arg to seq stats 2014-06-27 15:39:11 -07:00
Andrzej Kapolka
61c2ea40ae Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-27 12:34:50 -07:00
wangyix
ff438a2434 added seq stats for Agent, 
fixed  AudioInjector to do << (quint16)0 instead of
skipRawData(sizeof(quint16) to correctly allocate space for seq number;
added debug prints;
 2014-06-27 11:23:50 -07:00
Andrzej Kapolka
f16098daef Use the refactored endpoint/client classes in the actual client/server. 2014-06-26 19:11:54 -07:00
Stephen Birarda
3ae46bc60d switch audio-mixer to pull settings from domain-server via JSON request 2014-06-26 17:32:56 -07:00
ZappoMan
c4fe36b13d more Models->Entities renaming 2014-06-26 17:01:07 -07:00
Stephen Birarda
3f70402e63 fix odd encoding in settings URL 2014-06-26 16:58:51 -07:00
Stephen Birarda
95d266b305 initial setup of settings request from domain-server 2014-06-26 16:55:22 -07:00
wangyix
cb48825561 added seq number to all Audio types, untested 2014-06-26 16:52:23 -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
wangyix
37ce693153 added seqnum stats to AudioMixerClientData; added seqnums to Audio.cpp 2014-06-25 18:01:34 -07:00
wangyix
2ec04fb756 replaced old seqnum tracking code with SequenceNumberStats 2014-06-25 17:20:57 -07:00
ZappoMan
b4bb1ef6f5 revert whitespace change 2014-06-25 16:54:40 -07:00
wangyix
7dd7422cbf removed more unneccesary changes 2014-06-25 11:57:45 -07:00
wangyix
c583f8b023 removed unnecessary changes 2014-06-25 11:48:32 -07:00
wangyix
591bfa14b9 added PacketTypeAudioStreamStats for j-buffer stats 
...instead of packing that info into audio packets.
 2014-06-25 11:38:56 -07:00
wangyix
1257e0595a moved jbufferstats class to PositionalAudioRingBuffers 2014-06-25 09:52:02 -07:00
wangyix
99bc7f8c9d #include "" to #include <> 2014-06-25 09:20:15 -07:00
wangyix
52f00769d4 merged with upstream 2014-06-24 17:22:30 -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
wangyix
53e3f5a3b0 merged with upstream 2014-06-24 09:13:05 -07:00
wangyix
a4f5ce2215 added stats for audiomixer jitter buffers lengths in Application 2014-06-23 17:48:57 -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
wangyix
c542da9707 added locking on _singleSenderStats; untested! 2014-06-12 12:03:22 -07:00
wangyix
15bd0878c4 added code for AC to send nack packets; no locking yet 2014-06-12 11:37:05 -07:00
wangyix
7955979599 added _missingSequenceNumbers tracking to OctreeInboundPacketProcessor 2014-06-12 09:17:12 -07:00
ZappoMan
2db897a00e Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements 2014-06-11 14:40:25 -07:00
wangyix
c6a9a8924d changed NetworkPacket::_sendingNode to ::_node 2014-06-10 16:43:53 -07:00
wangyix
5ab271330e moved sendNack() into packetDistributor() 
...for the purpose of enforcing packets sent per interval in
OctreeSendThread.  Corrected mistake in keeping track of number of
special packets sent where sendSpecialPacket() was assumed to only send
one packet per call.
 2014-06-10 15:35:48 -07:00
ZappoMan
50bc3b03df Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements 2014-06-10 10:43:59 -07:00
ZappoMan
a0783f3f4a try appendElementData() a different way 2014-06-10 10:43:50 -07:00
ZappoMan
5eb6ddbdb3 first cut at support for extra element data 2014-06-09 16:04:25 -07:00
wangyix
8312e1642d replaced takeFirst() with dequeue() for consistency 2014-06-09 15:15:43 -07:00
ZappoMan
c5647addf4 Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements 2014-06-09 14:10:47 -07:00
wangyix
e45f2fed4b changed writelock to readlock 
plus a coding standard fix
 2014-06-09 13:42:45 -07:00
ZappoMan
6f1ec01797 rename nodeBag to elementBag in a bunch of places 2014-06-09 13:42:44 -07:00
wangyix
ff2a5342ee removed another extra space 2014-06-09 12:57:50 -07:00
wangyix
412d3e19fe removed debug prints in parseNackPacket() 2014-06-09 12:56:00 -07:00
wangyix
0fce7e721a removed more spaces 2014-06-09 12:40:01 -07:00
wangyix
968ea3563c removed an extra space 2014-06-09 12:37:42 -07:00
wangyix
aa694d6967 removed debug code 2014-06-09 12:35:26 -07:00
wangyix
3bc457d4d2 added octree scene stats locking and unlocking 2014-06-09 11:14:02 -07:00
wangyix
b39559d860 packet recovery seems to be working 
Seems to impact FPS a lot.  OctreeSceneStats is not being locked (causes
freezing, need to find out why).
 2014-06-06 17:44:30 -07:00
wangyix
d21a8e73ff Merge remote-tracking branch 'upstream/master' into packet_recovery_pull 2014-06-06 15:05:29 -07:00
wangyix
0b1bffa83c added random packet drops; ready to test 2014-06-06 15:03:54 -07:00
Stephen Birarda
194493ab9b remove MMX math to fix stereo discrepancies 2014-06-06 12:00:47 -07:00
wangyix
8cd5ec3b54 started work on sending nack packets from client 2014-06-06 11:50:34 -07:00
Stephen Birarda
f6011b65d7 fix input loudness for a stereo source 2014-06-06 11:26:04 -07:00
Stephen Birarda
ae2f6a3cb6 complete piping of stereo audio through mixer 2014-06-06 10:55:04 -07:00
wangyix
5461a06e99 completed code to resend nacked packets on AC 2014-06-06 09:33:14 -07:00
wangyix
1a7e3a859c started work on resending nacked packets 2014-06-05 18:00:58 -07:00
wangyix
6f45939113 re-enabled piggy-backing in OctreeSendThread 2014-06-04 11:02:31 -07:00
wangyix
50746a6540 extra commit of previous commit? 2014-06-03 16:19:12 -07:00
ZappoMan
758df4f58b silence some unused variable warnings and move some debug code to only execute in debug mode 2014-06-02 10:43:50 -07:00
wangyix
4c4ff45f31 removed duplicate function bodies 2014-05-29 14:31:40 -07:00
wangyix
d8b0b03e59 removed _sequenceNumber from OctreeSendThread 
inlined getSequenceNumber and incrementSequenceNumber
 2014-05-29 13:39:57 -07:00
wangyix
f82be105e8 moved _sequenceNumber back to OctreeQueryNode 2014-05-29 12:54:34 -07:00
wangyix
fe1a0e4565 removed debug stuff i missed 2014-05-29 11:27:14 -07:00
wangyix
c87c474877 removed debug info, cleaned code for pull req 2014-05-29 10:39:40 -07:00
wangyix
5d4b0df108 added flag,seq,st to EnvironmentData, untested 
removed/commented out debug prints
 2014-05-28 17:41:38 -07:00
wangyix
c799077379 added flag,seq,ts to ParticleErase and ModelErase 
... this fixes unreasonable flight-time issue
 2014-05-28 17:20:10 -07:00
wangyix
f361b9a8a7 removed updatePacketTimestamp() 
..from OctreeQueryNode
 2014-05-27 18:04:53 -07:00
wangyix
e89d33dc60 added if to not track ParticleErase packets 2014-05-27 18:02:49 -07:00
Stephen Birarda
f4292fd29c handle serving of scripts at temp unique UUIDs 2014-05-23 12:33:39 -07:00
wangyix
fe5fabdd61 removed old code that was commented out 
changed tabs to spaces
 2014-05-23 11:17:59 -07:00
wangyix
87d927d447 moved _sequenceNumber back to OctreeQueryNode 
instead added incrementSequenceNumber() to OctreeQueryNode for
sendthread to use
 2014-05-23 10:09:46 -07:00
wangyix
645002493f Merge remote-tracking branch 'upstream/master' 2014-05-23 09:48:05 -07:00
wangyix
2dd78b36db moved _sequenceNumber to OctreeSendThread 2014-05-23 09:47:08 -07:00
Stephen Birarda
97b67e83c5 remove more gnutls includes 2014-05-20 16:16:23 -07:00
Stephen Birarda
f1581ef823 remove dependency on GnuTLS for later replacement with OpenSSL 2014-05-20 16:16:22 -07:00
Stephen Birarda
8a1fdf3486 pass wallet UUID from AC to DS, cleanup noisy timer 2014-05-20 14:38:51 -07:00
Stephen Birarda
2ef822d19d remove more gnutls includes 2014-05-20 11:26:22 -07:00
Stephen Birarda
e3dd6509d8 remove dependency on GnuTLS for later replacement with OpenSSL 2014-05-20 10:47:11 -07:00
ZappoMan
fa20e8ff95 fix the agent support for scripting models 2014-05-14 13:17:10 -07:00
Philip Rosedale
4e1eaf8337 Merge pull request #2809 from Atlante45/mute_env 
Mute environment
 2014-05-07 16:18:23 -07:00
Stephen Birarda
5e9036b3fe tweak audio constants to be less agressive on cutoff 2014-05-07 15:37:41 -07:00
Atlante45
fd1f6befff CR 2014-05-07 15:19:32 -07:00
Atlante45
40ed72989c mute environment packet 2014-05-07 12:57:11 -07:00
Stephen Birarda
befe75a04c fix broken audio-mixer stats 2014-05-05 14:03:14 -07:00
Stephen Birarda
aa2931d9bb resolve conflicts on merge with upstream/master 2014-05-02 10:39:17 -07:00
ZappoMan
715e6b8e60 debugging model editing 2014-05-02 09:10:30 -07:00
Stephen Birarda
2f0e311a99 return OAuth URL to interface clients when OAuth enabled 2014-05-01 10:19:05 -07:00
ZappoMan
0182a6d895 models working end to end 2014-04-30 11:12:49 -07:00
ZappoMan
f993f984c9 first cut at modelserver 2014-04-30 09:26:14 -07:00
ZappoMan
aac42058ac first cut at modelserver 2014-04-30 09:25:52 -07:00
Atlante45
8b4a910040 Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00
Atlante45
ae566c55f6 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-23 10:38:29 -07:00
Atlante45
3eeb3a539d Fixed lack of resolution in usecTimestampNow() 2014-04-22 11:48:43 -07:00
AndrewMeadows
94fabf7875 Merge pull request #2709 from ZappoMan/shared_and_weak_pointers 
Voxel/Particle Server Performance Improvements
 2014-04-22 10:28:39 -07:00
Atlante45
ddf14b0842 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-22 10:22:30 -07:00
ZappoMan
60b8ab0de5 CR feedback 2014-04-21 17:45:38 -07:00
Atlante45
fd20686f0f Removed Systime.h includes 2014-04-21 17:23:06 -07:00
ZappoMan
a64d3ffc32 more cleanup 2014-04-21 16:38:45 -07:00
ZappoMan
7d18dbdfb8 more cleanup 2014-04-21 16:35:42 -07:00
Atlante45
cfc778d10c Fix regexp fail 2014-04-21 16:32:17 -07:00
ZappoMan
e55c488964 clean up some old debugging 2014-04-21 16:17:59 -07:00
Atlante45
681aab5bf0 Remove printf and replace them by qDebug() 2014-04-21 16:17:45 -07:00
ZappoMan
003e3ae507 properly unhook delete notifications 2014-04-21 16:01:37 -07:00
ZappoMan
f3aa9d3b8f unhook node bag from element notifications on shutdown to speed up cleanup 2014-04-21 15:45:12 -07:00
ZappoMan
7a8a8e2fac delete tree on server shutdown 2014-04-21 15:14:06 -07:00
ZappoMan
75f079e2b3 tweak debugging 2014-04-21 14:15:13 -07:00
ZappoMan
9a63fa7550 some cleanup 2014-04-21 13:36:13 -07:00
ZappoMan
14e1fa269a cleanup 2014-04-21 13:28:03 -07:00
Atlante45
ab76e6a00c Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 
Conflicts:
	interface/src/Audio.cpp
 2014-04-21 12:19:19 -07:00
ZappoMan
7798c6eb09 some debugging 2014-04-21 11:48:58 -07:00
ZappoMan
59cbda20c6 added some threading and event debugging 2014-04-20 19:48:17 -07:00
ZappoMan
50f7db8fe1 quiet some debugging 2014-04-18 15:02:10 -07:00
ZappoMan
2c02178802 Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 
Conflicts:
	assignment-client/src/AssignmentClient.cpp
	assignment-client/src/AssignmentClient.h
	libraries/shared/src/NodeList.cpp
 2014-04-18 14:28:54 -07:00
Stephen Birarda
6adfb91e93 rename AvatarHash to AvatarList 2014-04-18 09:40:35 -07:00
Stephen Birarda
77202af20d add debug for erase from AvatarHashMap, repair check for display name 2014-04-17 18:05:22 -07:00
Stephen Birarda
75f35c5858 optionally add an AvatarHashMap instance to the ScriptEngine 2014-04-17 17:55:16 -07:00
Stephen Birarda
f8106e5063 add an AvatarHashMap to the Agent 2014-04-17 17:49:55 -07:00
Andrzej Kapolka
6251b6b819 Merge fix. 2014-04-17 13:55:16 -07:00
Andrzej Kapolka
599b472cf7 Merge branch 'master' of https://github.com/highfidelity/hifi into animate 
Conflicts:
	assignment-client/src/Agent.cpp
 2014-04-17 13:51:32 -07:00
Stephen Birarda
a137dd0362 grab URL for script from payload if it exists 2014-04-17 10:18:42 -07:00
Andrzej Kapolka
0f69bbe23f More work on animation loading. 2014-04-16 20:39:55 -07:00
Atlante45
dd8a0e3550 Removed gettimeofday in AudioMixer 2014-04-16 12:16:49 -07:00
Stephen Birarda
7cef2def66 remove Syssocket which is from our pre-Qt days 2014-04-10 10:34:31 -07:00
Stephen Birarda
d5d52f804f add a networking library and link from appropriate targets 2014-04-10 09:32:17 -07:00
Stephen Birarda
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Stephen Birarda
2d755adfc0 repairs to good code blown away by regex 2014-04-09 10:46:20 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427 prepare header files for regex run against cpp 2014-04-09 09:35:05 -07:00
Stephen Birarda
7ce91b3f96 fix headers who had their comments removed 2014-04-08 17:43:35 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Stephen Birarda
6681754994 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 14:26:10 -07:00
Stephen Birarda
02e2135a2e allow setting of expected DTLS cert hostname from AC 2014-04-07 12:52:26 -07:00
Stephen Birarda
69504b0a9d proper cleanup of CA credentials on DTLSClientSession side 2014-04-07 09:47:51 -07:00
Stephen Birarda
fd8e32190e perform cleanup of GnuTLS structures across targets 2014-04-04 11:08:53 -07:00
Stephen Birarda
e1cae6d295 initial handshaking for DTLS sessions between DS and clients 2014-04-02 17:29:14 -07:00
Andrzej Kapolka
40844d2000 Working on ability to set a region of the metavoxel data directly. 2014-04-02 12:40:01 -07:00
ZappoMan
dc7e2dbe1b more debugging 2014-04-01 20:14:38 -07:00
ZappoMan
97b2e68988 more debugging 2014-04-01 14:05:05 -07:00
ZappoMan
b7695ba050 more debugging 2014-04-01 13:55:25 -07:00
Stephen Birarda
62041d91a8 rename NodeList DomainInfo to DomainHandler 2014-04-01 13:09:35 -07:00
Stephen Birarda
caf2473df8 add a DTLSSession object to handle GnuTLS DTLS sessions 2014-04-01 13:08:00 -07:00
ZappoMan
124619f8d9 more debugging 2014-04-01 12:51:34 -07:00
ZappoMan
6cb44a4d0c more debugging 2014-04-01 12:33:59 -07:00
ZappoMan
916a5d2da0 more debugging 2014-04-01 12:24:03 -07:00
ZappoMan
f504569655 more debugging 2014-04-01 11:49:49 -07:00
ZappoMan
58a52cf5e1 more debugging 2014-04-01 11:45:29 -07:00
ZappoMan
30ff4a1d19 more debugging 2014-04-01 11:32:35 -07:00
ZappoMan
1aa05c4de5 more debugging 2014-04-01 11:26:55 -07:00
ZappoMan
9e445098f1 more debugging 2014-04-01 11:22:44 -07:00
ZappoMan
193e237285 tweaks 2014-04-01 10:58:20 -07:00
ZappoMan
9d757434ab testing tweak 2014-04-01 10:47:25 -07:00
ZappoMan
ce8a599b16 tweak 2014-04-01 10:38:21 -07:00
ZappoMan
64c7a6a440 testing, remove create sending thread and processing of query 2014-04-01 10:25:32 -07:00
ZappoMan
ff17c6a071 quiet some debugging 2014-04-01 10:08:46 -07:00
ZappoMan
21e0bc119b moved OctreeServer::stopTrackingThread() to destructor instead of setIsShuttingDown() 2014-04-01 09:50:10 -07:00
ZappoMan
20d944a43b removed some debug 2014-04-01 09:31:40 -07:00
ZappoMan
6ed9b968b0 removed some extra debugging 2014-04-01 09:23:19 -07:00
ZappoMan
9df315d889 removed dead debug code 2014-03-31 20:54:58 -07:00
ZappoMan
7cd39d3ef0 add forceNodeShutdown() to handle forced shutdown of nodes in case of server shutdown 2014-03-31 20:53:34 -07:00
ZappoMan
b5c538b051 added some debugging 2014-03-31 18:22:06 -07:00
ZappoMan
9d60be9773 cleanup some debugging 2014-03-31 17:57:48 -07:00
ZappoMan
ef68f164c9 tweak shutdown 2014-03-31 17:05:31 -07:00
ZappoMan
dc302e7126 tweak shutdown 2014-03-31 16:51:00 -07:00
ZappoMan
7a683b177d added some debugging, and reordered some shutdown logic 2014-03-31 16:43:25 -07:00
ZappoMan
5c37a79378 cleanup of debuggin 2014-03-31 15:42:16 -07:00
ZappoMan
b3734d870b cleanup 2014-03-31 15:39:12 -07:00
ZappoMan
1eb15b0d12 cleanup 2014-03-31 15:37:53 -07:00
ZappoMan
a9d153054f remove _process mutex since it's no longer needed 2014-03-31 15:28:13 -07:00
ZappoMan
27f42b5b86 clean up headers 2014-03-31 15:15:54 -07:00
ZappoMan
514f43c6cc revert tweaks 2014-03-31 15:10:36 -07:00
ZappoMan
a82a583030 cleanup 2014-03-31 14:59:28 -07:00
ZappoMan
6601a0d4e9 cleaning up nodeKilled() 2014-03-31 14:54:39 -07:00
ZappoMan
6df3ff57c4 cleanup isNull() usage 2014-03-31 14:30:25 -07:00
ZappoMan
226274e98b cleaning up SharedNodePointer usage 2014-03-31 14:24:08 -07:00
ZappoMan
0f9df4a8ee clean up includes 2014-03-31 14:11:47 -07:00
ZappoMan
faa062f8ab use single instance of SharedAssignmentPointer for assignment client so we actually get reference counting 2014-03-31 14:08:19 -07:00
ZappoMan
7c8295dd94 Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 2014-03-28 11:06:02 -07:00
ZappoMan
640dbaacab migration to shared pointers 2014-03-28 11:05:54 -07:00
Stephen Birarda
eb35b63651 use a shared pointer for more elegant cleanup at assignment conclusion 2014-03-28 10:48:44 -07:00
ZappoMan
8856a609a4 first cut at migrating to SharedOctreeServerPointer for ref count management of OctreeServer 2014-03-28 09:46:23 -07:00
ZappoMan
0cb9bec1aa keep SharedNodePointer in the OctreeSendThread 2014-03-27 19:29:18 -07:00
ZappoMan
c540427b9e tweaks to _processLock to reduce time it's locked 2014-03-27 15:03:46 -07:00
Stephen Birarda
0fc83d81fd Merge pull request #2555 from ZappoMan/backtotrylockanduuid 
added back use of nodeWithUUID() instead of sharedpointer
 2014-03-27 13:55:17 -07:00
ZappoMan
bda96ef935 added back use of nodeWithUUID() instead of sharedpointer 2014-03-27 13:35:22 -07:00
Stephen Birarda
21eef6c15e make sure VoxelServer and ParticleServer are in Agent interest list 2014-03-27 13:10:03 -07:00
ZappoMan
9fdfa4a7a8 switch to using SharedNodePointer instead of UUID in octree server send thread 2014-03-27 02:33:32 -07:00
AndrewMeadows
cec3f944d7 Merge pull request #2525 from ZappoMan/scaling_work 
Voxel/Particle Server Scaling Work
 2014-03-26 15:16:22 -07:00
ZappoMan
c56efb9e4c formatting tweaks 2014-03-26 13:41:49 -07:00
ZappoMan
0451ce455f added --statusHost config option to allow us to specify the host name of the status page 2014-03-26 13:25:38 -07:00
Stephen Birarda
28f962ea2b fix for AudioMixer kill and re-add and no sound load in bot 2014-03-26 13:19:20 -07:00
ZappoMan
18eda50118 added thread counts to json stats 2014-03-26 13:13:55 -07:00
ZappoMan
7a3e19eb0f Merge branch 'master' of https://github.com/worklist/hifi into scaling_work 2014-03-26 12:18:08 -07:00
ZappoMan
bc68ed1300 moved stopTrackingThread() to setIsShuttingDown() to reduce chance of object conflict 2014-03-26 11:59:55 -07:00
Stephen Birarda
962c7350f3 wait on broadcastThread before destroying AvatarMixer, closes #2499 2014-03-26 11:53:57 -07:00
ZappoMan
c3aab7337f added more performance stats tracking to octree server 2014-03-26 11:36:35 -07:00
Stephen Birarda
e2b230445f add a method to Agent for last read frame loudness 2014-03-26 10:28:59 -07:00
Stephen Birarda
34634af975 add mutex header to NodeData 2014-03-25 16:05:51 -07:00
Stephen Birarda
c8b3ae0c40 add a mutex to NodeData and leverage in AvatarMixer threads 2014-03-25 15:49:47 -07:00
Stephen Birarda
6f4f55038b add back selective inclusion of Avatars based on distance 2014-03-25 15:31:53 -07:00
Stephen Birarda
6b8c60e964 remove waitForBytesWritten for initial tests 2014-03-25 15:10:53 -07:00
Stephen Birarda
292fb51b43 use performance throttling instead of distance to decide when to send 2014-03-25 15:05:17 -07:00
Stephen Birarda
269615bc40 thread broadcast of avatar data in AvatarMixer 2014-03-25 14:02:24 -07:00
Stephen Birarda
0407c6d324 use QTimer to clock broadcastAvatarData method 2014-03-25 13:50:22 -07:00
Stephen Birarda
4e77afb4b2 block and wait for bytes to be written during broadcastAvatarData loop 2014-03-25 13:38:02 -07:00
Stephen Birarda
9d6dac6a76 suppress sleep time debug in favour of stats in AvatarMixer 2014-03-25 12:18:28 -07:00
Stephen Birarda
1fe01f3e61 increment framesSinceCutoffEvent in mixers to enable recovery 2014-03-25 12:16:07 -07:00
Stephen Birarda
ff788a340b add stat for average billboard and identity packets per frame 2014-03-25 11:38:00 -07:00
Stephen Birarda
786d9ce404 force sending of identity and billboard packets changed in last frame 2014-03-25 10:56:06 -07:00
Stephen Birarda
e6b83ac52d send mesh and billboard on receiver's first connect 2014-03-25 10:34:38 -07:00
Stephen Birarda
e8b9594758 spread out billboard and identity fallbacks 2014-03-25 09:39:43 -07:00
Stephen Birarda
ce214bc439 use the performance tuning ratio in avatar mixer to send less 2014-03-24 16:48:23 -07:00
Stephen Birarda
b01b2a3311 use explicit float casts where appropriate 2014-03-24 16:35:36 -07:00
Stephen Birarda
ba338cb7bc at minimum send packet rate stats for ThreadedAssignment subclasses 2014-03-24 16:06:25 -07:00
Stephen Birarda
3db8386743 suppress trailing sleep ratio debug 2014-03-24 15:46:02 -07:00
Stephen Birarda
e7f9acd945 add trailing sleep and performance throttling logic to AvatarMixer 2014-03-24 15:42:57 -07:00
Stephen Birarda
638e9eae48 add some basic stat collection to avatar-mixer 2014-03-24 15:38:01 -07:00
Stephen Birarda
8dbe4dfdde collect packet rate stats in NodeList 2014-03-24 15:06:53 -07:00
Stephen Birarda
40fa4bfbd2 fix octree server HTTPRequestHandler for url handling 2014-03-24 14:15:38 -07:00
Stephen Birarda
f8279c1f5b handle query params in HTTPManager, display stats table from DS 2014-03-24 14:14:26 -07:00
Stephen Birarda
1fffda674a send extra stats from audio-mixer to domain-server 2014-03-24 13:14:22 -07:00
Stephen Birarda
5f93e44ff7 abstract stats packet sending to NodeList 2014-03-24 12:33:00 -07:00
Stephen Birarda
8f403609e7 hook JSON stats sending from domain-server 2014-03-24 11:56:16 -07:00
Stephen Birarda
c0da215a60 correctly output trailing sleep time 2014-03-24 10:39:10 -07:00
Stephen Birarda
d0fbf4953a change back off strategy, output trailing sleep 2014-03-24 10:27:46 -07:00
Stephen Birarda
5567d9acb9 change audio-mixer struggle behaviour 2014-03-24 09:24:13 -07:00
ZappoMan
d63acfc46f revert 2014-03-23 18:12:02 -07:00
ZappoMan
d962387c75 revert 2014-03-23 18:11:40 -07:00
ZappoMan
9c7ffffbae fix some windows issues 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
 2014-03-23 18:10:22 -07:00
Stephen Birarda
c5b0288c12 remove numClientsMixedInFrame since it is no longer used 2014-03-21 18:49:46 -07:00
Stephen Birarda
af4fb26031 floats are important 2014-03-21 18:44:59 -07:00
Stephen Birarda
abd6c8a747 fix trailing average on ring buffer, remove unused constant 2014-03-21 18:28:12 -07:00
Stephen Birarda
88348b12d2 fix a divide by zero and output number of clients mixed in last frame 2014-03-21 18:16:47 -07:00
Stephen Birarda
42de3047ab Merge pull request #2442 from birarda/master 
change delta to 2%, don't hit 1 for cutoff
 2014-03-21 17:17:47 -07:00
Stephen Birarda
88b91b9eb7 change an int to a float 2014-03-21 17:17:11 -07:00
Stephen Birarda
8ecd9aa0c0 change audibility delta to 2%, don't hit 1.0 2014-03-21 17:16:54 -07:00
Stephen Birarda
e3b65f4949 Merge pull request #2441 from birarda/master 
linear change to audability ratio
 2014-03-21 16:48:01 -07:00
Stephen Birarda
34f9075980 use a linear change to audability ratio 2014-03-21 16:47:41 -07:00
Stephen Birarda
949aefac62 Merge pull request #2439 from birarda/master 
check for an audio cutoff change only every TRAILING_AVERAGE_FRAMES
 2014-03-21 16:21:26 -07:00
Stephen Birarda
dc2d050187 remove sleep time debug now that the audio-mixer reports struggle 2014-03-21 15:47:21 -07:00
ZappoMan
438e5bd235 fix crash on domain restart in Agent, also have Agent properly shutdown on call to Script.stop() 2014-03-21 15:46:06 -07:00
Stephen Birarda
50007d7f4b fix a debug message for audability threshold 2014-03-21 15:43:39 -07:00
Stephen Birarda
75bc640104 fix some indentation is audio mixer cutoff code 2014-03-21 15:42:58 -07:00
Stephen Birarda
4661553acb check for cutoff change only every TRAILING_AVERAGE_FRAMES 2014-03-21 15:40:08 -07:00
Stephen Birarda
4bde0e6844 Merge pull request #2436 from ZappoMan/vscrashfix 
fixes to voxel server crashes on client shutdown
 2014-03-21 15:24:45 -07:00
Stephen Birarda
c99f5a4ae6 int to float conversion in the constructor 2014-03-21 14:38:01 -07:00
Stephen Birarda
98f014d13d add another check to avoid any mixing for a silent frame 2014-03-21 14:37:31 -07:00
Stephen Birarda
3d9aa6cc9f fix a spelling mistake and convert some ints to floats 2014-03-21 14:36:44 -07:00
Stephen Birarda
18e5637976 remove some extra spaces 2014-03-21 14:33:11 -07:00
Stephen Birarda
2575b33662 reinstate a cutoff when the audio-mixer is struggling 2014-03-21 14:29:57 -07:00
ZappoMan
3cb3cb81c4 fixes to voxel server crashes on client shutdown 2014-03-21 14:15:02 -07:00
Stephen Birarda
c1cbc79807 move debug for no reply domain checkins to ThreadedAssignment 2014-03-21 10:26:09 -07:00
Stephen Birarda
0105029d9c output number of no reply domain checkins when finished 2014-03-21 10:10:25 -07:00
Stephen Birarda
24e9446814 remove mixer cutoff strategy for testing 2014-03-21 09:52:07 -07:00
Stephen Birarda
5ae63c5b0f use a trailing average for sleep time, move loudness to RB 2014-03-20 17:10:24 -07:00
Stephen Birarda
5515141792 use a trailing average for _nextOutputLoudness 2014-03-20 16:50:20 -07:00
Stephen Birarda
7f96c71793 actually require minRequiredLoudness for a stream to be mixed in 2014-03-20 16:17:09 -07:00
Philip Rosedale
a30af08062 Merge pull request #2407 from ZappoMan/voxel_server_crash_fixes 
fix voxel server crash/pure virtual call on shutdown of client
 2014-03-20 15:33:59 -07:00
ZappoMan
b4f5a6d1ce add _isShuttingDown to OctreeQueryNode and bail as fast as possible when shutting down 2014-03-20 14:44:47 -07:00
Stephen Birarda
64f946b640 require that buffers be above min loudness to be mixed in 2014-03-20 13:01:52 -07:00
Stephen Birarda
a8ef64e0ce calculate a cutoff loudness for mixer recovery 2014-03-20 12:52:17 -07:00