Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 20:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
18795 commits 75 branches 59 tags 1.2 GiB
Commit graph

358 commits

Author SHA1 Message Date
wangyix
1f011bfe9d repetition-with-fade option added, not implemented 2014-08-11 11:22:37 -07:00
wangyix
0dfe0b1f2a merged with master 2014-08-08 13:32:27 -07:00
wangyix
fd3425dfd1 knobs confirmed working 2014-08-07 17:05:23 -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
Stephen Birarda
453c37f4b9 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-31 10:05:40 -07:00
wangyix
7281eca5a4 fixed inj crash; added statcDesired to MixedAudioStream 2014-07-30 17:20:05 -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
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
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
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
wangyix
4825457f4d silent audio packet type generalized 2014-07-28 16:49:53 -07:00
Stephen Birarda
84b86c17b7 use common settings retreival code to block before run in AudioMixer 2014-07-28 15:16:59 -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
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
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
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
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
wangyix
c9b6879ca8 audiomixer code complete; need to test 2014-07-24 10:48:27 -07:00
wangyix
a36c9e872e merged with upstream 2014-07-23 15:36:37 -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
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
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
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
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
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
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
wangyix
d03d3ef817 new auidostreamstats displayed in interface, domain page stats updated 2014-07-09 11:59:50 -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
Stephen Birarda
ecbd62104c cause sounds within an epsilon distance to be unattenuated 2014-07-03 16:43:12 -07:00
Stephen Birarda
438e0b501b fix the voices inside your head 2014-07-03 16:32:38 -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
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
Atlante45
d6a2cea756 Switched AudioMixer to NetworkAccessManager 2014-07-01 17:39:45 -07:00
wangyix
ab503583dd switched order of args in PositionalAudioRingBuffer 2014-07-01 17:33:38 -07:00
wangyix
a5943e3608 made AudioRingBuffer frames capacity variable 2014-07-01 16:24:31 -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
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
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
Stephen Birarda
3ae46bc60d switch audio-mixer to pull settings from domain-server via JSON request 2014-06-26 17:32:56 -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
wangyix
37ce693153 added seqnum stats to AudioMixerClientData; added seqnums to Audio.cpp 2014-06-25 18:01:34 -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
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
wangyix
435b5094a0 moved time gap history to PositionalAudioRingBuffer, untested 
removed hard-coded jitter buffer length.
 2014-06-19 17:58:38 -07:00
wangyix
100bc022ec fixed a for loop that erased elements while iterating 2014-06-19 16:42:51 -07:00
wangyix
aa3602f0fb added InterframeTimeGapHistory and frameReceived() calls 2014-06-19 14:35:02 -07:00
Stephen Birarda
dd5d59208e fix a crash when grabbing AABox from buffer 2014-06-18 15:05:38 -07:00
Stephen Birarda
1228bd4a1e handle addition of samples for an unattenuated listener 2014-06-18 14:18:39 -07:00
Stephen Birarda
db1031144b fix passing of unattenuated zones to buffers 2014-06-18 13:46:03 -07:00
Stephen Birarda
5878b4af59 setup listener unattenuated zones for source ring buffers 2014-06-18 12:50:16 -07:00
Andrew Meadows
3f36325642 remove warnings about signed/unsigned comparison 2014-06-17 11:59:37 -07:00
Stephen Birarda
194493ab9b remove MMX math to fix stereo discrepancies 2014-06-06 12:00:47 -07:00
Stephen Birarda
f6011b65d7 fix input loudness for a stereo source 2014-06-06 11:26:04 -07:00
Stephen Birarda
ae2f6a3cb6 complete piping of stereo audio through mixer 2014-06-06 10:55:04 -07:00
Philip Rosedale
4e1eaf8337 Merge pull request #2809 from Atlante45/mute_env 
Mute environment
 2014-05-07 16:18:23 -07:00
Stephen Birarda
5e9036b3fe tweak audio constants to be less agressive on cutoff 2014-05-07 15:37:41 -07:00
Atlante45
fd1f6befff CR 2014-05-07 15:19:32 -07:00
Atlante45
40ed72989c mute environment packet 2014-05-07 12:57:11 -07:00
Stephen Birarda
befe75a04c fix broken audio-mixer stats 2014-05-05 14:03:14 -07:00
Atlante45
fd20686f0f Removed Systime.h includes 2014-04-21 17:23:06 -07:00
Atlante45
dd8a0e3550 Removed gettimeofday in AudioMixer 2014-04-16 12:16:49 -07:00
Stephen Birarda
7cef2def66 remove Syssocket which is from our pre-Qt days 2014-04-10 10:34:31 -07:00
Stephen Birarda
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Stephen Birarda
e1cae6d295 initial handshaking for DTLS sessions between DS and clients 2014-04-02 17:29:14 -07:00
Stephen Birarda
e2b230445f add a method to Agent for last read frame loudness 2014-03-26 10:28:59 -07:00
Stephen Birarda
1fe01f3e61 increment framesSinceCutoffEvent in mixers to enable recovery 2014-03-25 12:16:07 -07:00
Stephen Birarda
b01b2a3311 use explicit float casts where appropriate 2014-03-24 16:35:36 -07:00
Stephen Birarda
ba338cb7bc at minimum send packet rate stats for ThreadedAssignment subclasses 2014-03-24 16:06:25 -07:00
Stephen Birarda
3db8386743 suppress trailing sleep ratio debug 2014-03-24 15:46:02 -07:00
Stephen Birarda
e7f9acd945 add trailing sleep and performance throttling logic to AvatarMixer 2014-03-24 15:42:57 -07:00
Stephen Birarda
638e9eae48 add some basic stat collection to avatar-mixer 2014-03-24 15:38:01 -07:00
Stephen Birarda
8dbe4dfdde collect packet rate stats in NodeList 2014-03-24 15:06:53 -07:00
Stephen Birarda
f8279c1f5b handle query params in HTTPManager, display stats table from DS 2014-03-24 14:14:26 -07:00
Stephen Birarda
1fffda674a send extra stats from audio-mixer to domain-server 2014-03-24 13:14:22 -07:00
Stephen Birarda
5f93e44ff7 abstract stats packet sending to NodeList 2014-03-24 12:33:00 -07:00
Stephen Birarda
8f403609e7 hook JSON stats sending from domain-server 2014-03-24 11:56:16 -07:00
Stephen Birarda
c0da215a60 correctly output trailing sleep time 2014-03-24 10:39:10 -07:00
Stephen Birarda
d0fbf4953a change back off strategy, output trailing sleep 2014-03-24 10:27:46 -07:00