Commit graph

536 commits

Author SHA1 Message Date
Stephen Birarda
b7b371ba61 resolve conflicts on merge with upstream master 2014-11-11 20:53:24 -08:00
Stephen Birarda
a5a02b5f8a add AudioInjectorLocalBuffer for more control 2014-11-11 16:34:00 -08:00
Stephen Birarda
0e30c65e60 handle cleanup of local injection, volume 2014-11-11 15:12:11 -08:00
Stephen Birarda
83529c1fed fix QIODevice fail in AudioInjector by passing explicit size 2014-11-11 14:45:33 -08:00
Stephen Birarda
cd3877b584 handle local audio output via AudioInjector directly for control 2014-11-11 14:14:43 -08:00
Philip Rosedale
d9141b4010 Merge pull request #3750 from Atlante45/reverb_for_own_voice
Reverb for own voice
2014-11-11 10:52:26 -08:00
Stephen Birarda
d083e75d2d groundwork for better locally looped audio 2014-11-11 09:59:10 -08:00
Philip Rosedale
c965c21702 Merge pull request #3758 from ey6es/master
Mirror/warning fixes.
2014-11-10 17:23:43 -08:00
Philip Rosedale
885a93b7e3 Merge pull request #3769 from birarda/plugs
add guard for handling of local audio
2014-11-10 17:20:19 -08:00
Stephen Birarda
dabc2b23a3 add a guard in case local audio cannot be handled 2014-11-10 15:51:56 -08:00
Atlante45
02b401701f Set a minimum mute intervalle in the mixer 2014-11-10 15:46:36 -08:00
Atlante45
125ef0e3e2 make pulsate function into a cos 2014-11-10 15:12:40 -08:00
Atlante45
53fb9e9047 make mute icon pulsate when muted 2014-11-10 14:11:17 -08:00
Andrzej Kapolka
431bb0af1d Merge branch 'master' of https://github.com/highfidelity/hifi
Conflicts:
	interface/src/Application.cpp
2014-11-10 11:46:09 -08:00
Stephen Birarda
2ca673175a rename StdDev to StDev, patch its leak 2014-11-07 17:15:54 -08:00
Andrzej Kapolka
6445b3aa5d Linux warnings fixes. 2014-11-07 15:59:16 -08:00
Stephen Birarda
bd8b71a02a complete handling of local audio loopback 2014-11-07 11:05:01 -08:00
Stephen Birarda
f1a238a6c2 piping for local UI sounds 2014-11-07 10:08:09 -08:00
Atlante45
011e531971 Magic numbers and casts 2014-11-07 14:41:59 +01:00
Atlante45
dcfeef4712 Reference and comments 2014-11-07 00:24:37 +01:00
Atlante45
1e6cadc7c1 Extra lines 2014-11-07 00:06:57 +01:00
Atlante45
4dc40c9e84 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_for_own_voice 2014-11-06 23:17:53 +01:00
Atlante45
efc86b9f75 Remove debug 2014-11-06 17:42:27 +01:00
Atlante45
ff197a2f64 Base implementation for own reverb 2014-11-06 12:46:37 +01:00
Philip Rosedale
688bd0f34f first pass audio mixer automatic muting of noisy streams, tour guide improvements, new lightExample.js, hair hangs over cone 'body' 2014-11-05 16:58:58 -08:00
Philip Rosedale
cf121a9fe5 Merge branch 'master' of https://github.com/worklist/hifi 2014-10-28 20:22:40 -07:00
Philip Rosedale
f10aeaffab working on audio mixer muting 2014-10-28 20:22:33 -07:00
Atlante45
847ef64b66 move audio env data over to new packet 2014-10-24 14:27:55 -07:00
Atlante45
8ccbfcf695 code cleanup 2014-10-22 16:41:41 -07:00
Atlante45
94f66ef37a Reverb logic tweaks 2014-10-20 15:35:01 -07:00
Atlante45
6f9557fe67 Do not destroy script reverb settings 2014-10-20 15:06:02 -07:00
Atlante45
37b47b52d3 Stream reverb settings from mixer to interface 2014-10-20 11:49:57 -07:00
Atlante45
0f128509d8 removed old processReceivedAudio method 2014-10-16 10:58:19 -07:00
NextPrior
a0a5530641 Initial reverb implementation
Conflicts:
	interface/CMakeLists.txt
	interface/src/Audio.cpp
	interface/src/Audio.h
	libraries/script-engine/src/ScriptEngine.cpp
2014-10-13 18:13:51 -07:00
Philip Rosedale
75e536235c Avatars look at your camera, not your avatar. Improvements to lookAt code 2014-09-24 14:38:44 -07:00
Craig Hansen-Sturm
90379ee7eb frame and channel counts are now consistently uint32_t / float32_t replaces float 2014-09-20 04:50:11 -07:00
ZappoMan
9cbc53abc3 pack position and orientation in silent frames 2014-09-16 13:06:46 -07:00
Craig Hansen-Sturm
089267a937 completely remove new audio objects from playback rendering path when they are unused 2014-09-14 12:26:25 -07:00
Craig Hansen-Sturm
2c7d15c01b disable input gain/mute 2014-09-12 18:32:28 -07:00
Craig Hansen-Sturm
ecae9d5e85 compiler warnings 2014-09-11 17:20:15 -07:00
Craig Hansen-Sturm
ca4d1375f5 fix for recent stereo/mono and echo local server regression 2014-09-10 16:21:06 -07:00
Craig Hansen-Sturm
015fdec6bd Merge branch 'audio-windows' of https://github.com/chansensturm/hifi into audio-windows 2014-09-10 13:05:52 -07:00
wangyix
7a2897fb6b fixes/patches for win32/vs2013 startup and shutdown 2014-09-10 12:24:59 -07:00
Craig Hansen-Sturm
424cffcd99 remove stray debugging info 2014-09-08 15:33:24 -07:00
Craig Hansen-Sturm
cb4aab3902 allocate 8x buffer size (for pulse audio) / more audioGain loop unrolling w/frame alignment check 2014-09-08 15:28:55 -07:00
Craig Hansen-Sturm
04eca22a50 allocate 4x initial input buffer size 2014-09-08 14:28:53 -07:00
Craig Hansen-Sturm
f309875069 formatting/renaming 2014-09-06 02:50:37 -07:00
Craig Hansen-Sturm
7a5ec429d1 audio rendering loop now uses input-gain, tone-generator, noise-generator, and post-generator-gain objects / audiobuffer object now shared between all new audio objects / zero buffer copy between new objects / inline tone-generator code removed / new audio options for generators 2014-09-06 02:29:48 -07:00
Atlante45
2448229b46 fix for crash in Audio 2014-08-27 16:03:53 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00