Commit graph

2127 commits

Author SHA1 Message Date
Andrzej Kapolka
5194fb2ee6 Don't bother with testing the ignore orientations stuff. 2013-06-21 13:58:49 -07:00
Andrzej Kapolka
0e223b90d9 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 11:35:23 -07:00
Andrzej Kapolka
00eba63e4e Added various options to test for voxel avatars, manual third person mode
(also, cleaned up the camera switching a little).
2013-06-21 11:33:38 -07:00
Andrzej Kapolka
3de76c9e15 Approach the webcam position rapidly. 2013-06-20 16:28:48 -07:00
Andrzej Kapolka
281aee1f12 Increased smoothing substantially to reduce effect of jittering face rect. 2013-06-20 16:22:46 -07:00
Andrzej Kapolka
8cffaf7cc0 Fixed includes. 2013-06-20 16:09:24 -07:00
Andrzej Kapolka
7e34bef01e Attempt to fuse gyro readings with webcam data. 2013-06-20 16:07:33 -07:00
Stephen Birarda
8b7b0d542a send the interface startup time to log stash 2013-06-20 15:34:17 -07:00
Andrzej Kapolka
02b881aa33 Increased the camera distance in mirror mode to avoid clipping. 2013-06-20 15:08:46 -07:00
Andrzej Kapolka
b0dd5223e1 Avatar head roll/lean based on webcam data. 2013-06-20 14:20:03 -07:00
Andrzej Kapolka
b14a0c1554 Reset webcam along with other sensors on spacebar, added settings config for
non-Apple.
2013-06-20 11:44:47 -07:00
Andrzej Kapolka
6493f3aa44 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-20 10:08:58 -07:00
ZappoMan
517ff0f3cf Merge pull request #565 from tschw/19371
Code Review for Job #19371
2013-06-19 21:08:55 -07:00
Philip Rosedale
5dae92d610 Merge pull request #560 from ZappoMan/occlusion_culling
Occlusion culling optimizations
2013-06-19 19:26:56 -07:00
tosh
72a29979d0 Merge branch 'master' of git://github.com/worklist/hifi into 19371
Conflicts:
	interface/CMakeLists.txt
2013-06-20 03:46:25 +02:00
tosh
9c54ef18d3 adds 'Oscilloscope::setColor' and uses it when visualizing echo cancellation 2013-06-20 03:15:01 +02:00
Andrzej Kapolka
0dc0552f50 Basic Haar cascade/CamShift tracking. 2013-06-19 18:02:26 -07:00
ZappoMan
cadd596508 implement partitioned CoverageRegions in CoverageMap to further optimize polygon compares 2013-06-19 17:52:01 -07: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
tosh
651dc19427 separates echo cancellation from loopback test (intermediate commit) 2013-06-19 23:55:15 +02:00
Andrzej Kapolka
d4d662b3f5 Convert frame to grayscale and equalize. 2013-06-19 14:13:42 -07:00
ZappoMan
1284f9d09a naming cleanup and some optimizations 2013-06-19 13:45:13 -07:00
Andrzej Kapolka
85dfd57547 If we're going to take the parameters, we should probably apply them. 2013-06-19 11:32:52 -07:00
Andrzej Kapolka
ee783be628 Wrap at 128 characters. 2013-06-19 11:29:50 -07:00
Andrzej Kapolka
2e52925496 Bump this up to 60 again. 2013-06-19 11:22:41 -07:00
Andrzej Kapolka
776145b74c Use a CMake module for UVCCameraControl. 2013-06-19 11:14:32 -07:00
Andrzej Kapolka
46b3d829d5 Round FPS display. 2013-06-19 11:06:51 -07:00
Andrzej Kapolka
68371f8c3f Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-19 11:04:12 -07:00
Andrzej Kapolka
1651044234 Disable auto exposure, set exposure rather high (which causes a lower exposure
time).
2013-06-19 11:02:48 -07:00
Andrzej Kapolka
963b033e41 Fixed warning on OS X, playing with settings. 2013-06-19 10:50:58 -07:00
Andrzej Kapolka
352f7ca3cf Provide option to enable/disable webcam (disabled by default). 2013-06-19 10:46:54 -07:00
Andrzej Kapolka
dbde66cbd5 Use trigger to change the state of the menu actions; that way, we get the
callbacks.
2013-06-19 10:32:55 -07:00
Andrzej Kapolka
f14108c9e1 Added code attribution/disclaimer. 2013-06-19 10:25:59 -07:00
Andrzej Kapolka
344b8a31c8 Updated header. 2013-06-19 10:20:01 -07:00
Andrzej Kapolka
1757f32fd0 Added source files for UVCCameraControl. 2013-06-19 10:18:48 -07:00
tosh
755208aaf7 comments unused variable to avoid a compiler warning 2013-06-19 16:19:50 +02:00
tosh
7342b7a774 Merge branch 'master' of git://github.com/worklist/hifi into 19371 2013-06-19 16:15:38 +02:00
tosh
97fc38313b implements audio echo cancellation based on speex 2013-06-19 16:12:25 +02:00
Andrzej Kapolka
cc9f8bc717 Adjustments to UVCCameraControl invocation. 2013-06-18 18:15:52 -07:00
Andrzej Kapolka
8ec8e0b9d8 Avoid name mangling on the symbol. 2013-06-18 17:04:02 -07:00
Andrzej Kapolka
2e033631eb Make our call to configureCamera on OS X. 2013-06-18 16:50:15 -07:00
Andrzej Kapolka
556a64eab9 Adding UVCCameraControl. 2013-06-18 16:47:11 -07:00
Andrzej Kapolka
4519b43072 Initialization order fix. 2013-06-18 14:48:58 -07:00
Andrzej Kapolka
9cb671aa56 Slightly better fps computation. 2013-06-18 14:43:19 -07:00
Andrzej Kapolka
e1f76b2bdf Limit the rate at which we acquire images, since OS X doesn't block like Linux
does.
2013-06-18 14:37:24 -07:00
Andrzej Kapolka
e98d1f9a92 Let's try getting the cam's fps. 2013-06-18 14:18:33 -07:00
Andrzej Kapolka
2ad8585f26 Show the acquisition fps. 2013-06-18 14:11:13 -07:00
Andrzej Kapolka
2a60414968 Set the desired webcam resolution and fps, report what we actually get. 2013-06-18 13:56:58 -07:00
Andrzej Kapolka
0fa710e518 Let's try using glPixelStore to specify the widthStep. 2013-06-18 13:39:54 -07:00
Andrzej Kapolka
2c2297b2bd Let's try using widthStep rather than nChannels and computing the alpha
values.
2013-06-18 13:30:31 -07:00