Commit graph

10843 commits

Author SHA1 Message Date
Andrzej Kapolka
24b2da1c0d Working on delta streaming. 2014-03-18 13:14:21 -07:00
Andrzej Kapolka
a4cc15a2cd Collection streaming (untested). 2014-03-18 11:46:12 -07:00
Andrzej Kapolka
b84499c83b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-18 10:18:12 -07:00
Andrzej Kapolka
9ff0a36a06 Merge pull request #2349 from ey6es/master
Alpha is the new default.
2014-03-18 10:14:14 -07:00
Andrzej Kapolka
6aa1f286bb Alpha is the new default. 2014-03-18 10:13:23 -07:00
Andrzej Kapolka
a38239b3d8 Working on collection streaming. 2014-03-18 10:11:25 -07:00
Andrzej Kapolka
4ce953315b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-18 09:19:58 -07:00
Andrzej Kapolka
fbf4600a4c Merge pull request #2347 from ey6es/master
Prevent audio average from becoming less than zero (thus causing sqrt to
2014-03-18 09:16:52 -07:00
Andrzej Kapolka
d80f110961 Prevent audio average from becoming less than zero (thus causing sqrt to
return nan, thus making our fake blendshape coefficient nan, thus making the
jaw disappear).  Closes #2334.
2014-03-18 09:12:23 -07:00
Philip Rosedale
a24dba5e9a Merge pull request #2346 from birarda/master
scope clientMixBuffer only to AudioMixer run
2014-03-17 20:15:40 -07:00
Stephen Birarda
1fc9ac1815 make the client mix buffer only as large as it needs to be 2014-03-17 17:55:47 -07:00
Stephen Birarda
f3910f8c1a scope clientMixBuffer only to AudioMixer run 2014-03-17 17:54:27 -07:00
Philip Rosedale
2673aa00f0 Merge pull request #2345 from birarda/master
guard around update to last heard for a NULL matching node
2014-03-17 17:40:02 -07:00
Stephen Birarda
7ba595338e guard around update to last heard for a NULL matching node 2014-03-17 17:39:08 -07:00
Andrzej Kapolka
ec1e168423 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-17 17:30:14 -07:00
Philip Rosedale
a7f0e41232 Merge pull request #2342 from birarda/master
switch data for mix samples in AudioMixer
2014-03-17 17:30:14 -07:00
Stephen Birarda
07a71d8796 use char instead of QByteArray for mix samples in AudioMixer 2014-03-17 17:22:16 -07:00
Andrzej Kapolka
d569802fbc More metadata fixes. 2014-03-17 17:21:46 -07:00
Andrzej Kapolka
eb95b01aa1 Fixes to, test for metadata streaming. 2014-03-17 16:10:30 -07:00
Philip Rosedale
3c57b5bba9 Merge pull request #2336 from birarda/audio-scaling
handle trivial case of not mixing silent audio streams
2014-03-17 15:47:52 -07:00
Andrzej Kapolka
6d14ad6ab5 Missed a spot. 2014-03-17 15:13:14 -07:00
Andrzej Kapolka
d8b83fd308 More work on version-resilient type streaming. 2014-03-17 15:12:43 -07:00
Stephen Birarda
c7e12824a8 clarify check for audio loudness in AudioMixer 2014-03-17 14:35:26 -07:00
Stephen Birarda
1428d2d1de take an absolute value for correct loudness 2014-03-17 14:35:04 -07:00
Stephen Birarda
bc9deb5db7 handle trivial case of not mixing silent audio streams 2014-03-17 14:29:53 -07:00
Andrzej Kapolka
61660f890e Working on metadata for metatypes. 2014-03-17 11:39:16 -07:00
Stephen Birarda
2be8dec399 Merge pull request #2333 from birarda/master
fix for reversed MMX add in audio mixer
2014-03-17 11:27:10 -07:00
Stephen Birarda
288272f051 fix a reversed MMX add 2014-03-17 11:26:35 -07:00
Brad Hefta-Gaub
927006df91 Merge pull request #2331 from birarda/audio-scaling
AudioMixer optimizations with MMX intrinsics
2014-03-17 11:02:44 -07:00
AndrewMeadows
da58a2f4cd Merge pull request #2324 from ZappoMan/warningsfixes
Warning Fixes for Windows and Unix
2014-03-17 10:13:56 -07:00
Stephen Birarda
cc1d309c15 some really trivial magic number replacements 2014-03-17 10:13:29 -07:00
Stephen Birarda
a1fe41fc1d repair a conflicted translation file 2014-03-17 10:10:26 -07:00
Stephen Birarda
8228d70248 resolve conflicts on merge with upstream master 2014-03-17 10:09:01 -07:00
Stephen Birarda
5182ab1904 Merge pull request #2332 from birarda/master
BUILD.md changes to reduce confusino
2014-03-17 10:06:32 -07:00
Stephen Birarda
2478c995f2 clarifications to BUILD to remove confusing instructions, closes #2327 2014-03-17 10:05:44 -07:00
Stephen Birarda
05d6522279 more MMX optimizations to AudioMixer for delayed samples 2014-03-17 10:02:00 -07:00
Brad Hefta-Gaub
4a65449763 Merge pull request #2330 from birarda/domain-break
fix for domain-server packets > MTU
2014-03-17 09:51:19 -07:00
Stephen Birarda
f652df9399 break on MTU size packets from domain-list, closes #2312 2014-03-17 09:19:05 -07:00
Andrzej Kapolka
95410d2b66 Cleaned up the preprocessor definitions. 2014-03-16 18:04:37 -07:00
Andrzej Kapolka
b21247ca67 Optional hash/full metadata streaming for QObjects. 2014-03-16 17:29:30 -07:00
ZappoMan
bd6b70ee32 use unsigned int vs size_t, since that just seems more correct 2014-03-16 11:07:24 -07:00
ZappoMan
7d7e1ff28a one more crack at this signedness comparisons on unix 2014-03-15 23:37:52 -07:00
ZappoMan
5709a8893e more unix signedness warnings 2014-03-15 23:19:16 -07:00
ZappoMan
08d89a4565 arg windows signedness warnings 2014-03-15 23:17:03 -07:00
Brad Hefta-Gaub
c24abb644d Merge pull request #2296 from stojce/19495
Code Review for Job #19495
2014-03-15 23:06:33 -07:00
ZappoMan
6f85cfdb2f more warnings fixes 2014-03-15 23:00:03 -07:00
ZappoMan
777e306d09 Merge branch 'warningsfixes' of https://github.com/ZappoMan/hifi into warningsfixes 2014-03-15 22:36:53 -07:00
ZappoMan
851764a705 more warning fixes 2014-03-15 22:36:43 -07:00
ZappoMan
adb6ffe7c4 more warnings fixes 2014-03-15 22:00:44 -07:00
Brad Hefta-Gaub
2567e296e1 Merge branch 'warningsfixes' of https://github.com/ZappoMan/hifi into warningsfixes 2014-03-15 21:31:16 -07:00