Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 19:40:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11804 commits 25 branches 0 tags 1.1 GiB
Commit graph

355 commits

Author SHA1 Message Date
Lucas Crisman
a2f8a61a69 stats font & color changes, styling audio & bandwidth meters 2014-01-24 05:06:55 -03:00
Lucas Crisman
f818b07dc8 Merge branch 'master' of git://github.com/worklist/hifi into 19487 2014-01-23 22:18:33 -03:00
Stephen Birarda
c54eacbf36 make sure starve is displayed even if ring buffer just received data 2014-01-23 11:15:21 -08:00
Lucas Crisman
95837b89c0 Merge branch 'master' of git://github.com/worklist/hifi into 19487 2014-01-23 15:54:14 -03:00
Stephen Birarda
7efc9e2e78 move datagram processing back to separate thread 2014-01-23 10:32:23 -08:00
Lucas Crisman
d86aa227a4 UI stats improvements: first cut 2014-01-22 16:42:09 -03:00
stojce
13f223ff12 Merge branch 'master' of https://github.com/worklist/hifi into 19484 2014-01-17 19:46:44 +01:00
Stephen Birarda
0ddf9520dd if audio is muted don't loopback local audio, fixes #1561 2014-01-16 14:55:09 -08:00
Andrzej Kapolka
865b495e6c Merge branch 'master' of https://github.com/worklist/hifi into debone 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Menu.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Webcam.cpp
	interface/src/devices/Webcam.h
	interface/src/renderer/FBXReader.cpp
 2014-01-16 13:35:03 -08:00
Andrzej Kapolka
3f08504e3e Replaced missing functionality. 2014-01-16 12:39:07 -08:00
stojce
150a667cd6 WL job #19484 
- Move 'Fly to voxel on click' menu item;
- add shortcut for muting audio ...
 2014-01-16 20:17:04 +01:00
Andrzej Kapolka
2c7b6b9696 Skeleton removal checkpoint; compiles, but there are a few bits missing. 2014-01-15 15:14:50 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00
Stephen Birarda
599e3bb9e5 resolve conflicts on merge with upstream master 2014-01-14 16:15:58 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
08bb783777 more windows build work 2014-01-12 14:49:15 -08:00
Brad Hefta-Gaub
825c1c8876 fix windows warnings 2014-01-11 00:07:35 -08:00
Stephen Birarda
b035f74f94 fix for build busters with changed AbstractAudioInterface 2013-12-19 12:39:57 -08:00
Stephen Birarda
eac3b6be65 add AudioInjector class to pull samples from URL and inject 2013-12-19 12:28:37 -08:00
Stephen Birarda
c6dc93c28e fix for 8 channel output devices (HDMI capture) 2013-12-17 16:08:38 -08:00
Stephen Birarda
8ece758107 spacing fix in Audio.cpp 2013-12-17 11:13:45 -08:00
Stephen Birarda
cc5c04c82f remove doubling of right channel for injected audio 2013-12-17 10:31:32 -08:00
Stephen Birarda
a634881477 have linearResampling handle mono to stereo 48KHz conversion 2013-12-17 09:52:42 -08:00
Stephen Birarda
964558d514 add a QAudioOutput object for local loopback 2013-12-17 09:41:28 -08:00
Stephen Birarda
a31f15ee79 don't blow away a channel on local injection loopback 2013-12-16 16:57:30 -08:00
Stephen Birarda
efe05adcae fix audio graphs for new audio infrastructure 2013-12-16 16:52:04 -08:00
Stephen Birarda
30b22a13ad remove an unecessary condition in Audio.cpp 2013-12-16 16:30:04 -08:00
Stephen Birarda
bb93c64d8d some initial audio stat render fixes 2013-12-16 16:21:50 -08:00
Stephen Birarda
90ea978278 fix some clipping in procedural audio 2013-12-16 16:03:46 -08:00
Stephen Birarda
e5d2647e70 fix last input loudness for mouth movement with no depth camera 2013-12-16 16:01:03 -08:00
Stephen Birarda
89beff4253 fix the scope and last input loudness 2013-12-16 15:41:58 -08:00
Stephen Birarda
f7ed8cef8f fixes for all current headsets work 2013-12-16 15:31:05 -08:00
Stephen Birarda
6b644eb130 repair upsampling and local loopback by correcting for limits 2013-12-16 15:15:25 -08:00
Stephen Birarda
2d4a8ca997 fix scope for audio output 2013-12-16 12:19:19 -08:00
Stephen Birarda
cdc6f33128 fix scope for input 2013-12-16 12:16:08 -08:00
Stephen Birarda
1f9ca00317 drive input from buffer callback and output from network 2013-12-16 11:58:23 -08:00
Stephen Birarda
25b7065298 changes for broken test 2013-12-12 17:19:54 -08:00
Stephen Birarda
f17ee1af7a cleanup AudioRingBuffer API 2013-12-12 13:37:18 -08:00
Stephen Birarda
d5aadf6598 repair linear resampling for same number of channels 2013-12-12 10:48:42 -08:00
Stephen Birarda
b06af3cd6c copy all passed samples to AudioRingBuffer 2013-12-12 10:15:43 -08:00
Stephen Birarda
e27aa11216 remove a debug line 2013-12-11 12:03:14 -08:00
Stephen Birarda
af2fa15f55 initial work for change to 48KHz 2013-12-11 12:02:08 -08:00
Stephen Birarda
bcdc066a98 don't set _lastInputLoudness if input is muted 2013-12-06 13:26:40 -08:00
Stephen Birarda
098010e099 don't crash if there is no output 2013-12-06 13:22:07 -08:00
Stephen Birarda
5e73e803e9 fixes for procedural audio input 2013-12-05 14:49:28 -08:00
Stephen Birarda
21076af739 hook audio loudness back to QAudioInput 2013-12-05 14:29:55 -08:00
Stephen Birarda
487209e270 fix bandwidth meter for audio 2013-12-05 13:21:16 -08:00
Stephen Birarda
d1054b3cfc add received audio to buffer via queued connection 2013-12-05 13:17:16 -08:00
Stephen Birarda
80e1b5a4bc some logic and spacing fixes in the audio mixer 2013-12-05 13:05:29 -08:00
Stephen Birarda
d2f7dd2371 resolve conflicts on merge with upstream master 2013-12-05 12:13:11 -08:00
Stephen Birarda
71aca69410 fix rendered scope for new Qt Audio 2013-12-05 11:36:45 -08:00
Stephen Birarda
6765ce2f1f some spacing cleanup in Audio 2013-12-05 10:23:06 -08:00
Stephen Birarda
ab1cd7bd2c fix red/green display in audio debug rendering 2013-12-04 16:24:14 -08:00
Philip Rosedale
c1f96ab6b4 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-04 15:49:30 -08:00
Philip Rosedale
0c32f94116 Better drums 2013-12-04 15:48:41 -08:00
Stephen Birarda
d722e0bf6a repairs to Audio class after merge with upstream master 2013-12-04 14:24:07 -08:00
Stephen Birarda
277aa9dd89 handle conflicts on merge with upstream master 2013-12-04 14:21:00 -08:00
Stephen Birarda
7df6210ba0 Merge remote-tracking branch 'upstream/master' into qt-for-portaudio 2013-12-04 14:20:44 -08:00
Stephen Birarda
560844c138 re-enable rendering and fix sampling algorithim 2013-12-04 13:55:27 -08:00
Stephen Birarda
e339155328 replace missing PortAudio with Qt audio 2013-12-04 12:54:33 -08:00
ZappoMan
bc715085a9 Merge pull request #1304 from PhilipRosedale/master 
Voxel drumming, search function to find leaf voxel containing a point
 2013-12-04 11:28:39 -08:00
Philip Rosedale
8fdd78dc26 Added drum sounds and voxel collision detection 2013-12-03 16:25:23 -08:00
Stephen Birarda
3277cb49a6 Merge remote-tracking branch 'upstream/master' into cleanup 2013-12-03 12:21:03 -08:00
Stephen Birarda
141394a664 replace UDPSocket with QUDPSocket 2013-12-02 13:34:29 -08:00
Philip Rosedale
534c5105b0 echo the right one 2013-11-26 11:46:11 -08:00
Philip Rosedale
09ca2a45db Add local audio monitor option, tweak turning with head 2013-11-26 11:25:06 -08:00
Philip Rosedale
2991c8af61 screen does not flash when voxels are clicked 2013-11-08 14:34:22 -08:00
Andrzej Kapolka
a568e71e37 Merge pull request #1099 from stojce/19433 
Code Review for Job #19433
 2013-10-23 10:03:36 -07:00
stojce
2fcb246923 close button on rear mirror view 2013-10-22 20:42:31 +02:00
Stephen Birarda
00446076b5 remove audio injectors that are starved and not added 2013-10-21 16:04:13 -07:00
Stephen Birarda
80d2df6a49 fix audio ternary indentations 2013-10-17 15:12:34 -07:00
Stephen Birarda
73d3ecccf3 resolve conflicts on merge with upstream master 2013-10-17 14:37:58 -07:00
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
PhilipRosedale
9643c1262c Fix mute button, visualize gaze direction when showing headMouse 2013-10-17 11:03:12 -07:00
Stephen Birarda
7de88898e1 activate appropriate socket after receiving ping reply 2013-10-16 17:51:32 -07:00
stojce
61b213804a #19426 - Add a mute control to the interface 
- OpenGL overlay icon
- mute control
- icons
 2013-10-05 13:18:35 +02:00
Andrzej Kapolka
54116cbc85 Testing audio shutdown before menu destruction. 2013-09-04 16:04:36 -07:00
Stephen Birarda
146e9176eb switch to one channel from PortAudio to resolve USB error 2013-08-20 13:06:30 -07:00
Stephen Birarda
46b064b7d6 initial decoupling of menu from Application 2013-08-15 10:46:51 -07:00
Philip Rosedale
45961b2b64 Collision and click sounds improved 2013-08-08 16:00:50 -07:00
Stephen Birarda
25537f78a1 reset the song mix menu item after clip is done 2013-08-05 12:18:59 -07:00
ZappoMan
fd81053e33 fixed compiler warnings 2013-08-02 18:33:41 -07:00
Stephen Birarda
222a46189f some comments and _songFileBytes reset 2013-08-02 17:50:08 -07:00
Stephen Birarda
d259180778 add option to audio menu to stop the mixed audio 2013-08-02 17:46:23 -07:00
Stephen Birarda
d56b715432 add menu option to mix RAW audio with microphone audio 2013-08-02 17:30:49 -07:00
ZappoMan
9507cd8955 switched to vector 2013-07-23 19:54:29 -07:00
ZappoMan
a162643e1e more removing of SourceID from classes 2013-07-23 19:21:43 -07:00
ZappoMan
c969570e8c working on selected audio 2013-07-22 23:05:42 -07:00
ZappoMan
c301b799c5 first cut at selecting audio sources 2013-07-22 13:54:47 -07:00
Philip Rosedale
984332e638 fixes per review 2013-07-17 09:51:04 -07:00
Philip Rosedale
59810cac99 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-16 16:41:02 -07:00
Philip Rosedale
192ae63789 Colliding with ground, voxels makes interesting sounds and flashes your display 2013-07-16 16:40:50 -07:00
Stephen Birarda
1b48d4f0fc revert removal of extraneous newlines 2013-07-16 12:46:32 -07:00
Stephen Birarda
89d3cfdb6f remove now extraneous newlines after switch to QDebug 2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
Philip Rosedale
edf031b985 improve collision sounds, difference between ground and voxels 2013-07-15 22:42:55 -07:00
Philip Rosedale
d05108e26d Merge branch 'master' of https://github.com/worklist/hifi 2013-07-15 19:59:26 -07:00
Philip Rosedale
eee8c3e570 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-15 16:27:51 -07:00
Philip Rosedale
26c0eb2dea Start to add heartbeat 2013-07-15 16:27:46 -07:00
Stephen Birarda
33ddda2558 correct reference to audio mixer sockaddr_in 2013-07-15 16:02:36 -07:00
Stephen Birarda
a204a8b872 lock the audioMixer to avoid crash when grabbing socket 2013-07-15 16:01:05 -07:00
Stephen Birarda
d389dc6e3a add method to NodeList to set domain IP to local, move mutex lock to node 2013-07-15 15:17:10 -07:00
Philip Rosedale
f8f6b29559 Audio collision sounds are played locally as well as injected 2013-07-15 14:24:21 -07:00
ZappoMan
f415f4081a Fixed a bug in LOD boundaries 
- changed the way we calculate whether or not to render a parent "average" voxel so
  that if any of it's most distant child would not be visible, then it's used instead
  of it's children
- added precalculated value for topFarLeft corner of AABox (optimization)
- changed VoxelSystem::newTreeToArrays() and VoxelTree::encodeTreeBitstreamRecursion()
  to use the same help function for determining this LOD boundary behavior
- deleted old dead code in voxel-server and VoxelTree for picking which node to start
  sending with, since it wasn't being used
- added VoxelNode::furthestDistanceToCamera() which tells you not the distance to the
  center of the voxel, but the distance from the camera to the furthest corner relative
  to the camera.
- added ViewFrustum::getFurthestPointFromCamera() which given an axis-aligned box will
  tell you which vertex of the box is furthest from the camera
 2013-07-15 01:32:14 -07:00
tosh
ac3b95efe7 fixes sliced-away initialization (crashes program during shutdown when running without audio device) 2013-07-13 22:51:57 +02:00
Philip Rosedale
8b9e0426b2 Simple glassy collision sound 2013-07-12 21:34:48 -07:00
Stephen Birarda
76dc01e84e fix audio silence on receive bail 2013-07-11 17:55:59 -07:00
Stephen Birarda
430f255730 type squish in Audio class 2013-07-11 11:10:03 -07:00
Stephen Birarda
b816761a74 use packet version helpers for PACKET_TYPE_MICROPHONE 2013-07-08 14:24:08 -07:00
Stephen Birarda
5062ae8965 rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning 2013-07-08 11:37:39 -07:00
Stephen Birarda
36c6912de8 your agents are now nodes 2013-07-03 10:35:09 -07:00
Philip Rosedale
6fbab462f0 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-01 22:30:06 -07:00
tosh
f062319c2b introduces named constants for bandwidth meter channel indices / max. drag length 2013-07-02 03:53:49 +02:00
tosh
c88642bac2 keeps audio from crashing when sound device is unavailable 2013-06-29 15:58:25 +02:00
tosh
c18400f8b7 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-06-29 15:41:56 +02:00
Philip Rosedale
6cd25294b4 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-26 18:22:16 -07:00
Stephen Birarda
14718980e5 tighten audio latency by clearing the network stack after starves 2013-06-26 18:17:50 -07:00
Stephen Birarda
1c0b256f92 remove echo cancellation from audio code 2013-06-26 16:22:54 -07:00
tosh
7690ace2c3 Merge branch 'master' of git://github.com/worklist/hifi into 19377 
Conflicts:
	interface/src/Audio.cpp
 2013-06-22 05:35:31 +02:00
tosh
290c20bfc7 introduces bandwidth meter / dialog 2013-06-22 04:22:10 +02:00
Philip Rosedale
74f6ee6fca Fixed spacing at parenthesis 2013-06-21 14:33:37 -07:00
Philip Rosedale
13b729d9b4 Fixed problems with ring buffer not handling stereo right, reset audio buffers on spacebar. 2013-06-20 18:49:05 -07:00
Philip Rosedale
56b8a5880d cleaned up stdout audio reporting 2013-06-20 10:59:50 -07:00
Philip Rosedale
c740400224 Merge fixes plus auto jitter buffer 2013-06-20 10:54:58 -07:00
Philip Rosedale
2c8c34f9bd set jitter buffer on application start to 1/2 of a packet 2013-06-20 09:08:37 -07:00
tosh
9c54ef18d3 adds 'Oscilloscope::setColor' and uses it when visualizing echo cancellation 2013-06-20 03:15:01 +02:00
tosh
7588b7f6bb - separates audio system round trip time determination from echo cancellation 
- changes speex parameters to more humble values
- resolves build issues by removing the speex dylibs - static ones are fine
- tightens build script
 2013-06-20 02:00:12 +02:00
Philip Rosedale
bc374d0183 More audio tweaks 2013-06-19 16:02:56 -07:00
tosh
651dc19427 separates echo cancellation from loopback test (intermediate commit) 2013-06-19 23:55:15 +02:00
tosh
755208aaf7 comments unused variable to avoid a compiler warning 2013-06-19 16:19:50 +02:00
tosh
97fc38313b implements audio echo cancellation based on speex 2013-06-19 16:12:25 +02:00
tosh
682a7c9cdf libspeexdsp-based echo cancellation (untested) 2013-06-18 22:18:27 +02:00
Philip Rosedale
216c5d054d working on audio system, added metrics on in/out latency. 2013-06-18 12:16:39 -07:00
Philip Rosedale
002f8c736f Added adjustable audio jitter buffer (in preferences), and simple lowPassFilter (for pert testing compared to LPF) 2013-06-17 18:30:02 -07:00
tosh
66f350d846 echo cancellation: ui, calibration, visualization 2013-06-17 07:16:29 +02:00
Stephen Birarda
ecd03d7b4b replace magic number 1 with sizeof 2013-06-06 11:54:44 -07:00
Stephen Birarda
5bbf96d946 allow avatar agents to ask for audio loopback 2013-06-05 17:31:52 -07:00
Stephen Birarda
2db7b5de4e fix the number of bytes for microphone audio 2013-06-05 14:41:10 -07:00
Stephen Birarda
beb415a851 correct buffer byte constants in AudioRingBuffer 2013-06-05 12:45:07 -07:00
Stephen Birarda
d64b46a6b2 add specialized parsing of audio data to ARB subclasses 2013-06-05 12:11:56 -07:00
Stephen Birarda
4cb00ad54b clean up AudioRingBuffer by subclassing 2013-06-05 11:51:21 -07:00
Stephen Birarda
0f70c9c06b send full quaternion orientation instead of just bearing to audio-mixer 2013-06-04 12:52:09 -07:00
Jeffrey Ventrella
e96503de0d Merge remote-tracking branch 'upstream/master' 2013-06-03 12:26:51 -07:00
Stephen Birarda
0fedf354e0 don't attempt to send microphone audio if AgentList is NULL 2013-06-03 12:10:18 -07:00
Jeffrey Ventrella
8d031b5c2d preparation for extending the avatar ball array to accommodate more touch capabilities 2013-06-03 11:53:00 -07:00
Stephen Birarda
a5a30efec9 CR fixes 2013-05-29 11:42:10 -07:00
Stephen Birarda
5d74a865e8 make audio echo a menu option instead of forcing with mirror 2013-05-29 11:35:32 -07:00
Stephen Birarda
8118e3bf69 type squish in Audio.cpp 2013-05-28 16:23:54 -07:00