Commit graph

4129 commits

Author SHA1 Message Date
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
d098edcdf0 Merge remote-tracking branch 'upstream/master' 2014-06-24 17:39:13 -07:00
ZappoMan
bc5f563f5c and change ring buffer size 2014-06-24 17:25:45 -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
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
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
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
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
ZappoMan
fda60cc8d5 remove resizing of jitter buffers for now, only ask for 1 frame 2014-06-23 18:45:24 -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
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
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
Andrew Meadows
d892a9c00f fixed warning about possible uninitialized variable. 2014-06-23 14:07:31 -07:00
Andrew Meadows
df740dd82a Fix bad static const inside class. 2014-06-23 14:07:09 -07:00
Andrew Meadows
e2204ab78e friend foo --> friend class foo 2014-06-23 13:59:44 -07:00
Brad Hefta-Gaub
18cd794542 Merge pull request #3055 from wangyix/master
Audio jitter buffer resizes depending on max inter-frame time gaps of incoming audio packets
2014-06-23 12:45:04 -07:00
Andrew Meadows
3e0673418f more complete physics iteration for stability 2014-06-23 12:32:23 -07:00
wangyix
fbdca59d37 fixed spacing issue 2014-06-23 11:56:14 -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
Andrew Meadows
5e4d757e4e merge upstream/master into andrew/ragdoll 2014-06-23 10:43:40 -07:00
Andrew Meadows
b50bf09c93 findPlaneCollisions() works in theory, not used 2014-06-23 10:39:50 -07:00
Andrew Meadows
8986be5f1c remove old collideAgaintsOurself() code 2014-06-23 10:36:31 -07:00
wangyix
7196814ec3 added debug prints to look at injected ring buffers 2014-06-23 10:22:16 -07:00
Andrew Meadows
c1c2df5933 remove debug include 2014-06-23 08:53:58 -07:00
Andrew Meadows
b2ea8c0bf9 Compute more correct masses for ragdoll parts
also pin root ragdoll shape at the local-frame origin
for stability
2014-06-23 08:37:11 -07:00
Andrew Meadows
ea83a97b75 Add getVolume() method to Shape 2014-06-23 08:36:45 -07:00
Andrzej Kapolka
49f1d427ec Removed incremental streaming stubs. 2014-06-20 18:12:08 -07:00
Andrzej Kapolka
de0c45a919 Spanner mutation in test. 2014-06-20 18:09:51 -07:00
wangyix
6b72b161d3 fixed typo with frames/samples confusion. 2014-06-20 17:52:46 -07:00
wangyix
124fba35db fixed minor comment typo 2014-06-20 17:39:05 -07:00
wangyix
cb6681f6f8 completed code for dynamicly resizing jitter buffer 2014-06-20 17:13:42 -07:00
Andrew Meadows
dcd9d8871d re-enabling some temporary debug stuff 2014-06-20 16:36:44 -07:00
Andrew Meadows
c17b8fdb60 collisions update shapes
VerletShapes keep pointers to VerletPoints (rather than to glm::vec3's)
VerletShapes compute lagrangian coefficients
VerletShapes send their movement accumulations to their VerletPoints
2014-06-20 16:31:39 -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
Andrzej Kapolka
ce778f47b1 More work on stream testing, fixed bug with differently-ordered edits. 2014-06-20 14:08:39 -07:00
Andrew Meadows
c7ad3da47d stubbery for processing collisions
PhysicsSimulation tells CollisionInfos to apply() themselves
CollisionInfo knows how to apply() itself to affected shapes
Shape gets _mass and some stubbed methods for accumulating movement
VerletPoint gets movement accumulator
2014-06-20 10:55:57 -07:00
Andrzej Kapolka
24f535e02d Working on metavoxel streaming tests. 2014-06-19 18:15:17 -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
Andrew Meadows
4a0ce7a9ae support disabling collisions btw adjacent joints 2014-06-19 17:39:50 -07:00
wangyix
100bc022ec fixed a for loop that erased elements while iterating 2014-06-19 16:42:51 -07:00