Clement
1997191e77
Fix MSVC warnings
2018-10-01 10:49:04 -07:00
Clement
585c278400
streamline mix operation
2018-09-28 15:45:56 -07:00
Stephen Birarda
b18d8e2254
pull out removal and adding of streams to sep functions
2018-09-28 15:00:52 -07:00
Stephen Birarda
7e4cfd3c78
fix for injected audio going to unreachable
2018-09-28 14:54:50 -07:00
Stephen Birarda
b7c6fa003d
guard against incorrectly sized AudioStreamStats from packet
2018-09-28 14:54:50 -07:00
Stephen Birarda
2ac1445683
remove double scoping of the frame check timer
2018-09-28 14:54:50 -07:00
Stephen Birarda
aea9775e4d
get back to ideal frame time when slow
2018-09-28 14:54:50 -07:00
Stephen Birarda
925c39cbd3
split sleep timing from check time timing
2018-09-28 14:54:50 -07:00
Stephen Birarda
996e033dee
add stats for skipped streams
2018-09-28 14:54:50 -07:00
Stephen Birarda
6750d4a370
move buffer popping to packet processing
2018-09-28 14:54:50 -07:00
Stephen Birarda
7d8b15ed75
move valid position check to packet processing
2018-09-28 14:54:50 -07:00
Stephen Birarda
371de312cc
enumerate a vector of mixable streams for each listener
2018-09-28 14:54:50 -07:00
Stephen Birarda
c992150c10
change stream HRTF map to use a vector
2018-09-28 14:54:50 -07:00
Stephen Birarda
bcba2a1cf1
use local ID for stream hash
2018-09-28 14:54:50 -07:00
Clement
d15ef295cf
Replace AudioZones lookup with vectors and indexes
2018-09-28 14:54:50 -07:00
Stephen Birarda
09cfe4dbc1
use a vector for audio streams
2018-09-28 14:54:50 -07:00
Stephen Birarda
aed79b3b17
use a vector for ignored node IDs
2018-09-28 14:54:49 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling
...
Performance improvements for Avatar Mixer
2018-09-13 13:43:18 -07:00
Simon Walton
9628615c44
Fix bandwidth quota calculation now we're dropping excess
2018-09-10 17:16:16 -07:00
Anthony Thibault
1570ae6424
Merge branch 'master' into bug-fix/recorded-blendshapes-2x
2018-09-10 12:58:53 -07:00
John Conklin II
3b0f37c6f7
Merge pull request #13885 from birarda/bug/recording-scripting-stuck
...
fix Agent teardown of recording and ScriptEngine(s)
2018-09-10 10:51:52 -07:00
Simon Walton
6bb143da42
Make maxAvatarBytesPerFrame int rather than float; other clean-up
2018-09-07 18:14:39 -07:00
Simon Walton
c2fe2b60b3
Use std::vector for ignored avatars since the list will be small
2018-09-07 15:49:47 -07:00
John Conklin II
01cace694f
Merge pull request #13916 from birarda/bug/ignore-freeze-master
...
send ignoring avatar removal to ignored avatar
2018-09-07 15:40:32 -07:00
Anthony Thibault
949efff439
Fix blendshapes playing back in recordings at 2x their proper values
2018-09-07 13:21:17 -07:00
Simon Walton
22cfad2483
Squelch (false) warning from gcc
2018-09-06 18:32:37 -07:00
SamGondelman
ed7f993c0d
avatar mixer and manager perf improvements and cleanup
2018-09-06 16:57:20 -07:00
Simon Walton
f6fd27a76b
Merge pull request #1 from AndrewMeadows/avatar-mixer-scaling-2
...
tweak avatar sort coefficients and fix bad avatar bounding box calculations
2018-09-06 16:39:20 -07:00
Andrew Meadows
92210f28b5
cleanup and use correct avatar bounding box
2018-09-06 16:33:30 -07:00
Simon Walton
f59168e1c8
make sure ignoredNode is available before sending packet
2018-09-06 16:31:31 -07:00
Simon Walton
9e0c21065e
Stop sending avatars when over bandwidth quota
2018-09-06 16:20:46 -07:00
Stephen Birarda
a908c1554f
make sure ignoredNode is available before sending packet
2018-09-06 16:04:54 -07:00
Andrew Meadows
229e9624e6
remove bad bounding box calculations in avatar-mixer
2018-09-06 15:34:28 -07:00
Simon Walton
e1aba52c23
Revert to statics for priority sort weights; update defaults from Andrew
2018-09-06 12:09:44 -07:00
Simon Walton
d2650f7ede
Modified priority function from Andrew
2018-09-05 17:22:07 -07:00
Simon Walton
f7e84995b4
Only build the sortable vector once, now we're using vectors for the priority sort
2018-09-05 10:58:37 -07:00
Simon Walton
0738bcaebc
Unused variable from merge
2018-09-04 18:08:34 -07:00
Simon Walton
262dbaf5ed
Merge commit 'ade58a52cc97fe06c2f4bb88c4b9d097636fd4b9' into avatar-mixer-scaling
2018-09-04 15:27:41 -07:00
Simon Walton
6ae2ca1576
Merge commit '5f08ed5027a8904242a47b17e994ab4f309e3930' into avatar-mixer-scaling
...
Merge of Samuel's change to use simple sort instead of priority queue
2018-09-04 15:26:26 -07:00
SamGondelman
ade58a52cc
reserve priority sort util vectors
2018-09-04 11:21:43 -07:00
Stephen Birarda
07b24b4768
send kill packet to ignored node for ignorer
2018-08-30 17:32:09 -07:00
SamGondelman
5f08ed5027
misc perf improvements
2018-08-30 16:55:15 -07:00
Simon Walton
c2ac2b9ab0
Various tweaks; fix clang warning
2018-08-30 10:59:55 -07:00
Simon Walton
7b7f369c39
Further reductions in shared pointers, getWorldPosition().
2018-08-29 18:25:10 -07:00
Simon Walton
4b7f6a346f
Use AvatarData::getClientGlobalPosition() for position in priority queue
...
It looks like it's the same as world position with the avatar mixer.
Also use one time stamp for current time in priority queue; use
std::chrono for some other timestamps in hope that it's faster.
Fix priority-code logic bug.
2018-08-28 16:21:47 -07:00
Simon Walton
027d117364
Remove deadlock caused by trying readlock on NodeList
...
Also just use refs to other SharedNodes as the NodeList
is locked.
2018-08-28 09:41:09 -07:00
Stephen Birarda
a76b50ce33
fix teardown of recording and ScriptEngine(s)
2018-08-27 15:07:19 -07:00
Simon Walton
44f253c482
Reduce use of shared pointers and maps
2018-08-27 14:54:37 -07:00
Simon Walton
402ed4fb76
More shared pointer tweaks
2018-08-27 10:35:17 -07:00
Simon Walton
ab810f4505
Try reducing use of shared pointers in O(n2) code
2018-08-24 17:33:06 -07:00