Commit graph

322 commits

Author SHA1 Message Date
Thijs Wenker
a2da1e3dc1 Merge branch 'master' into fix-ac-playback-audio 2017-01-27 21:00:57 +01:00
Thijs Wenker
cdc0f3ddd2 - make AC recording audio play with right encoding
- spelling fix
2017-01-27 01:19:11 +01:00
ZappoMan
3c3dcbbbaa Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 08:20:03 -08:00
ZappoMan
81b5a3c585 more cleanup 2017-01-23 15:12:54 -08:00
ZappoMan
292d472a59 checkpoint - got first cut at distance based rotation tolerance working 2017-01-23 13:06:29 -08:00
Ryan Huffman
9b1cd52fb4 Add the ability to get the context that a script is running in 2017-01-23 08:58:01 -08:00
Stephen Birarda
25bd6fa2c1 move recording interface to Agent/Application only 2017-01-20 10:27:08 -08:00
Atlante45
529286b2ea More EntityScriptServer work 2017-01-17 13:47:45 -08:00
Atlante45
163d65d784 Setup basic EntityScriptServer 2017-01-17 13:47:45 -08:00
ZappoMan
6e5e9d3492 more work 2017-01-16 18:28:01 -08:00
ZappoMan
c9c311e275 checkpoint for distance joints 2017-01-15 11:47:48 -08:00
Brad Hefta-Gaub
5e65e3991c CR feedback 2016-12-20 21:03:10 -08:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142)
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08: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
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
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
5e4f539144 AudioMixer flushes now
And protected agent from case with no codec
2016-10-27 14:46:04 -07:00
David Kelly
d00a73dde1 Play the flushed encoder sound at end
Basically 0-padding the end of the sound buffer.  Next do that in
AudioMixer and we should be good.
2016-10-27 14:27:15 -07:00
David Kelly
b09364c288 whitespace 2016-10-25 12:22:26 -07:00
David Kelly
30d8f1967c Flushing encoder
Seems they have some state.  So if you play a sound, then silence
that doesn't go through the encoder (SilentAudioFrame), then a
sound again, you will hear a click.  Now, I just pop a frame of
0s through the encoder at the end of each .wav it plays.  Poof!
2016-10-25 12:15:48 -07:00
David Kelly
86e01bbae6 First cut
Started with the horrible screaming when avatar goes away, seems
due to not putting a codec string in the packets.  This was an existing
issue, not due to recent changes.  Also, some weird indenting was
fixed, etc...  Still hear an artifact when audio starts, but only when
a codec was negotiated.  Hoping to fix that too.
2016-10-24 15:18:29 -07:00
Seth Alves
5660063702 code review 2016-10-21 11:05:50 -07:00
Seth Alves
30f29d1796 move ScriptEngines to Agent 2016-10-21 10:57:22 -07:00
David Kelly
c8850a8b8e PR feedback
AgentAvatarTimer now in its own files.  The thread still is created
the same way, and started only when you are an avatar, but now I
remember to stop it when you no longer are one.  Audio is still at
100Hz, but avatar messages go at 60Hz as before.  Unsure it matters,
but easy to do.   Looking at that buzz now.
2016-10-12 12:44:24 -07:00
David Kelly
ef844cbd00 Cleanup artifacts
Seems playAvatarSound could be called from a thread other than
the Agent's thread.  So, artifacts happen when that pointer changes
while a 'tick' is happening.  Also cleaned up code a bit, got rid
of some hard-coded stuff I had in just for dev purposes.
2016-10-11 09:33:55 -07:00
David Kelly
fa9c3951c7 Merge branch 'master' into dk/codecInAgentAvatar 2016-10-10 19:51:56 -07:00
David Kelly
b58c36cb12 Rolling my own 100hz timer
Starting with the simplest possible thing - just sleep for 10000
microseconds.  Can make it adaptive if need be.
2016-10-10 17:57:04 -07:00
David Kelly
b4c064a538 Hack in a 100hz timer
sounds crappy, more to do, just push to not lose anything.

<squash this>
2016-10-07 13:20:08 -07:00
David Kelly
ab6ccac631 Merge pull request #8741 from howard-stearns/kill-agents
kill agents in avatar mixer when they stop being avatars
2016-10-07 09:16:49 -07:00
David Kelly
95aa18f66d Some cleanup
unnecessary stuff removed, added some cleanup code.
2016-10-06 16:18:22 -07:00
Chris Collins
8310a9fe8a Merge pull request #8730 from huffman/feat/script-req-retry
Add retrying of script requests
2016-10-06 16:09:04 -07:00
David Kelly
a0c731a0c6 Initial attempt
Kinda works, but sounds 'scratchy'.  Surely I've done something
lame.
2016-10-06 14:57:40 -07:00
howard-stearns
dc7a9f253c kill agents in avatar mixer when they stop being avatars 2016-10-05 13:06:11 -07:00
Zach Pomerantz
5af95c6062 store channels on audio stream 2016-10-05 12:04:24 -07:00
Ryan Huffman
9dfa3e4a17 Move ScriptCache from AssignmentClient to Agent 2016-10-04 16:43:14 -07:00
Zach Pomerantz
e2ff738fc3 strip unused audio settings
- remove parameters on the jitter buffer algorithm, these are now static
- remove parameters on the output starve detection algorithm, now static
- move interface audio settings to the Developer menu
2016-09-21 17:35:27 -07:00
Brad Hefta-Gaub
376756d413 include the codec name in the agent avatar audio stream 2016-08-25 09:58:36 -07:00
Stephen Birarda
aa226739d3 remove billboard code from Agent 2016-05-12 16:41:44 -07:00
Zach Pomerantz
173d2a590c Use sleep_until for ScriptEngine 2016-05-06 19:30:37 -07:00
Stephen Birarda
d7450b8178 release pending ATP script request for active AssetServer 2016-04-13 14:25:23 -07:00
Stephen Birarda
76af3efe73 fix for active socket check on ATP script download 2016-04-11 17:59:27 -07:00
Stephen Birarda
bf3324fc6b hold download of ATP script if Asset Server isn't ready 2016-04-08 15:28:12 -07:00
Stephen Birarda
1df0dce971 use ResourceRequest in Agent to handle ATP scripts 2016-04-08 14:38:26 -07:00
Atlante45
6d1b7f1d37 Wrap sound script object to hold a strong ref 2016-04-06 13:04:18 -07:00
Brad Hefta-Gaub
492e71345a Revert "Revert "Fix ModelBlender crash""
This reverts commit f274cdcc7f.
2016-03-21 11:42:25 -07:00