Commit graph

176 commits

Author SHA1 Message Date
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
Atlante45
fd20686f0f Removed Systime.h includes 2014-04-21 17:23:06 -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
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
e1cae6d295 initial handshaking for DTLS sessions between DS and clients 2014-04-02 17:29:14 -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
1fe01f3e61 increment framesSinceCutoffEvent in mixers to enable recovery 2014-03-25 12:16:07 -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
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
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
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
34f9075980 use a linear change to audability ratio 2014-03-21 16:47:41 -07:00
Stephen Birarda
dc2d050187 remove sleep time debug now that the audio-mixer reports struggle 2014-03-21 15:47:21 -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
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
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
7f96c71793 actually require minRequiredLoudness for a stream to be mixed in 2014-03-20 16:17:09 -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
Stephen Birarda
b6a41eeaaa resolve conflicts on merge with upstream master 2014-03-18 10:37:04 -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
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
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
Stephen Birarda
288272f051 fix a reversed MMX add 2014-03-17 11:26:35 -07:00
Brad Hefta-Gaub
927006df91 Merge pull request #2331 from birarda/audio-scaling
AudioMixer optimizations with MMX intrinsics
2014-03-17 11:02:44 -07:00
Stephen Birarda
cc1d309c15 some really trivial magic number replacements 2014-03-17 10:13:29 -07:00
Stephen Birarda
05d6522279 more MMX optimizations to AudioMixer for delayed samples 2014-03-17 10:02:00 -07:00
ZappoMan
adb6ffe7c4 more warnings fixes 2014-03-15 22:00:44 -07:00
Stephen Birarda
72449fdb6a initial optimizations to AudioMixer with mmx additions 2014-03-14 17:50:57 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Stephen Birarda
a24366fcd7 populate packet header only once session UUID is received 2014-02-25 11:16:19 -08:00
Stephen Birarda
cfec1e583e fix logging target-name extra characters 2014-02-20 12:02:23 -08:00
Stephen Birarda
a5636d2dc0 make ThreadedAssignment subclasses handle QUdpSocket readyRead, closes #1895 2014-02-07 12:25:43 -08:00
Stephen Birarda
d39cccde77 add a method to find a node and upate based on packet 2014-02-07 10:32:16 -08:00
Stephen Birarda
fa1825fa32 repairs to ping-reply, removal of deconstructPacketHeader to simply return UUID 2014-02-07 10:20:50 -08:00
Stephen Birarda
a823722d27 add writeDatagram helper to NodeList to insert md5 hash 2014-02-06 14:28:58 -08:00
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
Stephen Birarda
e9e2557576 change node types of interest to a QSet 2014-01-22 14:47:04 -08:00
Brad Hefta-Gaub
952365a1b7 clean up comments and tab spacing 2014-01-15 12:50:36 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
2014-01-15 10:20:21 -08:00
Stephen Birarda
599e3bb9e5 resolve conflicts on merge with upstream master 2014-01-14 16:15:58 -08:00
Stephen Birarda
8676ac38f9 foreach spacing and reference repairs 2014-01-14 15:54:09 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Stephen Birarda
9efb391ecf repair crazy references to node ponter from old iterator style 2014-01-14 10:50:06 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
9afe6eaa25 more windows build fixes 2014-01-11 00:56:48 -08:00
Brad Hefta-Gaub
825c1c8876 fix windows warnings 2014-01-11 00:07:35 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Stephen Birarda
80a2bd0844 move _shouldLoopbackForNode to PositionalAudioRingBuffer for access in injector 2013-12-19 15:44:04 -08:00
Stephen Birarda
bdf8c4b9b2 implement threaded send for AudioInjector 2013-12-19 15:17:03 -08:00
Stephen Birarda
bbe525412f fix pulling of delayed samples in audio mixer 2013-12-17 11:22:34 -08:00
Stephen Birarda
6b644eb130 repair upsampling and local loopback by correcting for limits 2013-12-16 15:15:25 -08:00
Stephen Birarda
0970ed55a8 re-instate positional audio in the audio-mixer 2013-12-16 12:36:55 -08:00
Stephen Birarda
1f9ca00317 drive input from buffer callback and output from network 2013-12-16 11:58:23 -08:00
Stephen Birarda
f17ee1af7a cleanup AudioRingBuffer API 2013-12-12 13:37:18 -08:00
Stephen Birarda
6fab49b1b7 change ring buffer to interleaved for stereo 2013-12-11 12:02:22 -08:00
Stephen Birarda
5ae30bc1a0 cast integer sample rate so BUFFER_SEND_INTERVAL is correct 2013-12-05 13:12:49 -08:00
Stephen Birarda
969f782a9b simplify index access of QByteArray in processDatagram 2013-12-03 12:29:31 -08:00
Stephen Birarda
606eaa579a switch node pinging to QTimer in QCoreApplication instance 2013-12-03 10:57:31 -08:00
Stephen Birarda
c3b6a7b24c setup subclass for threaded assignments 2013-12-03 10:22:13 -08:00
Stephen Birarda
6ce8c12cb7 remove timing debug for DS check in 2013-12-03 10:09:38 -08:00
Stephen Birarda
6d162ff7a7 process any new events at beginning of Assignment while loop 2013-12-03 10:07:40 -08:00
Stephen Birarda
02732e9a2e cleanup memory leaks and timing on assignment threading 2013-12-03 10:03:56 -08:00