AndrewMeadows
361ec5d1ee
Merge pull request #3204 from Barnold1953/jsBlendShapes
...
Exposed Avatar Blendshape control to JS
2014-07-25 09:40:48 -07:00
barnold1953
d5ea2de4ea
Merge branch 'master' of https://github.com/highfidelity/hifi into jsBlendShapes
2014-07-24 11:32:31 -07:00
barnold1953
aba031a125
Proper blendshape JS api.
2014-07-23 16:25:45 -07:00
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
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
ZappoMan
7bbbde8957
add useDynamicJitterBuffers to the audio mixer stats page
2014-07-21 22:18:03 -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