Commit graph

98 commits

Author SHA1 Message Date
Andrzej Kapolka
4ca8a10296 Starting on LED tracking. 2013-08-26 14:36:19 -07:00
Andrzej Kapolka
80481747fa Fix for enabling depth-only webcam after startup. 2013-08-07 11:15:37 -07:00
Andrzej Kapolka
f20ac7f4bc Include received video data in bandwidth usage, clear webcam bits when it's
been turned off.
2013-08-07 10:17:04 -07:00
Andrzej Kapolka
bd3c235fe4 Switching between textured and untextured modes. 2013-08-06 16:23:58 -07:00
atlante45
be83bf5635 Fixed fucked up merge 2013-08-02 17:57:53 -07:00
atlante45
bceb416d8a merge 2013-08-02 17:18:35 -07:00
Andrzej Kapolka
5df4fc95f1 Up the bitrate for full frame video to 4x. 2013-08-02 14:21:21 -07:00
Andrzej Kapolka
def4318817 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-02 11:12:59 -07:00
Andrzej Kapolka
61da1826c7 Reduce bitrate for full frame mode. 2013-08-02 11:12:41 -07:00
Mark Peng
6cf42674d5 Merge remote-tracking branch 'upstream/master'
Conflicts:
	interface/src/Application.cpp
	interface/src/Webcam.cpp
	interface/src/Webcam.h
2013-08-02 11:00:05 -07:00
Andrzej Kapolka
12f42358d5 Allow cycling between video send modes. 2013-08-01 15:39:53 -07:00
Mark Peng
6a6c51f80e Add skeleton tracking toggle in options menu in interface. 2013-08-01 15:04:58 -07:00
Andrzej Kapolka
ba9b5888d2 More work on full frame sending. 2013-08-01 13:00:01 -07:00
Andrzej Kapolka
a86ceb2759 More work on full frame video. 2013-07-31 18:18:37 -07:00
Andrzej Kapolka
d18a9dc499 Working on full frame video support. 2013-07-31 17:06:09 -07:00
Andrzej Kapolka
415949cc26 Terminology change to reflect the fact that we're no longer using the mean. 2013-07-31 14:40:33 -07:00
Andrzej Kapolka
729158f882 Added depth smoothing, experimenting with using depth minimum rather than
mean.
2013-07-31 12:19:14 -07:00
Andrzej Kapolka
353d674ad9 Masking tweak. 2013-07-30 15:56:47 -07:00
Andrzej Kapolka
96bd7dbe25 Removed the magic from a number. 2013-07-30 15:30:34 -07:00
Andrzej Kapolka
c787781efb Send color and depth as separate streams (rather than one on top of the other)
so that we can control their bitrates separately.
2013-07-30 15:11:32 -07:00
Andrzej Kapolka
f8ba1c4be1 Use the V channel to provide masking information, indicating invalid depths. 2013-07-30 13:42:29 -07:00
Andrzej Kapolka
3c437076a7 When we have a mean face depth, use that rather than the face size to
estimate the z coordinate.
2013-07-30 11:07:33 -07:00
Andrzej Kapolka
3b4a4daec3 Ignore maximum values when computing the depth. 2013-07-29 18:26:51 -07:00
Andrzej Kapolka
9c0e29b5e6 Use only valid values to compute mean, and use the post-warp data to avoid
breaking on head tilt (because we were using the bounds of the rotated rect,
which included too much background).
2013-07-29 18:16:10 -07:00
Andrzej Kapolka
de52342a14 Working on depth data processing. 2013-07-29 16:04:15 -07:00
Andrzej Kapolka
5812747ef8 Double the bitrate to see if we can reduce the blockiness. 2013-07-29 10:06:03 -07:00
Andrzej Kapolka
353f16b2d0 Style fixes. 2013-07-19 15:56:04 -07:00
Andrzej Kapolka
b5a8c2710c Merge branch 'master' of https://github.com/worklist/hifi into pointy
Conflicts:
	interface/src/Application.h
	interface/src/Audio.h
	interface/src/Webcam.cpp
2013-07-18 18:09:57 -07:00
Andrzej Kapolka
b8be66c6fc Now able to stream depth data. 2013-07-18 17:39:49 -07:00
Andrzej Kapolka
7ce04444fc Most of the way towards working video encoding. 2013-07-18 14:14:44 -07:00
Andrzej Kapolka
8863645dc9 Working on transmitting and receiving the face video. 2013-07-17 18:02:27 -07:00
Andrzej Kapolka
640ecd7f94 Working on integrating LibVPX for VP8 (9?) encoding. 2013-07-17 11:33:36 -07:00
Andrzej Kapolka
401ef45000 Removed keypoint stuff, fixed stupidity leading to fringed edges (was
linearly interpolating the missing values).
2013-07-16 17:56:53 -07:00
Stephen Birarda
1b48d4f0fc revert removal of extraneous newlines 2013-07-16 12:46:32 -07:00
Andrzej Kapolka
905bd9b011 Track features on face, add a mode to render just key points. 2013-07-16 11:54:19 -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
Andrzej Kapolka
5c590638f3 Working on mesh rendering for faces. 2013-07-15 13:12:22 -07:00
Andrzej Kapolka
a59fbfbf3e Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-14 18:21:50 -07:00
Andrzej Kapolka
411cb92300 Working on face rendering as point cloud. 2013-07-14 15:54:29 -07:00
Philip Rosedale
832e81b45f Less skeleton averaging, can see first person arms 2013-07-12 17:00:47 -07:00
Andrzej Kapolka
763e6a2fa1 Merge branch 'master' of https://github.com/worklist/hifi into pointy
Conflicts:
	interface/src/Application.h
2013-07-12 15:34:55 -07:00
Andrzej Kapolka
61f6b8b974 Moved all the avatar bits to their own subdirectory. 2013-07-11 14:53:46 -07:00
Andrzej Kapolka
baca4353a8 Removed stray block. 2013-07-11 11:19:28 -07:00
Andrzej Kapolka
b23875a952 Make sure we shutdown before quitting. 2013-07-11 11:10:14 -07:00
Andrzej Kapolka
cf7408505f Shut down the webcam when it's turned off, but don't delete the grabber (since
it has expensive-to-init state like the face cascade).
2013-07-11 10:53:51 -07:00
Andrzej Kapolka
d4abceba2b Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-11 10:28:26 -07:00
Andrzej Kapolka
b62d2d85c3 Let's try actually releasing the camera when we turn it off. 2013-07-11 10:28:09 -07:00
Stephen Birarda
ca8f25955a switch usec timestamps to uint64_t 2013-07-10 11:46:48 -07:00
Andrzej Kapolka
c43994fe03 Orientation -> rotation. 2013-07-08 12:54:27 -07:00