Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 21:02:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21314 commits 71 branches 56 tags 1.2 GiB
Commit graph

1120 commits

Author SHA1 Message Date
Ryan Huffman
444a974bd6 Merge branch 'master' of github.com:highfidelity/hifi into fix-wm-close 
Conflicts:
	assignment-client/src/AssignmentClient.cpp
 2014-08-28 06:52:16 -07:00
Craig Hansen-Sturm
0881959750 left/right channels of head shadow filter now have independent gain + implemented all-pass filter 2014-08-27 17:30:11 -07:00
Craig Hansen-Sturm
40a5ff6b9e ZappoMan deadcode analysis applied 2014-08-27 10:56:44 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
Craig Hansen-Sturm
47bc183439 SQUARE_ROOT_OF_TWO renamed SQUARE_ROOT_OF_TWO_OVER_TWO 2014-08-26 11:32:05 -07:00
Craig Hansen-Sturm
5f695664a6 add explicit constants inline for documebntation purposes 2014-08-26 11:26:39 -07:00
Craig Hansen-Sturm
950862839e added high-shelf and low-shelf filters, positional audio now uses high-shelf filter, significant reformatting/renaming of AudioFilter.h for coding standard 2014-08-25 18:17:32 -07:00
Craig Hansen-Sturm
4f346bfe62 addresses more coding-standard spacing issues 2014-08-25 13:07:52 -07:00
Craig Hansen-Sturm
bf6d34b6f3 windows/linux build break + addresses zappoman review comments 2014-08-25 11:43:49 -07:00
ZappoMan
58759d344f cleanup in prep for PR 2014-08-25 10:56:43 -07:00
Craig Hansen-Sturm
4cd1f4afef add support for head-shadow/penumbra filter for positional audio streams 2014-08-24 22:17:07 -07:00
Ryan Huffman
4c485a26ed Merge branch 'fix-wm-close' of github.com:huffman/hifi into fix-wm-close 2014-08-22 15:10:23 -07:00
Ryan Huffman
fa7b2a87bf Add WM_CLOSE support to domain server 2014-08-22 15:09:55 -07:00
Ryan Huffman
b75c3a4976 Disable stdout/err buffering on Windows for assignment client and domain server 2014-08-22 15:08:57 -07:00
ZappoMan
75bb42fb73 debug cleanup 2014-08-22 10:54:00 -07:00
Ryan Huffman
cd46a55369 Fix QAbstractNativeEventFilter include 2014-08-22 09:33:13 -07:00
Ryan Huffman
bc28bfa464 Add guards around custom windows message handling 2014-08-21 17:41:17 -07:00
Ryan Huffman
ad4956b2e2 Update assignment client to close on WM_CLOSE message on Windows 2014-08-21 17:19:39 -07:00
ZappoMan
32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
 2014-08-18 15:16:35 -07:00
ZappoMan
49cf6dff3a more DIDNT_FIT logic improvements/fixes 2014-08-18 14:09:01 -07:00
ZappoMan
a3bb8b1239 have partial elements set a stop reason of DIDNT_FIT to fix partial encoding issues 2014-08-18 09:37:07 -07:00
ZappoMan
f8f0da189f more work on more entities in a cell 2014-08-15 17:13:59 -07:00
ZappoMan
84ba810dc4 work on reseved bytes in octree packet data 2014-08-15 11:26:55 -07:00
Stephen Birarda
2e6350832c perfom packet verification on same thread as NodeList hash 2014-08-15 09:35:03 -07:00
Stephen Birarda
1e65a093f2 decouple audio-mixer packet receipt from main thread 2014-08-14 12:37:57 -07:00
ZappoMan
b91b81306c quiet more debug 2014-08-14 11:46:35 -07:00
ZappoMan
fbe409a0c2 added lots of debugging for octree edit packet sender bug fixed threading issue 2014-08-14 11:23:56 -07:00
wangyix
e50bd1bed9 separated readpendingdatagrams domain page stats 2014-08-13 17:57:04 -07:00
wangyix
047c4dff65 removed unused var 2014-08-13 17:05:53 -07:00
wangyix
81fa5ed41f readPendingDatagrams stats printed and sent to domain page 
jittertester now prints out send or receive error msgs
 2014-08-13 16:48:06 -07:00
ZappoMan
49e616dd49 first cut at using erase entity message to delete entities 2014-08-13 14:11:56 -07:00
wangyix
b17c9102c9 added stats for readPendingDatagrams in audiomixer 2014-08-13 13:30:02 -07:00
wangyix
db0fbcab97 merge with upstream 2014-08-13 11:09:55 -07:00
wangyix
a405cd9a72 repetition-with-fade ready for commit 2014-08-13 11:01:15 -07:00
wangyix
746893cc94 updateLastOutputLoudnessAndTrailingLoudness 2014-08-13 10:48:47 -07:00
wangyix
ddc8bec1ec moved lastpopframeloudness calculation to checkBuffersBeforeFrameSend 2014-08-13 10:41:25 -07:00
wangyix
f34f0a719b fixed lastPopOutput null ptr errors for frame loudness check 2014-08-13 10:26:01 -07:00
wangyix
23b3d06260 forgot null check for AudioMixer repeat mix of lastPopOutput 2014-08-13 09:46:49 -07:00
wangyix
0007104b6a stats working 2014-08-12 12:58:30 -07:00
wangyix
446c888242 AudioMixer print added; untested 2014-08-12 12:22:32 -07:00
wangyix
8565e93ba4 more test code (10% drop both directions) 2014-08-12 10:50:34 -07:00
wangyix
a31d53544b repetition-with-fade seems good; continue testing 2014-08-11 17:58:01 -07:00
wangyix
e276d15ed4 repetition-with-fade implemented; testing interface crash 2014-08-11 16:25:43 -07:00
wangyix
1f011bfe9d repetition-with-fade option added, not implemented 2014-08-11 11:22:37 -07:00
ZappoMan
027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
 2014-08-08 14:26:56 -07:00
wangyix
0dfe0b1f2a merged with master 2014-08-08 13:32:27 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62 add macro to link shared dependencies to target 2014-08-08 13:17:54 -07:00
Stephen Birarda
1f0a722d0d remove antequated windows libraries that have been replaced by Qt usage 2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00
Stephen Birarda
1a71d655b9 more cmake cleanup to remove ROOT_DIR passing 2014-08-08 13:17:53 -07:00
Stephen Birarda
87cf262b9e get to successful cmake after library link macro changes 2014-08-08 13:17:53 -07:00
Stephen Birarda
107cbc3f87 more simplification of hifi macros to find libraries 2014-08-08 13:17:53 -07:00
Stephen Birarda
31488e72fe repairs for interface build to succeed 2014-08-08 13:17:53 -07:00
Stephen Birarda
0378fb3049 break glm helpers out of SharedUtil 2014-08-08 13:17:53 -07:00
Stephen Birarda
892e30c5e1 get past assignment-client build after cmake auditing 2014-08-08 13:17:53 -07:00
Stephen Birarda
fa26957b23 more CMakeLists cleanup for sub-dependencies 2014-08-08 13:17:52 -07:00
Stephen Birarda
33e5826842 remove animation server, bubble up qt modules 2014-08-08 13:17:52 -07:00
wangyix
fd3425dfd1 knobs confirmed working 2014-08-07 17:05:23 -07:00
ZappoMan
6f479a1026 convert IDs to UUIDs 2014-08-07 17:02:11 -07:00
wangyix
1153a76ab1 new option knobs added, no new behavior yet 2014-08-07 16:37:36 -07:00
wangyix
357ba92181 working towards more dials for InboundAdioStream 2014-08-07 12:41:09 -07:00
wangyix
4d7d6f1e25 changed downstream re-sampling to occur right after parsing packet 2014-08-04 16:23:17 -07:00
ZappoMan
3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
 2014-08-04 12:01:23 -07:00
Stephen Birarda
e1ba076a71 complete redemption of signed transactions from octree server 2014-07-31 11:03:12 -07:00
ZappoMan
77e1867b11 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	assignment-client/src/Agent.h
	examples/editModels.js
	interface/src/Application.h
 2014-07-31 10:34:23 -07:00
Stephen Birarda
453c37f4b9 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-31 10:05:40 -07:00
Stephen Birarda
eadae8ed1a allow unauthenticated redemptions of signed transactions from octree server 2014-07-31 10:05:26 -07:00
Brad Hefta-Gaub
d4d4069f11 Merge pull request #3225 from birarda/master 
cmake file cleanup to suppress warnings on cmake 3.0
 2014-07-30 19:20:18 -07:00
Brad Hefta-Gaub
d6e6cfd585 Merge pull request #3216 from wangyix/inbound_audio_stream 
Audio ringbuffer classes refactored into subclasses of InboundAudioStream
 2014-07-30 18:00:17 -07:00
wangyix
8d6896a1da forgot an arg in Agent.cpp 2014-07-30 17:26:58 -07:00
wangyix
7281eca5a4 fixed inj crash; added statcDesired to MixedAudioStream 2014-07-30 17:20:05 -07:00
Stephen Birarda
04effabe48 Merge branch 'master' into domain-server-auth 2014-07-30 17:14:03 -07:00
wangyix
daeb2a898d added staticDesiredJitterBufferFrames feature; AudioMixer crashing 
moved some callbacks from Application::updateAvatar() to
Application::update()
 2014-07-30 15:35:40 -07:00
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
wangyix
ecfd5c2757 default max frames over desired changed to 10 2014-07-29 17:37:59 -07:00
wangyix
d49970d010 maxFramesOverDesired added; settable from domain page and preferences 2014-07-29 15:57:32 -07:00
wangyix
71c23eac1e added TimeWeightedAvg to InboundAudioStream 
_maxFramesOverDesired hardcoded right now
 2014-07-29 13:51:46 -07:00
ZappoMan
230c2f2684 cleanup storage of entity ids on the server, added improved checks for server vs client 2014-07-29 12:52:46 -07:00
Stephen Birarda
85b8449e83 use two different signals for settings success and failure 2014-07-29 11:17:27 -07:00
Stephen Birarda
9a7267a10c remove an unecessary reference to loop 2014-07-29 10:52:14 -07:00
Stephen Birarda
133e8570a3 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-29 10:50:36 -07:00
wangyix
c709a103ad minor comment change 2014-07-29 10:42:30 -07:00
wangyix
ccedb1bd20 forgot some code in checkBuffersBeforeFrameSend 
corrected updateLastPopOutputTrailingLoudness behavior to match what the
old code did.
 2014-07-29 10:40:01 -07:00
wangyix
a3b44a6a73 downstream silent packets seem to be working 2014-07-29 10:08:55 -07:00
Philip Rosedale
1ba8922f0b Merge pull request #3218 from ey6es/metavoxels 
Various metavoxel improvements relating to threading and VBO-based rendering.
 2014-07-29 09:59:55 -07:00
wangyix
4825457f4d silent audio packet type generalized 2014-07-28 16:49:53 -07:00
Andrzej Kapolka
3ac4bb6ddd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-28 16:24:43 -07:00
Stephen Birarda
84b86c17b7 use common settings retreival code to block before run in AudioMixer 2014-07-28 15:16:59 -07:00
ZappoMan
805a88b73b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/editModels.js
	interface/src/entities/EntityTreeRenderer.h
	libraries/models/src/ModelsScriptingInterface.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-28 13:39:35 -07:00
wangyix
6fc5c74c0b renamed ringbuffer variables to audiostream 2014-07-28 13:08:53 -07:00
wangyix
32dbc6cbdb renamed audioringbuffer classes to audiostream 2014-07-28 11:52:05 -07:00
wangyix
9bbd055404 added stdev method of jitter calc to InboundAudioStream 2014-07-28 11:41:08 -07:00
Atlante45
844e5d7e47 Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-07-28 10:11:39 -07:00
wangyix
45b4777e60 cleaned up QHash iterator code again 2014-07-28 09:47:40 -07:00
wangyix
c129db16cb formatting fix, AudioRingBuffer no longer NodeData, 2014-07-28 09:40:44 -07:00
wangyix
e6f913edb1 dead injected streams are now periodically removed in AudioMixer 2014-07-25 16:32:08 -07:00
wangyix
e17556384d added code to clear agent audiostream frames to prevent buildup 2014-07-25 15:51:34 -07:00
wangyix
fd9d7baa06 updated Agent with audiostream; added initial packets discard to audiostream 2014-07-25 15:14:10 -07:00
wangyix
f7e043f52d cleaned up code 2014-07-25 14:52:39 -07:00
wangyix
a9d26b3934 fixed repeat-popping in audiomixer 2014-07-25 12:58:10 -07:00
wangyix
822ba4da48 cleaned up code more, dancer.js audio not working 2014-07-25 10:21:38 -07:00
wangyix
059007c99c cleaned up code (removed old code that was commented out) 2014-07-25 09:43:08 -07:00
AndrewMeadows
361ec5d1ee Merge pull request #3204 from Barnold1953/jsBlendShapes 
Exposed Avatar Blendshape control to JS
 2014-07-25 09:40:48 -07:00
wangyix
473cbf2afe client audio now updated with stream class; seems fine for now 2014-07-24 17:15:46 -07:00
wangyix
21402e3ff1 cleaned up some stuff 2014-07-24 14:50:13 -07:00
wangyix
83ba4b9a1c Audiomixer now working (added call to updateNextOutputTrailingLoudness()) 2014-07-24 14:43:29 -07:00
wangyix
3d22a11e28 debugging new audio stream organization 2014-07-24 13:58:15 -07:00
Atlante45
cde025c8ad Remove unnecessary arguments 2014-07-24 13:47:56 -07:00
wangyix
172cd91f27 removed unused seq variable 2014-07-24 11:58:07 -07:00
wangyix
da3339fc39 minor const change to qhash iterator 2014-07-24 11:57:00 -07:00
barnold1953
d5ea2de4ea Merge branch 'master' of https://github.com/highfidelity/hifi into jsBlendShapes 2014-07-24 11:32:31 -07:00
wangyix
c9b6879ca8 audiomixer code complete; need to test 2014-07-24 10:48:27 -07:00
Andrzej Kapolka
27f88e9f80 Progress on threading. 2014-07-23 18:20:00 -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
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
ZappoMan
0c7afc39ca refactoring EntityItemID management and id assignment to be part of EntityItemID class instead of EntityItem class 2014-07-17 10:24:32 -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
ZappoMan
1eb472c43a Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-15 10:05:06 -07:00
ZappoMan
2baac96665 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/sit.js
	interface/src/Application.cpp
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
 2014-07-15 10:04:40 -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
ZappoMan
780532bfd8 more model to entity renaming, adding AABox:clamp() and AACube::clamp() fix AddEntity to support adding an entity that extends over bounds of universe 2014-07-10 13:42:49 -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
ZappoMan
e800d5457b Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 2014-07-08 13:02:31 -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
ZappoMan
ec0c350f60 Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 
Conflicts:
	interface/src/Application.cpp
	interface/src/DatagramProcessor.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-03 14:20:40 -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
ZappoMan
2c5209d1e7 virtual entities checkpoint 2014-07-03 09:07:11 -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
ZappoMan
865566414c Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities 
Conflicts:
	interface/src/entities/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTreeElement.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
 2014-07-01 16:32:47 -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
ZappoMan
c4fe36b13d more Models->Entities renaming 2014-06-26 17:01:07 -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
ZappoMan
a60e66bcfd more file renaming models->entities 2014-06-26 16:47:51 -07:00
ZappoMan
8b13bc564f renaming some files 2014-06-26 16:42:13 -07:00
ZappoMan
ccc9eabd33 first cut at renaming Models to Entities 2014-06-26 16:39:52 -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
ZappoMan
b4bb1ef6f5 revert whitespace change 2014-06-25 16:54:40 -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
a019b70e58 Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel 
Conflicts:
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
	tests/octree/src/main.cpp
 2014-06-24 15:59:17 -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