Commit graph

383 commits

Author SHA1 Message Date
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
Stephen Birarda
fb73b6e1ce collect min and max loudness for each frame 2014-03-19 17:57:01 -07:00
Philip Rosedale
22048aaba5 Merge pull request #2392 from birarda/audio-scaling
allow Agents to send microphone audio using Sound objects
2014-03-19 17:00:46 -07:00
Philip Rosedale
e14069c9e3 Merge pull request #2376 from ZappoMan/experimental_scaling
Voxel Server Performance Improvements
2014-03-19 16:24:47 -07:00
Stephen Birarda
8c4fad443f allow Agents to microphone audio from Sound objects 2014-03-19 16:14:58 -07:00
ZappoMan
cd6e0f1698 switch to deleteLater to prevent deadlock 2014-03-19 01:02:49 -07:00
ZappoMan
b3f60a068d remove isScheduledForDelete from OctreeQueryNode 2014-03-19 00:17:14 -07:00
ZappoMan
450a9c03a7 revert changes 2014-03-18 23:54:23 -07:00
ZappoMan
499c4bd500 fix octree server crashes on various shutdown corner cases 2014-03-18 17:44:53 -07:00
ZappoMan
220232312d remove unused variables 2014-03-18 16:06:20 -07:00
Andrzej Kapolka
500f9d1485 Merge pull request #2338 from AndrewMeadows/cleanup
Don't send redundant avatar hand/head data, and cleanup.
2014-03-18 13:57:30 -07:00
Stephen Birarda
b6a41eeaaa resolve conflicts on merge with upstream master 2014-03-18 10:37:04 -07:00
Andrew Meadows
de67a828cc Merge upstream/master into cleanup project 2014-03-18 09:41:41 -07:00
Andrew Meadows
272cb879f8 change wording of comment 2014-03-18 09:38:49 -07:00
ZappoMan
dfb07e717d removed old debugging code 2014-03-18 09:34:24 -07:00
ZappoMan
86c2b5baa7 removed some debugging, added some comments, more work on optimizaiton 2014-03-18 01:51:30 -07:00
ZappoMan
329d3b37e0 add last know root timestamp property to query node 2014-03-18 01:07:45 -07:00
ZappoMan
beffb6deae clean up stats 2014-03-18 01:04:52 -07:00
ZappoMan
34b2ccb9d7 adding not sent to stats 2014-03-18 00:02:47 -07:00
ZappoMan
fc50cc0604 improving server stats 2014-03-17 23:40:07 -07:00
Stephen Birarda
1fc9ac1815 make the client mix buffer only as large as it needs to be 2014-03-17 17:55:47 -07:00
Stephen Birarda
f3910f8c1a scope clientMixBuffer only to AudioMixer run 2014-03-17 17:54:27 -07:00
ZappoMan
62dabd9c1c formatting of stats 2014-03-17 17:49:50 -07:00
Philip Rosedale
a7f0e41232 Merge pull request #2342 from birarda/master
switch data for mix samples in AudioMixer
2014-03-17 17:30:14 -07:00
Stephen Birarda
07a71d8796 use char instead of QByteArray for mix samples in AudioMixer 2014-03-17 17:22:16 -07:00
Stephen Birarda
447f23a1c9 repair _clientSamples copying into _clientMix 2014-03-17 16:56:29 -07:00
Stephen Birarda
d652cec766 some potential fixes to QByteArray crash 2014-03-17 16:30:58 -07:00
Stephen Birarda
61594b9a1e fixes to silent audio frame sending 2014-03-17 16:27:49 -07:00
ZappoMan
e9684c0ee5 added more stats to octree server stats page 2014-03-17 16:11:00 -07:00
Andrew Meadows
679d09610c Merge upstream/master into "no hands" project. 2014-03-17 14:59:14 -07:00
Stephen Birarda
c7e12824a8 clarify check for audio loudness in AudioMixer 2014-03-17 14:35:26 -07:00
Stephen Birarda
bc9deb5db7 handle trivial case of not mixing silent audio streams 2014-03-17 14:29:53 -07:00
Andrew Meadows
ed3cf36045 cleanup: AvatarData doesn't derive from NodeData
Cleaner Interface since the AvatarData is already not the NodeList.
Reduces overhead/confusing code when parsing packets from AvatarMixer.
2014-03-17 14:10:42 -07:00
ZappoMan
07adfed6b4 call setLastHeardFromMicrostamp() when we get packets from nodes so NodeList doesn't drop them 2014-03-17 13:47:05 -07:00