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
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
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
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
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
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
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
wangyix
435b5094a0
moved time gap history to PositionalAudioRingBuffer, untested
...
removed hard-coded jitter buffer length.
2014-06-19 17:58:38 -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
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
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
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
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
wangyix
8312e1642d
replaced takeFirst() with dequeue() for consistency
2014-06-09 15:15:43 -07:00
wangyix
e45f2fed4b
changed writelock to readlock
...
plus a coding standard fix
2014-06-09 13:42:45 -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
