Commit graph

2197 commits

Author SHA1 Message Date
Zach Pomerantz
b2f995d3df algorithm->nestedEach in LimitedNodeList 2016-12-07 00:03:30 +00:00
Zach Pomerantz
28960681d9 limit audio pool to sane thread count 2016-12-06 23:57:38 +00:00
Zach Pomerantz
259775e163 clarify lock requirement in audio slave pool 2016-12-06 23:56:11 +00:00
Zach Pomerantz
2fc904b990 fix typos 2016-12-06 23:54:13 +00:00
Zach Pomerantz
557ab43f0f add a timeout for errant audio slave threads 2016-12-06 23:53:16 +00:00
Zach Pomerantz
132e9bd644 add timings to AudioMixer 2016-12-06 23:51:06 +00:00
Zach Pomerantz
2a6e46aa0c rm static buffer from AudioMixerSlave 2016-12-06 20:15:39 +00:00
Zach Pomerantz
d899391a1a fix audio hist array initializer for WIN32 2016-12-02 04:12:44 +00:00
Zach Pomerantz
800744a139 fix audio pool shutdown and add single threading 2016-12-01 23:03:37 +00:00
Zach Pomerantz
78bc5cf502 fix audio pool resizing 2016-12-01 21:25:56 +00:00
Zach Pomerantz
2c42bb0aa8 time audio mixing frames 2016-11-30 18:18:36 -05:00
Zach Pomerantz
8a6dcdeb68 mix audio with single node list read lock 2016-11-30 16:37:34 -05:00
Zach Pomerantz
b4638105e3 expose audio mixer threads to gui 2016-11-29 13:32:10 -05:00
Zach Pomerantz
7a440def87 add AudioMixerSlavePool 2016-11-28 17:59:29 -05:00
Zach Pomerantz
41ef105456 clean up AudioMixerSlave 2016-11-28 17:07:24 -05:00
Zach Pomerantz
bf137cd589 break AudioMixer slave/stats into own files 2016-11-28 16:50:47 -05:00
Zach Pomerantz
2e619b230d add AudioMixerStats 2016-11-28 16:50:42 -05:00
Zach Pomerantz
192f4791d5 move mixing into AudioMixerSlave 2016-11-28 16:50:26 -05:00
Zach Pomerantz
891084e9db modularize audio mixing code 2016-11-28 16:48:53 -05:00
Zach Pomerantz
028ac5264f consolidate AudioMixer slots 2016-11-28 16:26:53 -05:00
Zach Pomerantz
0170379d3c rm unused vars 2016-11-27 18:09:05 -05:00
Brad Hefta-Gaub
fe709f51de personal space feature 2016-11-19 16:30:15 -08:00
Stephen Birarda
dadcaa9959 don't send audio/avatar data for ignoree to ignored node 2016-11-14 10:12:36 -08:00
Chris Collins
6581a51bc9 Merge pull request #9052 from davidkelly/dk/2226
Add ability to mute user
2016-11-11 16:02:08 -08:00
David Kelly
6063a63f44 cr feedback 2016-11-11 14:23:59 -08:00
David Kelly
9c8f22e0e7 straight to audio mixer
since we can get the canKick there too.  (doh)
2016-11-11 09:30:58 -08:00
Seth Alves
5629db9109 Merge pull request #9049 from birarda/max-min-av-scale
add a min/max avatar scale in domain-server settings
2016-11-11 06:11:02 -08:00
David Kelly
80d4033767 oops forgot one thing... 2016-11-10 17:13:50 -08:00
Stephen Birarda
020942c826 better handling for a flipped min/max scale 2016-11-10 16:50:36 -08:00
David Kelly
285520dff7 Initial cut
No script work yet, just first stab at underpinnings
2016-11-10 16:24:35 -08:00
Stephen Birarda
88c63332de protect flipped min/max scale in avatar mixer settings 2016-11-10 16:21:48 -08:00
Stephen Birarda
64d9fa0f39 clamp avatar scale to domain limit in avatar mixer 2016-11-10 14:19:32 -08:00
Stephen Birarda
77ede81fc9 limit MyAvatar scale to limits from domain settings 2016-11-10 13:27:13 -08:00
Brad Hefta-Gaub
af2f6e831a Merge pull request #9044 from birarda/higher-mute-permissions
elevate permissions required for mute environment to kick
2016-11-10 10:18:06 -08:00
Stephen Birarda
f56a5d1d98 elevate permissions required for mute environment 2016-11-10 09:23:01 -08:00
Brad Hefta-Gaub
8758e4a9ba add support for whitelist entity scripts 2016-11-09 19:17:24 -08:00
Seth Alves
c8a654a915 Merge pull request #9006 from Atlante45/logging
Logging improvements
2016-11-07 13:35:13 -08:00
Atlante45
ae29fe8ab2 Logging improvements 2016-11-04 14:26:19 -07:00
David Kelly
21d1f40f59 Seems we were not deleting the right hrtfs when a node is killed
Simple fix, just make sure we delete the hrtfs associated with the
killedNode.  The test is to delete some nodes (agents) and make sure
nothing bad happens to audio mixer, or the audio itself.
2016-11-04 13:15:02 -07:00
David Kelly
920cd90afa CR feedback 2016-11-03 13:23:05 -07:00
David Kelly
ec0382daf7 PR feedback
Completely deleting hrtfs incorrectly.  This seems to be better, we
only want to delete HRTF for the QUuid() stream for the killed node in each
node's list of HRTFs.
2016-11-01 18:29:31 -07:00
David Kelly
c1feac971b CR feedback 2016-11-01 15:17:07 -07:00
David Kelly
0b80610e65 Needed to properly remove hrtfs for avatar audio 2016-11-01 15:09:14 -07:00
David Kelly
404c08b0c7 Un-do of previous commit
Seems to add an artifact when using our test scripts.  Will work on that
as a separate issue, as it would be an existing issue in any case.
2016-11-01 10:46:22 -07:00
David Kelly
fb2968a419 Reset bytes sent counter when setting avatar sound
It could be past the end of the buffer if you changed sounds, and the
new one is shorter.  Won't happen with our current tests, but that could
change, and in general no reason it couldn't happen.
2016-11-01 09:12:35 -07:00
David Kelly
5714063eff Make more reliable
Need to be sure we don't change the _isAvatar or
_isListeningToAudioStream from one thread while processing audio in
another.  Also, fixed issue sending NLPacketList.
2016-10-31 16:38:01 -07:00
David Kelly
e63e9bc017 Remove HRTFs for Avatar too
Turns out there was already a function for that, if you just call
removeHRTFForStream without a 2nd param, it appears to just delete
the audio with uuid of QUuid() which is the avatar's mic.  That is
what we want, so cool.
2016-10-31 13:25:22 -07:00
David Kelly
80e38c395e Send KillAvatar to AudioMixer too
So it can remove the listening agent avatar audio streams.  Otherwise
they stick around forever, and eventually swamp the audio mixer.
2016-10-31 10:35:16 -07:00
David Kelly
e3a22618d1 CR feedback 2016-10-27 17:49:43 -07:00
David Kelly
52a14bf5c3 Merge branch 'master' of github.com:highfidelity/hifi into dk/moreACAudioArtifacts 2016-10-27 16:52:25 -07:00