wangyix
c129db16cb
formatting fix, AudioRingBuffer no longer NodeData,
2014-07-28 09:40:44 -07:00
wangyix
438606d567
_consecutiveNotMixedCount++ moved back into if(starveOnFail)
2014-07-27 11:23:47 -07:00
wangyix
cf649c8365
Revert "removed unused var"
...
This reverts commit fa500dc7fd
.
2014-07-25 18:20:16 -07:00
wangyix
fa500dc7fd
removed unused var
2014-07-25 17:38:36 -07:00
wangyix
e6f913edb1
dead injected streams are now periodically removed in AudioMixer
2014-07-25 16:32:08 -07:00
wangyix
78031622db
removed MixedAudioRingBuffer class files
2014-07-25 16:06:56 -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
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
fe70c1f49a
didn't commit for some reason
2014-07-24 10:48:56 -07:00
wangyix
c9b6879ca8
audiomixer code complete; need to test
2014-07-24 10:48:27 -07:00
wangyix
e2f957d6dc
added InboundAudioStream class
2014-07-23 16:46:23 -07:00
wangyix
a36c9e872e
merged with upstream
2014-07-23 15:36:37 -07:00
wangyix
3abd383cd3
cleaned up code more
2014-07-23 15:26:49 -07:00
wangyix
663cbb76dd
removed seq num reset from Audio::reset()
2014-07-23 14:37:11 -07:00
Stephen Birarda
7afc62db15
Merge pull request #3202 from wangyix/7_23_seq_fix
...
fixes seq num errors when spacebar
2014-07-23 14:30:56 -07:00
wangyix
3ac4dfa333
gg
2014-07-23 14:28:32 -07:00
wangyix
06ed8e4b63
fixed some typos in audio stats; cleaned up code
2014-07-23 13:47:03 -07:00
wangyix
bd8b7eb710
minor spacing issue
2014-07-23 12:44:16 -07:00
wangyix
142bda3ed4
fixed audio stats typos
2014-07-23 12:43:26 -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
wangyix
ba4403b063
audio stats look good on Mac now
2014-07-23 11:18:25 -07:00
wangyix
5b0b484727
finished new audio stats (looks good on Windows)
2014-07-23 11:00:48 -07:00
Philip Rosedale
9cee549bf0
Merge pull request #3198 from ey6es/master
...
Multiply local light colors by material diffuse reflectance.
2014-07-22 21:54:22 -04:00
Andrzej Kapolka
02bf76240a
Multiply local light colors by material diffuse reflectance.
2014-07-22 18:30:28 -07:00
Andrzej Kapolka
34dfbbedde
Merge pull request #3196 from PhilipRosedale/master
...
Tweaks to world and avatar lights, add angular acceleration to hair
2014-07-22 18:16:20 -07:00
Philip Rosedale
0b1c16d453
Merge pull request #3197 from ey6es/master
...
Not sure if everyone sees this or it's just my machine, but the frame rate slowed dramatically using the fixed function state for lights. This switches back to using uniforms.
2014-07-22 21:13:57 -04:00
Andrzej Kapolka
4f87524821
Switched back to using uniforms for light parameters, as using the fixed
...
function state killed my frame rate. Also cleaned up some of the location
tracking.
2014-07-22 18:03:13 -07:00
wangyix
d9692e4af4
changed a > to >= in handleAudioInput; added audio input buffer latency to stats;
2014-07-22 17:34:35 -07:00
Philip Rosedale
4f52098da1
tuning tweaks to world and avatar lights
2014-07-22 20:23:23 -04:00
Philip Rosedale
176473b5ba
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-22 19:29:42 -04:00
AndrewMeadows
07ce6c9a64
Merge pull request #3192 from ey6es/master
...
Fixes for local lights.
2014-07-22 16:24:17 -07:00
Stephen Birarda
4b690f9394
Merge pull request #3195 from birarda/master
...
repair for Visage find module base includes
2014-07-22 15:57:33 -07:00
Stephen Birarda
56efa46812
repair for Visage find module base includes
2014-07-22 15:56:22 -07:00
Andrzej Kapolka
d4904f976a
Missed the local light stats.
2014-07-22 15:50:08 -07:00
Andrzej Kapolka
aa145c8d20
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-22 15:40:42 -07:00
wangyix
c8ac1732ec
removed audio stats from old location
2014-07-22 14:53:45 -07:00
Stephen Birarda
7fb1391cc4
Merge pull request #3194 from birarda/master
...
fix faceshift definition
2014-07-22 14:49:07 -07:00
Stephen Birarda
5c955ca656
fix faceshift definition
2014-07-22 14:48:51 -07:00