Commit graph

359 commits

Author SHA1 Message Date
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
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
Stephen Birarda
c7e12824a8 clarify check for audio loudness in AudioMixer 2014-03-17 14:35:26 -07:00
Stephen Birarda
bc9deb5db7 handle trivial case of not mixing silent audio streams 2014-03-17 14:29:53 -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
Stephen Birarda
cc1d309c15 some really trivial magic number replacements 2014-03-17 10:13:29 -07:00
Stephen Birarda
05d6522279 more MMX optimizations to AudioMixer for delayed samples 2014-03-17 10:02:00 -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
ZappoMan
6f85cfdb2f more warnings fixes 2014-03-15 23:00:03 -07:00
ZappoMan
adb6ffe7c4 more warnings fixes 2014-03-15 22:00:44 -07:00
Stephen Birarda
72449fdb6a initial optimizations to AudioMixer with mmx additions 2014-03-14 17:50:57 -07:00
Stephen Birarda
54d73d4a64 use floor since round is missing on windows 2014-03-12 17:50:58 -07:00
Stephen Birarda
060d8be9f4 Merge branch 'master' of https://github.com/highfidelity/hifi into agent-audio 2014-03-12 17:07:21 -07:00
Stephen Birarda
3b653ca542 add a sendAvatarAudioStream option to Agent for mixer load testing, closes #2291 2014-03-12 17:00:12 -07:00
AndrewMeadows
bed8617846 Merge pull request #2277 from ZappoMan/server_scale_testing
Voxel/Particle Server Scaling Work
2014-03-12 15:24:29 -07:00
Andrzej Kapolka
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians
prefer radians over degrees
2014-03-12 12:10:29 -07:00
ZappoMan
6173a4d2a7 fix isFullScene correctly 2014-03-12 10:19:21 -07:00
ZappoMan
7e6beba4d2 removed redundant calc of isFullScene 2014-03-12 01:29:41 -07:00
ZappoMan
4d0b762de3 some hacking on full scene debuggin 2014-03-11 20:33:53 -07:00
Andrew Meadows
793a760272 merge upstream master into "radians" project 2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Andrzej Kapolka
81e3197751 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 10:03:30 -07:00
Andrzej Kapolka
9e5aae4a39 Remove spanner bits. 2014-03-10 17:01:27 -07:00
Andrzej Kapolka
3b63424abd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-10 12:27:07 -07:00
ZappoMan
cfa618d694 cleanup constructors 2014-03-08 23:31:23 -08:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Andrzej Kapolka
0448596e58 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Conflicts:
	interface/src/renderer/FBXReader.cpp
2014-03-05 18:28:25 -08:00
Andrzej Kapolka
d1747ed8d1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-05 17:12:37 -08:00
ZappoMan
15b5bb4385 Merge branch 'master' of https://github.com/worklist/hifi into flocking_birds
Conflicts:
	examples/bot.js
2014-03-05 02:21:40 -08:00
Andrzej Kapolka
63b4a2453b Lots of work on metavoxel LODs and spanners. 2014-03-04 21:27:13 -08:00
ZappoMan
374af9eeb5 first cut at flocking birds, change willEmitVisualCallback to update 2014-03-04 14:40:49 -08:00
Stephen Birarda
231dc624ff replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00
Stephen Birarda
bb3a8677be Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes 2014-03-03 16:31:25 -08:00
Stephen Birarda
628f91cd73 complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -08:00
Stephen Birarda
60eb588e96 remove some unecessary null pointer checks 2014-03-03 11:36:01 -08:00
ZappoMan
ef87fbffac Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling
Conflicts:
	libraries/shared/src/ResourceCache.cpp
2014-02-28 16:58:43 -08:00
Stephen Birarda
094159eefd make Agent parent of ScriptEngine so they stay on same thread 2014-02-28 16:47:54 -08:00
ZappoMan
c1c41ea2ca handle some shutdown cases and reduce time of locking in octree server 2014-02-28 16:18:02 -08:00
ZappoMan
8d7406461a Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling
Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	assignment-client/src/octree/OctreeServer.h
2014-02-28 10:54:56 -08:00
ZappoMan
f9718913e2 fix octree-server random spinout sometimes when client disconnects 2014-02-27 16:13:05 -08:00
ZappoMan
cdb0aeb153 some hacking on server performance 2014-02-27 10:47:17 -08:00
ZappoMan
2832c33482 fixed div by zero 2014-02-26 21:38:28 -08:00
ZappoMan
6f1136c417 more status page formatting, and include max total packets in packets per client interval 2014-02-26 21:25:34 -08:00
ZappoMan
85a42849a8 work on current client count 2014-02-26 21:25:15 -08:00