Commit graph

355 commits

Author SHA1 Message Date
Stephen Birarda
55954899e6 fix silent audio on client 2013-05-28 16:20:23 -07:00
Jeffrey Ventrella
75b57d17a7 fixed some things based on recent code review 2013-05-27 18:54:44 -07:00
Stephen Birarda
95cef67e33 Revert "remove unused variable in Audio"
This reverts commit bbdd601855.
2013-05-21 15:01:08 -07:00
birarda
ca9738a101 Merge pull request #370 from birarda/master
remove unused varible in Audio
2013-05-21 14:52:45 -07:00
Stephen Birarda
bbdd601855 remove unused variable in Audio 2013-05-21 14:52:05 -07:00
Andrzej Kapolka
597769a861 Added basic capsule/sphere collisions between avatar and voxels. 2013-05-21 12:58:02 -07:00
Philip Rosedale
d9cc07cf17 Working on audio echo cancellation 2013-05-18 12:33:21 -07:00
Philip Rosedale
78bd5ab40f Fixes per review 2013-05-16 13:34:48 -06:00
Philip Rosedale
29889725ef Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 21:17:34 -06:00
Philip Rosedale
1a283c3ac0 Improvements to scope display, added framework for echo analysis over multiple frames 2013-05-15 21:15:55 -06:00
Stephen Birarda
d78daf53e9 fix copy of Avatar object for use in Audio class 2013-05-15 17:28:27 -07:00
Stephen Birarda
fc5e42cf8b add threaded injection of audio via audio injector class 2013-05-15 16:10:59 -07:00
Philip Rosedale
2820323567 Fixes from merge 2013-05-15 13:48:55 -07:00
Philip Rosedale
f6389cac38 First commit, audio echo detection, also changed scope to show last buffer played rather than next buffer to play. 2013-05-15 13:03:22 -07:00
Stephen Birarda
e0ee50fa9c spacing changes in Audio render 2013-05-15 12:38:11 -07:00
Stephen Birarda
351412f6e8 constantize SOUND_PITCH in addProceduralSounds 2013-05-15 12:36:53 -07:00
Stephen Birarda
63a2b203d9 constantize VOLUME_BASELINE in addProceduralSounds 2013-05-15 12:36:19 -07:00
Stephen Birarda
274c810dec constantize the number of packets to discard for stats 2013-05-15 12:35:41 -07:00
Stephen Birarda
b186dd0f65 comment cleanup for audioCallback 2013-05-15 12:24:58 -07:00
Stephen Birarda
c5fdfd64e7 remove extra space 2013-05-15 12:22:11 -07:00
Stephen Birarda
44b12cb593 spacing changes 2013-05-15 12:21:43 -07:00
Stephen Birarda
fb42e8df04 correct some global references in Audio.cpp 2013-05-15 12:19:40 -07:00
Stephen Birarda
ce34a8f3e0 add packet headers and agent types for audio clarity 2013-05-15 11:43:49 -07:00
Stephen Birarda
26c34bb86c sensible initialization for Audio member variables 2013-05-15 11:29:52 -07:00
Stephen Birarda
4693082db0 refactor Audio to remove requirement of AudioData 2013-05-15 10:54:36 -07:00
Stephen Birarda
2a47d8955a remove some leftover walking sound stuff 2013-05-10 17:44:50 -07:00
Stephen Birarda
82ed4a4ae8 remove old style walking sounds 2013-05-10 17:21:58 -07:00
Philip Rosedale
ddc97a6ac9 Merge remote-tracking branch 'upstream/master' 2013-05-08 19:36:45 -07:00
Philip Rosedale
76c5a74876 Added gyro pitch to view, moved onscreen displays around to look nicer. 2013-05-08 19:35:48 -07:00
Philip Rosedale
baf64c07dc Added Procedural audio noise when moving, scaled to velocity 2013-05-08 09:04:38 -07:00
Philip Rosedale
e1645b1158 Testing audio noise generation at client 2013-05-07 12:48:35 -07:00
Stephen Birarda
bd3c902b68 remove logging of audio stats 2013-05-03 15:13:38 -07:00
Stephen Birarda
90a08b4dd8 cleanup in Audio and Util 2013-05-03 14:45:47 -07:00
Philip Rosedale
f6ef117788 Merge pull request #157 from tschw/19165
19165
2013-04-27 16:37:46 -07:00
tosh
dbfef9d802 Merge branch 'master' of git://github.com/worklist/hifi into 19165
Conflicts:
	interface/src/Audio.cpp
2013-04-27 00:53:29 +02:00
Stephen Birarda
948f9607f6 send head position as source position to mixer 2013-04-26 11:49:52 -07:00
Stephen Birarda
ded5da47ff correct the sign of the absolute head yaw sent to avatar mixer 2013-04-26 11:35:55 -07:00
Stephen Birarda
fbdcd57529 correct yaw sent to audio-mixer in Audio 2013-04-26 11:21:34 -07:00
Stephen Birarda
1884bfc17e some spacing cleanup in Audio class 2013-04-26 10:58:01 -07:00
tosh
50eb9a2a54 Merge branch 'master' of git://github.com/worklist/hifi into 19165 2013-04-26 05:07:31 +02:00
tosh
41115fc0f1 reimplements oscilloscope and connects output channels 2013-04-26 04:25:58 +02:00
Andrzej Kapolka
1713bebb64 Added the basic key press/message composition display. 2013-04-25 17:36:47 -07:00
Jeffrey Ventrella
e54fd0dd7d renamed "Head" to "Avatar" and did a bunch a cleanups, including removing the three-lined comments 2013-04-24 16:54:07 -07:00
Philip Rosedale
33f95c696b Fixes per code review 2013-04-24 13:12:08 -07:00
Philip Rosedale
78aa4fdf80 Simplified average loudness calculation, mouths and eyebrows of other people now move again! 2013-04-24 11:26:59 -07:00
Jeffrey Ventrella
eb631e2ef6 renamed "bodyPosition" to "position". (This corresponds to the position of the avatar on the ground, where y=0). I will next add a new "getBodyPosition" which returns the avatar's center of gravity - is useful for certain purposes, such as setting collision volumes, etc. 2013-04-23 14:05:23 -07:00
Philip Rosedale
9760b7d410 First commit to re-enable gyros, removed various old head_mirror variables, now use 'lookingInMirror', etc. Local gyros now correctly drive own head. 2013-04-23 09:47:52 -07:00
tosh
1e6352593a Merge branch 'master' of git://github.com/worklist/hifi into 19262
Conflicts:
	interface/src/Head.cpp
	interface/src/Util.cpp
	interface/src/main.cpp
	libraries/avatars/src/Orientation.cpp
2013-04-18 12:38:35 +02:00
Stephen Birarda
e9592c45c7 fix reference to resources directory on OS X 2013-04-17 11:56:32 -07:00
tosh
349e89aaa6 integrates logging for interface 2013-04-17 19:04:10 +02:00
Stephen Birarda
e71f21b7bf fix broken builds from last commit, pull new avatar data in VoxelAgentData 2013-04-16 11:59:03 -07:00
Stephen Birarda
a5a93443c6 re-work AvatarData to handle body position and rotation 2013-04-15 18:05:22 -07:00
Philip Rosedale
34e5b670a2 Tweaked location and color of agents display for menu, removed audio start playback log 2013-04-10 18:01:18 -07:00
Philip Rosedale
87fd0f7a91 Fixed avatar lighting, head scaling, removed some extra log messages 2013-04-08 21:13:20 -07:00
ZappoMan
7480283dd4 cleanup of packet header constants 2013-04-08 19:54:14 -07:00
Stephen Birarda
a0c5dcb3ca correct number of leading bytes for addition of attenuation byte 2013-04-01 13:03:46 -07:00
Stephen Birarda
124fecf8c9 Revert "don't send or parse attenuation for now"
This reverts commit 1767f2b052.
2013-04-01 12:28:51 -07:00
Stephen Birarda
f0e457081b temporarily disable walking noises for demo 2013-03-29 11:34:58 -07:00
Stephen Birarda
3be5d60fc4 comment out threshold frames to hopefully reduce clicks 2013-03-29 09:17:33 -07:00
Stephen Birarda
1767f2b052 don't send or parse attenuation for now 2013-03-29 08:36:33 -07:00
Stephen Birarda
896047d2aa have the mixer additionally attenuate sources based on extra byte 2013-03-25 12:05:32 -07:00
Stephen Birarda
95926cb7fc conditional chdir for OS X resources, revert windows Head changes 2013-03-21 17:02:41 -07:00
Stephen Birarda
0b48eab1fb Merge branch 'master' of github.com:worklist/hifi 2013-03-21 16:12:09 -07:00
Stephen Birarda
4552140f61 add a sound when moving so we aren't ninjas 2013-03-21 16:11:17 -07:00
Kees van Prooijen
9ae11ffe77 more windows port 2013-03-20 12:13:14 -07:00
Stephen Birarda
8ef885aaaf remove extra tokens after endif for WIN32 conditionals 2013-03-19 11:10:42 -07:00
Kees van Prooijen
cd27c74a2d prelimanary changes for windows port 2013-03-19 11:01:08 -07:00
Stephen Birarda
d51f52c307 add back fred's flange, with some tuning 2013-03-12 13:59:19 -07:00
Philip Rosedale
ccd60fa07f Merge remote-tracking branch 'origin' 2013-03-12 10:49:33 -07:00
Stephen Birarda
e97aba03a3 move StdDev to shared library 2013-03-12 10:09:07 -07:00
Philip Rosedale
e3697f22f8 Merge remote-tracking branch 'origin' 2013-03-11 17:28:05 -07:00
Stephen Birarda
4be337d34b only hold the threshold number of frames for audio output 2013-03-11 17:27:27 -07:00
Philip Rosedale
3e62aa5169 Fixed/improved Standard Deviation code used to get jitter 2013-03-11 17:13:18 -07:00
Philip Rosedale
74452b7cc5 manual merge removed ECHO_SERVER_TEST 2013-03-11 16:24:55 -07:00
Philip Rosedale
9f21c76380 Merge remote-tracking branch 'origin/master' 2013-03-11 16:22:16 -07:00
Philip Rosedale
674bd8d798 transmitter full movement, and audio jitter buffer tweaks/debugging data 2013-03-11 16:19:55 -07:00
Stephen Birarda
5d02d563b3 remove the flange until it's ready for primetime
This reverts commit 5652d0dcd3.
2013-03-10 15:04:23 -07:00
Stephen Birarda
5652d0dcd3 add a flange effect when turning head with gyros 2013-03-08 17:18:28 -08:00
Stephen Birarda
5535b8a4f5 allow client to request loopback from mixer 2013-03-08 15:37:41 -08:00
Stephen Birarda
4648ce033e remove the flanger that isn't working as expected
This reverts commit a7deca0ced.
2013-03-04 10:37:55 -08:00
Stephen Birarda
a7deca0ced add a broken flanger 2013-03-04 10:37:48 -08:00
Stephen Birarda
a42fc47231 relink head to AudioRingBuffer, send source bearing 2013-02-28 15:58:57 -08:00
Stephen Birarda
29df6e6a3e send 256 samples per callback so mixer can reply with two channels 2013-02-28 12:21:38 -08:00
Stephen Birarda
31a164fd19 initial changing of volumne of source based on distance 2013-02-26 16:57:33 -08:00
Stephen Birarda
1783ee5f85 send interface client position to audio mixer 2013-02-26 13:13:40 -08:00
Stephen Birarda
bf94f1f861 refactor Audio.cpp in interface to use parseData in ARB 2013-02-25 17:13:44 -08:00
Stephen Birarda
abfd3a0168 refactor mixer to use AgentList, AudioRingBuffer as AgentData 2013-02-25 17:07:32 -08:00
Stephen Birarda
345ec8b938 fix threaded socket joins so that socket has timeout on blocking receive 2013-02-22 13:37:57 -08:00
Stephen Birarda
200982dddc fix for UDPSocket receive crash in Audio class and main.cpp 2013-02-22 12:20:16 -08:00
Stephen Birarda
aa9f4f966e allow switchover to new audio mixer received from audio server 2013-02-21 15:43:52 -08:00
Stephen Birarda
060f4dceca use AgentData class to abstract implemenation of linked data 2013-02-21 12:56:57 -08:00
Stephen Birarda
6c70d264ac fix company name in header comments 2013-02-19 12:50:23 -08:00
Stephen Birarda
da8fd5f4ee hook space server up to shared UDPSocket class 2013-02-14 16:45:00 -08:00
Stephen Birarda
9c822b9d58 dynamic switchover of audio mixer 2013-02-13 20:43:10 -08:00
Stephen Birarda
ff83335123 undo solo test for mixer, add localhost mixer const to Audio.cpp 2013-02-13 16:19:31 -08:00
Stephen Birarda
28beb3ecfc undo changes to interface constants 2013-02-13 13:44:26 -08:00
Stephen Birarda
09dee91279 collect agent address on receive to send back audio 2013-02-13 13:42:23 -08:00
Philip Rosedale
4ed1971276 Made oscilloscope 2 channel, turned on by default (need to fix injecting the last audio buffer tho). 2013-02-13 10:14:31 -08:00
Philip Rosedale
53a3d1f8c9 Added audio waveform oscilloscope, fixing head rendering of other agents and self. 2013-02-12 23:27:36 -08:00
Philip Rosedale
b58bb6fe80 Head data streaming to other users, domain server improved, network.cpp removed and replaced with UDPSocket objects, input audio drives mouth color and size. 2013-02-12 01:41:36 -08:00
Stephen Birarda
99b96ec737 build portaudio library to link with interface 2013-02-08 15:58:12 -08:00
Stephen Birarda
0c570f5ed5 import cstring for memset and memcpy 2013-02-08 13:57:38 -08:00
Philip Rosedale
58e96f0ab8 Merge branch 'master' of github.com:worklist/hifi 2013-02-07 20:09:29 -08:00
Stephen Birarda
0359cdbc12 merge with origin/master 2013-02-07 17:30:08 -08:00
Stephen Birarda
1111e4837e intial restructuring for CMake setup 2013-02-06 18:07:36 -08:00
Renamed from Source/Audio.cpp (Browse further)