barnold1953
6aa9e6b736
Revert "Ability to modify AC avatar blendshapes from JS"
...
This reverts commit 512034fd7c
.
2014-07-23 15:54:40 -07:00
wangyix
a36c9e872e
merged with upstream
2014-07-23 15:36:37 -07:00
barnold1953
512034fd7c
Ability to modify AC avatar blendshapes from JS
2014-07-23 15:23:27 -07:00
Atlante45
63f0210f1e
Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar
2014-07-23 14:01:03 -07:00
Atlante45
95c98203a9
Replaced the Avatar in Agent by a scriptable avatar.
2014-07-23 14:00:49 -07:00
Atlante45
4b867de864
Created ScriptableAvatar class
2014-07-23 14:00:13 -07:00
wangyix
5eaa57b3ad
removed more warnings about unused vars
2014-07-23 12:10:25 -07:00
wangyix
4a4d065f00
another parseData change
2014-07-23 12:06:31 -07:00
wangyix
849c489b4c
removed warnings about parseData() overloading in ringbuffer classes
2014-07-23 11:20:30 -07:00
Andrzej Kapolka
c31dd4df5f
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-22 14:46:43 -07:00
ZappoMan
7bbbde8957
add useDynamicJitterBuffers to the audio mixer stats page
2014-07-21 22:18:03 -07:00
Andrzej Kapolka
3ea7e79622
Working on distributing metavoxel session handling over multiple threads.
2014-07-21 20:03:50 -07:00
Andrzej Kapolka
0ddd3e650c
More point bits (trying a different tack).
2014-07-21 19:00:13 -07:00
Brad Hefta-Gaub
437e3efbc2
Merge pull request #3179 from wangyix/quick_audio_PR
...
Lost audio packets are replaced with silent frames in AudioMixer; AudioMixer silent-packet-dropping now enabled no matter what; Moving avg of audio frames available replaces _currentJitterBufferFrames
2014-07-17 11:44:05 -07:00
wangyix
cd8d52c6f8
case statement style fix
2014-07-17 09:24:54 -07:00
wangyix
8775d22765
re-added calculated desired frames to domain page stats
2014-07-16 17:44:49 -07:00
wangyix
397e6c8b13
renamed a function
2014-07-16 17:34:48 -07:00
wangyix
6764ace8eb
droppable silent packets are added for dropped packets;
...
_currentJitterBufferFrames replaced with moving average of frames
available. Downstream framesAvailable stat now includes the frames in
QAudioOutput as well as the ringbuffer.
2014-07-16 14:41:24 -07:00
Andrzej Kapolka
3be00b972d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-15 18:11:54 -07:00
wangyix
abca4661f4
removed space
2014-07-15 14:48:26 -07:00
wangyix
d5a30ff6ee
removed SIMD stuff from AudioMixer for all builds
2014-07-15 14:43:08 -07:00
wangyix
a1b2bf59e9
disabled SIMD adds in AudioMixer for windows
2014-07-15 12:23:02 -07:00
Andrzej Kapolka
60e8c12d4b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-15 09:25:36 -07:00
wangyix
1047ec7c87
merge with upstream
2014-07-14 16:25:26 -07:00
wangyix
a37e24aeb4
updated domain page stats to use formated usec time strings
2014-07-14 11:08:00 -07:00
wangyix
a59cef3197
removed debug code in AudioMixer
2014-07-14 10:05:37 -07:00
wangyix
82e9aa8bb7
made stats easier to read; reverted injected stream deletion conditions
2014-07-11 16:08:15 -07:00
Andrzej Kapolka
38623e108a
Delete persister when its thread finishes, copy metavoxel nodes on subdivision
...
so that we'll know that they changed.
2014-07-11 15:37:59 -07:00
wangyix
90c931ea45
removed Audio.cpp initialization list warning; updated Injector removal conditions
2014-07-11 15:07:50 -07:00
wangyix
d369435240
added dirty fix for NaN _nextOutputTrailingLoudness
2014-07-11 13:25:47 -07:00
Andrzej Kapolka
21a1f4772c
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-11 12:42:25 -07:00
Andrzej Kapolka
af3af15084
Comment, formatting fix.
2014-07-10 18:11:51 -07:00
wangyix
69005242b9
forgot to multiply rates by 100% for domain stats page
2014-07-10 17:18:54 -07:00
wangyix
ae1d91b21d
improved domain page stats string a bit
2014-07-10 17:11:15 -07:00
wangyix
6c85caaa54
updated Stats for new AudioStreamStats format
2014-07-10 17:03:53 -07:00
wangyix
25f4f63a1e
added window PacketStreamStats to AudioStreamStats
2014-07-10 16:42:23 -07:00
wangyix
b4c9e51011
Audio now periodically sends downstream audio stats to audiomixer
2014-07-10 14:14:29 -07:00
wangyix
35419eb939
Merge remote-tracking branch 'upstream/master' into quick_audio_PR
2014-07-10 11:56:35 -07:00
wangyix
0b213f9616
streamlined AudioStreamStats packing; added #include <limits>
2014-07-10 10:44:33 -07:00
wangyix
0d83b9a6f6
tidied up code
2014-07-10 09:51:01 -07:00
wangyix
01f10024ae
all stats added, needs testing; created PacketStreamStats struct
2014-07-09 18:13:33 -07:00
Andrzej Kapolka
3b7945fc14
Gather and print out some stats after loading the data.
2014-07-09 15:52:23 -07:00
Andrzej Kapolka
efe443e2ff
Very basic metavoxel save/load.
2014-07-09 14:01:46 -07:00
wangyix
d03d3ef817
new auidostreamstats displayed in interface, domain page stats updated
2014-07-09 11:59:50 -07:00
Andrzej Kapolka
2dbe72a818
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-08 16:49:14 -07:00
Andrzej Kapolka
b6570dc4ee
Use congestion control on server.
2014-07-08 15:10:05 -07:00
Andrzej Kapolka
5636171836
Timing fix.
2014-07-08 14:41:16 -07:00
Andrzej Kapolka
02cf1f006e
Change tests to reflect transmission changes and fixed issue with reprocessing
...
already-handled reliable delta.
2014-07-08 13:41:42 -07:00
wangyix
2e73ac8bc1
changed Audio.cpp to not overflow _audioOutput buffer, and 2 other things
...
added _consecutiveNotMixedCount to prevent premature injector stream
deletion; made silent-frame drop only occur in dynamic jitter buffer
mode
2014-07-08 11:16:39 -07:00
Andrzej Kapolka
6bf4182804
Fix for send timer.
2014-07-07 16:25:13 -07:00
Andrzej Kapolka
69e7a17f47
Rather than backing out when we find that the delta is too big, we can just
...
write the whole thing and copy it over (with some mapping fiddlery) if it
turns out to be too big.
2014-07-07 16:07:04 -07:00
Andrzej Kapolka
44befbb019
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-07 12:21:56 -07:00
Atlante45
a225df63f6
Removed deprecated moveToThread()
2014-07-07 11:40:03 -07:00
Andrzej Kapolka
fb64d22171
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-07 11:09:17 -07:00
Andrzej Kapolka
e15f003639
Bring reliable delta streaming code over from test.
2014-07-07 11:08:43 -07:00
Atlante45
b0e83c32ff
Hopeful fix to ACs crash
2014-07-03 18:17:01 -07:00
Stephen Birarda
ecbd62104c
cause sounds within an epsilon distance to be unattenuated
2014-07-03 16:43:12 -07:00
Stephen Birarda
7ff0648d8a
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-03 16:32:46 -07:00
Stephen Birarda
438e0b501b
fix the voices inside your head
2014-07-03 16:32:38 -07:00
Atlante45
8e1b8334a1
Fixed invokeMethod unable to find method + fixed children in different thread
2014-07-03 14:46:17 -07:00
Stephen Birarda
04e7df1a3f
change the audio rolloff function
2014-07-03 13:46:38 -07:00
Stephen Birarda
c0d0ca5066
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-rolloff
2014-07-03 13:37:06 -07:00
Brad Hefta-Gaub
dbdce32b68
Merge pull request #3107 from wangyix/master
...
prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;
2014-07-03 13:32:31 -07:00
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