Commit graph

14090 commits

Author SHA1 Message Date
wangyix
b220b092f4 added SequenceNumberStats and unit test 2014-06-25 16:35:08 -07:00
wangyix
9b8f8dbf70 removed more more unnecessary changes 2014-06-25 12:05:59 -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
dd1c157f3a reverted updateDesiredJitterBufferFrames to what Brad wrote 2014-06-25 11:42:03 -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
d098edcdf0 Merge remote-tracking branch 'upstream/master' 2014-06-24 17:39:13 -07:00
AndrewMeadows
2db156d6cd Merge pull request #3072 from ZappoMan/removeOctreeTests
try to disable model tests
2014-06-24 17:35:52 -07:00
ZappoMan
bc5f563f5c and change ring buffer size 2014-06-24 17:25:45 -07:00
ZappoMan
3da18ec1c0 try to disable model tests 2014-06-24 17:23:09 -07:00
wangyix
52f00769d4 merged with upstream 2014-06-24 17:22:30 -07:00
wangyix
e1d28dfe73 removed debug code 2014-06-24 17:14:20 -07:00
wangyix
5fd1d0a87c added AudioRingBuffer unit test
fixed bug with _endOfLastWrite not rolling over in addSilentFrame
2014-06-24 16:51:51 -07:00
Stephen Birarda
7d46b8062b Merge pull request #3070 from birarda/rounding-fix
revert credit balance rounding
2014-06-24 16:25:57 -07:00
Stephen Birarda
5f4baaffa5 revert credit balance rounding 2014-06-24 16:25:41 -07:00
Brad Hefta-Gaub
6d77d438ab Merge pull request #3057 from AndrewMeadows/ragdoll
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
2014-06-24 15:47:18 -07:00
AndrewMeadows
da45e8a5f8 Merge pull request #3058 from ZappoMan/octreeTests
added some model tree performance tests
2014-06-24 14:27:29 -07:00
Brad Hefta-Gaub
c38790db72 Merge pull request #3068 from ZappoMan/serverSideAudioMixerStats
make default ring buffer much larger
2014-06-24 12:19:35 -07:00
wangyix
8e2bb130f7 added extra sample in AudioRingBuffer...
changed buffer overflow behavior to overwrite old data in writeData;
added overflow behavior to drop silent samples in addSilentFrame
2014-06-24 12:18:40 -07:00
ZappoMan
cdbda02765 make default ring buffer much larger 2014-06-24 12:09:58 -07:00
Stephen Birarda
c46453c97f Merge pull request #3067 from ZappoMan/serverSideAudioMixerStats
adding more stats & allow config setting to enable/disable dynamic jitter buffers
2014-06-24 10:49:35 -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
c2b22c0aa2 Merge remote-tracking branch 'upstream/master' 2014-06-24 09:34:07 -07:00
Brad Hefta-Gaub
2089dec38a Merge pull request #3066 from ctrlaltdavid/fix_default_audio
Fix default audio devices on Windows
2014-06-24 09:33:04 -07:00
wangyix
254946be9e removed duplicate method from merge 2014-06-24 09:27:41 -07:00
wangyix
53e3f5a3b0 merged with upstream 2014-06-24 09:13:05 -07:00
David Rowe
c40c5d78c8 Fix default audio devices on Windows
Windows 8 provides the full friendly device name, not just the first 31 characters.
2014-06-24 08:50:39 -07:00
Brad Hefta-Gaub
fc88b1f710 Merge pull request #3065 from ZappoMan/serverSideAudioMixerStats
remove resizing of jitter buffers for now, only ask for 1 frame
2014-06-23 18:54:18 -07:00
ZappoMan
fda60cc8d5 remove resizing of jitter buffers for now, only ask for 1 frame 2014-06-23 18:45:24 -07:00
Brad Hefta-Gaub
c105bc6c39 Merge pull request #3064 from ZappoMan/serverSideAudioMixerStats
max desired must be one less than the max frames in our ringbuffer
2014-06-23 18:11:37 -07:00
ZappoMan
355ab2cb95 max desired must be one less than the max frames in our ringbuffer 2014-06-23 17:58:55 -07:00
wangyix
a4f5ce2215 added stats for audiomixer jitter buffers lengths in Application 2014-06-23 17:48:57 -07:00
Brad Hefta-Gaub
51dfb33985 Merge pull request #3063 from ZappoMan/serverSideAudioMixerStats
add more stats
2014-06-23 17:32:50 -07:00
ZappoMan
6434c0a2a4 add more stats 2014-06-23 17:28:39 -07:00
Brad Hefta-Gaub
672808ef86 Merge pull request #3062 from ZappoMan/serverSideAudioMixerStats
ignore the numSilentSamples from client, always assume one frame
2014-06-23 16:56:58 -07:00
ZappoMan
77f262561c typo 2014-06-23 16:47:10 -07:00
ZappoMan
8a633743b3 ignore the numSilentSamples from client, always assume one frame 2014-06-23 16:40:38 -07:00
Brad Hefta-Gaub
e374ccb0fa Merge pull request #3061 from ZappoMan/serverSideAudioMixerStats
use node uuid in stats
2014-06-23 16:17:51 -07:00
ZappoMan
4becb66e2a use node uuid in stats 2014-06-23 16:10:51 -07:00
Brad Hefta-Gaub
13030d64e6 Merge pull request #3060 from ZappoMan/serverSideAudioMixerStats
break up audio mixer stats across multiple packets
2014-06-23 15:56:27 -07:00
ZappoMan
b2c982976e break up audio mixer stats across multiple packets 2014-06-23 15:46:58 -07:00
Stephen Birarda
5a8bbc7a0e Merge pull request #3059 from ZappoMan/serverSideAudioMixerStats
added server side audio mixer jitter stats
2014-06-23 15:29:00 -07:00
ZappoMan
076bc11545 added server side audio mixer jitter stats 2014-06-23 15:19:13 -07:00
Brad Hefta-Gaub
19195f9119 Merge pull request #3056 from birarda/master
fix rounding of credit balance in application title
2014-06-23 14:48:37 -07:00
ZappoMan
52b61ebab8 added addModel() performance test 2014-06-23 14:48:12 -07:00
ZappoMan
48e779cf8e added some performance tests 2014-06-23 14:08:47 -07:00
Andrew Meadows
d892a9c00f fixed warning about possible uninitialized variable. 2014-06-23 14:07:31 -07:00