Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kinect2 #97

Open
wants to merge 198 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
198 commits
Select commit Hold shift + click to select a range
d32bbd2
Fix C compilation
eddiecohen Jun 19, 2013
4d23338
OPENNITWO-493: Single pixel translation is wrong when image res is 12…
eddiecohen Jun 23, 2013
36af9cb
Link console: allow running a single command and exit
eddiecohen Jun 25, 2013
023206e
1. Stop streams when closing device.
Jun 12, 2013
de66e92
Submodule update
Jun 12, 2013
623da2a
Merge branch 'develop' of ssh://git/localhome/GIT/Software/OpenNI2 in…
Jun 12, 2013
b384024
Merge branch 'develop' of ssh://git/localhome/GIT/Software/OpenNI2 in…
Jun 17, 2013
d8ae767
Merge branch 'develop' of ssh://git/localhome/GIT/Software/OpenNI2 in…
Jun 19, 2013
7c248e0
Merge branch 'develop' of ssh://git/localhome/GIT/Software/OpenNI2 in…
Jul 2, 2013
5b4809d
Support gold linker in compilation
eddiecohen Jul 9, 2013
b8b6f5e
Update PSCommon (fix Linux non-highres timers)
eddiecohen Jul 9, 2013
7aeb31a
Bug Fix: no even frame indexes from Capri devices.
eddiecohen Jul 14, 2013
620a160
Merge remote-tracking branch 'origin/propertiesFix' into develop
eddiecohen Jul 16, 2013
cc226bc
Update version to 2.3.0.1
eddiecohen Jul 16, 2013
5619ffd
Added mirror support for Kinect.
tomoto Aug 18, 2013
88bfd6a
Better encapsulation of Windows & NUI dependent stuff related to dept…
tomoto Aug 18, 2013
df9135b
Sorry for fixing another bug of image registration x cropping combina…
tomoto Aug 18, 2013
20eb30f
Extended property support for Kinect.
tomoto Aug 19, 2013
64130fd
modified implicit narrowing cast to explicit cast
MasWag Jan 3, 2000
4c02420
More readable IR&Depth resolution match check
Jul 18, 2013
1a989e2
NITETWO-329: Sync fixes in PlayerStream
Jul 29, 2013
5af4e05
NITETWO-330: Write to log successful context shutdown
Jul 30, 2013
8fb52ba
Merge branch 'develop' of ssh://git/localhome/GIT/Software/OpenNI2 in…
Jul 30, 2013
d197ceb
Update release notes with prerequisites
eddiecohen Jul 30, 2013
8e070ee
Add release notes and change log to the installation
eddiecohen Jul 30, 2013
3d800af
coordinate converted: now also supports depth values in 100 um.
eddiecohen Jul 31, 2013
07828c0
PSLink: Set depth stream default resolution to QQVGA on ARM and QVGA …
Jul 31, 2013
ca233b2
PSLink: Remove assertions on HandlePacket errors
Jul 31, 2013
ecffeaa
Update version to 2.3.0.4.
eddiecohen Aug 1, 2013
7125977
Make sure FOV is zero if not supported by stream
eddiecohen Aug 5, 2013
b66e05a
PSLink.ini - can't set mirror on/off
eddiecohen Aug 5, 2013
636204f
Merge branch 'test_device' into develop
eddiecohen Aug 6, 2013
052a255
Merge branch 'pr/n32_tomoto' into develop
eddiecohen Aug 19, 2013
8fea30e
Merge branch 'pr/n33_tomoto' into develop
eddiecohen Aug 19, 2013
d58793f
PSLink: Handle some link error codes that weren't handled
eddiecohen Aug 20, 2013
f58b0dd
Update PSCommon
eddiecohen Aug 22, 2013
c7c64c4
PSLink: fix error codes not printing correctly
eddiecohen Aug 22, 2013
9647ab5
PS1080Console Bug Fix: "startread" did not work properly.
eddiecohen Aug 22, 2013
9bb1300
PS1080: cleaner handling of cases where magic isn't found in beginnin…
eddiecohen Aug 22, 2013
c2f4111
Update version to 2.3.0.5
eddiecohen Aug 28, 2013
2315b46
PS1080: Added support for FW 5.9.
ZivHendel Aug 28, 2013
ad234a9
PS1080: Updated version to 5.2.0.0.
ZivHendel Aug 28, 2013
08251e4
OniFile: allow setting video mode if not changed
eddiecohen Aug 29, 2013
824ee85
Java SimpleViewer: allow passing file name in command prompt
eddiecohen Aug 29, 2013
61cad6e
SimpleViewer.java: add support for IR streams
eddiecohen Aug 29, 2013
19a3516
Reverted "PS1080: cleaner handling of cases where magic isn't found i…
ZivHendel Aug 29, 2013
1eca764
Fix compilation
eddiecohen Aug 29, 2013
1e9ac33
PS1080: Added support for the fast zoom crop (640x480 regular -> 640x…
ZivHendel Aug 29, 2013
a1bbba1
NiViewer: Added the 'z' key to demonstrate the fast zoom crop. It onl…
ZivHendel Aug 29, 2013
8f79a71
Moved fastzoomcrop property to be in the color stream, where it belon…
Sep 1, 2013
3814563
Update PSCommon
eddiecohen Sep 3, 2013
889ecf5
add commands:
Aug 21, 2013
fe7a3a9
fix the Max Pixel IR Value for 1080 and 1200
Sep 15, 2013
ba4c311
Merge branch 'develop' of ssh://git/localhome/GIT/Software/OpenNI2 in…
Sep 15, 2013
41bf512
Update version to 2.3.0.6
eddiecohen Sep 16, 2013
3d4500e
Merge branch 'android' into develop
eddiecohen Sep 23, 2013
f8b1193
Update version to 2.3.0.7
eddiecohen Sep 23, 2013
eb87d49
Android: build with -j6
eddiecohen Sep 24, 2013
01c91f8
Android: final tar should be under "Final" dir
eddiecohen Sep 24, 2013
aac9fc9
Update version to 2.3.0.8.
eddiecohen Sep 24, 2013
fc3a479
Update README file
eddiecohen Sep 24, 2013
a11b117
Remove PS1080 FPS printing (OpenNI now calculates it)
eddiecohen Sep 24, 2013
583777c
Update README file for Android required SDK
eddiecohen Sep 29, 2013
3ea5563
Don't attempt opening devices if none are connected
Oct 2, 2013
a959fb4
OniFile: allow playback of recordings that don't have the cropping pr…
eddiecohen Aug 6, 2013
38f8d84
Bug Fix: potential crash when playback restarts
eddiecohen Aug 6, 2013
a944edd
Fix compilation warning
eddiecohen Sep 29, 2013
fe966cc
Update version to 2.3.0.9
eddiecohen Sep 29, 2013
4f4849b
Merge remote-tracking branch 'origin/AutoRecorder' into develop
Sep 30, 2013
6478002
OniFile: Fix a potential deadlock if calling stop() immediately after…
eddiecohen Oct 1, 2013
d6ac837
Bug Fix: potential crash when closing recorder (created corrupt files)
eddiecohen Oct 1, 2013
d54103a
Merge pull request #44 from adamantivm/simpleread-android-fix
eddiecohen Oct 3, 2013
e18b7da
Remove GL Header usage
eddiecohen Oct 7, 2013
e66afa6
Fix compilation on Linux
eddiecohen Oct 7, 2013
2164450
Fix compilation on OSX
eddiecohen Oct 7, 2013
e9a836f
Fix harvest script on Windows
eddiecohen Oct 7, 2013
0b8b50e
Android: Allow NiViewer to open ONI files
eddiecohen Oct 7, 2013
dfd1c4a
don't try to open devices if non is found
eddiecohen Oct 9, 2013
46c1f20
NiViewer: use an histogram for IR as well
eddiecohen Oct 9, 2013
e2cf947
NiViewer: draw textures at center of area
eddiecohen Oct 9, 2013
87b8f68
NiViewer: create histogram according to actual max depth value and no…
eddiecohen Oct 9, 2013
5146634
NiViewer: make help screen nicer
eddiecohen Oct 9, 2013
9d2872b
OpenNIView: use requested size. Don't override onMeasure().
eddiecohen Oct 9, 2013
ee22d49
NiViewer: allow adding more streams and removing them
eddiecohen Oct 9, 2013
daa5721
Linux: fix compilation
eddiecohen Oct 10, 2013
a636634
Fix a potential division-by-zero crash
eddiecohen Oct 10, 2013
8340096
Android NiViewer now supports orientation changes
eddiecohen Oct 10, 2013
b8cc066
fix bug - skip commented lines (marked with #)
Sep 23, 2013
02b8328
PSLink: Add ReadDebugData command in the console
Oct 10, 2013
4a65279
rename LINK_COMMAND_GET_TEMP_LIST to PS_COMMAND_GET_TEMP_LIST (conven…
Oct 10, 2013
ae720e5
Don't shutdown OpenNI for rotation
eddiecohen Oct 15, 2013
b9505ad
Fix log message when setting thread priority on Android
eddiecohen Oct 16, 2013
7439145
UpdateVersion script now also updates Android projects
eddiecohen Oct 16, 2013
6a8c476
Update version to 2.3.0.10
eddiecohen Oct 16, 2013
dafd195
fix all projects to use API level 14 (v4.0 and up)
eddiecohen Oct 16, 2013
d48bead
Android: fix doc
eddiecohen Oct 16, 2013
f0ae858
Avoid shutting down OpenNI on rotation in SimpleRead and SimpleViewer…
eddiecohen Oct 16, 2013
5d91fe4
Merge remote-tracking branch 'origin/support_100_um_depth_for_PS1200'…
eddiecohen Oct 16, 2013
8b2d183
Merge remote-tracking branch 'origin/Add_playback_speed_support_from_…
eddiecohen Oct 17, 2013
d81acfd
Fix python indentation
eddiecohen Oct 17, 2013
500fb37
Linux: fix compilation
eddiecohen Oct 17, 2013
dd6e0b7
Linux: Fix compilation
eddiecohen Oct 17, 2013
7304b01
PSLink: Add the option to turn on firmware log
eddiecohen Oct 17, 2013
4588ef1
Update version to 2.3.0.11
eddiecohen Oct 17, 2013
e03abb4
Bug Fix: log stream might lose the first packet
eddiecohen Oct 17, 2013
4d1429a
Merge branch 'PeanutSD' into develop
Oct 20, 2013
2bfb7ab
Merge branch 'develop' of ssh://git/localhome/GIT/Software/OpenNI2 in…
Oct 20, 2013
3736c18
Merge branch 'release_2.2' into develop
eddiecohen Oct 22, 2013
cfe98b2
remove glh from NOTICE file
eddiecohen Oct 22, 2013
4fda0e4
Update version to 2.3.0.12
eddiecohen Oct 22, 2013
dc43211
Switch to using common android makefile
eddiecohen Oct 23, 2013
e3ac847
ReleaseVersion script: fix cygwin warning when running from Windows
eddiecohen Oct 23, 2013
3de36d5
jni makefile wasn't using common one
eddiecohen Oct 23, 2013
dba076e
Android: have a Native dir in the release for use by native libraries…
eddiecohen Oct 23, 2013
f436056
Android: remove unused code from samples
eddiecohen Oct 24, 2013
c17e0ee
Android samples: don't start thread if stream wasn't started...
eddiecohen Oct 24, 2013
e1011c5
Allow overriding drawing in OpenNIView
eddiecohen Oct 24, 2013
538e26d
Capri: don't set USB interface if not doing reset (console mode)
eddiecohen Oct 24, 2013
baaa24c
Capri: 100 um mode did not appear in supported modes list
eddiecohen Oct 27, 2013
08e3aee
Couldn't set video mode to IR stream
eddiecohen Oct 27, 2013
6c31225
OpenNIView: throw exception if encountered an unknown format
eddiecohen Oct 27, 2013
5e94a6c
OpenNIView: move draw area calculations to java
eddiecohen Oct 27, 2013
03a9dff
OpenNIView: expose drawing area to children
eddiecohen Oct 27, 2013
a44d69d
Fixed possible buffer overflow when loading drivers on Android
Oct 28, 2013
69701ed
Use xnLog to init log, instead of doing it ourselves
eddiecohen Oct 28, 2013
8d41379
NiViewer: fix drawing according to aspect ratio
eddiecohen Oct 28, 2013
dc1ca1e
OSX: fix compilation
eddiecohen Oct 29, 2013
06a92d2
Remove unneeded dependency in NiViewer
eddiecohen Oct 30, 2013
de6b647
Don't bring jni folder for OpenNIAndroidLibrary
eddiecohen Oct 30, 2013
ef22890
remove unused lines from script
eddiecohen Oct 30, 2013
8e8c5e2
android doc: rename "Samples Tutorial" to "Getting Started"
eddiecohen Oct 30, 2013
6465684
Place OpenNIForAndroid result jar in the release
eddiecohen Oct 30, 2013
431d7d9
Fix release on Linux
eddiecohen Oct 30, 2013
6c712f3
Update version to 2.3.0.13
eddiecohen Oct 30, 2013
06f1590
Bug Fix: prebuilt binaries were sometimes not signed
eddiecohen Oct 31, 2013
cb28f0f
NiViewer side-by-side mode: don't draw in upper half only. use entire…
eddiecohen Oct 31, 2013
44565ac
Update version to 2.3.0.14
eddiecohen Oct 31, 2013
31c69dd
Copy assets for samples as well
eddiecohen Nov 3, 2013
84ec2e7
Add setGain(), getGain(), setExposure() and getExposure() methods to …
eddiecohen Nov 3, 2013
7d57bfc
Bug Fix: getImageRegistrationMode() should return off if property is …
eddiecohen Nov 3, 2013
325cd52
Fix indentation
eddiecohen Nov 3, 2013
261a5bd
Remove the XN_COMPILER_ASSERT macro. It was causing some compilation …
eddiecohen Nov 3, 2013
f761244
Use Python 2.x interpreter in build scripts.
jeadorf Oct 13, 2013
8e49b5e
Use Python 2 interpreter in scripts (thanks jeadorf)
eddiecohen Nov 3, 2013
27654ba
Add getDepthColorSyncEnabled() to Device class
eddiecohen Nov 3, 2013
a24dd13
change python 2 to python 2.7
Nov 4, 2013
2020ade
Update files to include correct license
eddiecohen Nov 4, 2013
f83b28f
Fix warnings on old versions of gcc
eddiecohen Nov 4, 2013
4f83b61
Merge branch 'develop' of ssh://git/localhome/GIT/Software/OpenNI2 in…
eddiecohen Nov 4, 2013
3131fbb
Merge branch 'Move_LibJpeg_to_XnLib' into develop
eddiecohen Nov 4, 2013
e124354
Fix android compilation
eddiecohen Nov 4, 2013
ddde012
OpenNIView: Moved all GL logic to java (easier to change in derived c…
eddiecohen Nov 5, 2013
a940ebc
OpenNIView: instead of alpha, allow setting the base color
eddiecohen Nov 5, 2013
5f21b98
Bug Fix: no logs were printed to the android log
eddiecohen Nov 5, 2013
3de8de3
PSLink Bug Fix: 1 mm depth did not apear in supported modes list
eddiecohen Nov 5, 2013
5ab8627
OpenNIView: correct draw of cropped frames
eddiecohen Nov 5, 2013
f3b0808
Bug fix: potential crash in JpegCodec
eddiecohen Nov 7, 2013
e000413
Fix indentation
eddiecohen Nov 10, 2013
8655a95
OpenNIView: rename draw() to onDrawGL()
eddiecohen Nov 10, 2013
482677c
Add FPS calculation to NiViewer
eddiecohen Nov 10, 2013
d024e18
ReleaseVersion script wasn't cleaning before...
eddiecohen Nov 10, 2013
53dc98d
Update version to 2.3.0.15
eddiecohen Nov 10, 2013
69dff6e
Fix header guards to be compliant with C standard
eddiecohen Nov 10, 2013
33355e4
Merge branch 'release_2.2' into develop
eddiecohen Nov 12, 2013
6a673c2
Fix typo
awesomebytes Apr 23, 2014
3fef6ec
Merge pull request #1 from awesomebytes/patch-1
jrpowers Apr 23, 2014
299557b
Fixed dead link.
philnelson Apr 23, 2014
2106c63
Merge pull request #2 from philnelson/master
vikasreddy Apr 24, 2014
c23c225
Added check for MSVS2013 as GetVersionEx is marked as depricated.
larshg May 4, 2014
a3eef6c
Make compatible with VS2013 express.
larshg May 5, 2014
3de7313
Merge branch 'master' into develop
jrpowers May 5, 2014
4329348
Merge pull request #6 from larshg/DevicesKinectProblem
jrpowers May 5, 2014
8124235
Merge pull request #4 from larshg/develop
jrpowers May 5, 2014
a824720
Fix Visual Studio {2010 Ultimate,Ultimate 2012,Express 2013 for Deskt…
ntisserand May 5, 2014
2c9251f
OS X clang compilation fix by allowing certain warnings
jrpowers May 17, 2014
9062d57
Adding instructions for prereqs and building on OS X.
jrpowers May 17, 2014
24df31a
Try /usr/local before /opt/local on Mac OS X.
May 19, 2014
d6dabb2
Make Java-dependent targets optional and disabled by default.
May 19, 2014
e3fc00c
Adding missing java dependency.
May 19, 2014
cd0b690
Minor Makefile cleanup.
May 19, 2014
0f78396
Add XN_STREAM_PROPERTY_PARAM_COEFF in notifyAllProperties()
KHeresy May 21, 2014
58d326f
Merge branch 'Fix_Kinect_recording_ONI_for_NiTE' into Fix_Kinect_reco…
KHeresy May 30, 2014
cc91987
Merge pull request #10 from KHeresy/Fix_Kinect_recording_ONI_for_NiTE…
ntisserand May 30, 2014
0197440
More ignore.
ntisserand May 30, 2014
caae0e0
More ignore.
ntisserand Jun 10, 2014
1ec5eb2
Make JPEG context initialization and destruction more robust & flexible.
KHeresy May 30, 2014
b3c04e7
Fix MSVC12 warnings.
ntisserand Dec 22, 2014
ccdd8e1
Kinect2 OpenNI2 driver: First driver port
mvm9289 Apr 18, 2014
bb7bcc9
Kinect2 driver: Playing recorder Kinect2 color stream crash fixed
mvm9289 Apr 24, 2014
ded7bd8
Kinect2 driver: Common base timestamp for all streams
mvm9289 Apr 24, 2014
a5261e0
Kinect2 driver: Refactor and cleanup
mvm9289 Apr 25, 2014
cdf6a22
Kinect2 driver: Depth map interpolation when DEPTH_TO_COLOR_REGISTRATION
mvm9289 Apr 28, 2014
2c964d1
Kinect2 driver - Bug Fix: Wait some time after opening the Kinect sen…
mvm9289 Nov 20, 2014
445cf8e
Kinect2 driver - Cleanup: Replace all tabs by 2 spaces + remove some …
mvm9289 Nov 20, 2014
26396ec
Kinect2 driver: Add README file
mvm9289 Dec 4, 2014
0eee26e
Fix Kinect2 VS project build settings
ntisserand Dec 22, 2014
f724fc9
Add Kinect2 driver project to OpenNI Visual Studio solution
mvm9289 Dec 4, 2014
70da8eb
Upgrade all VS projects to MSVC12 (Visual Studio 2013).
ntisserand Dec 22, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix C compilation
eddiecohen committed Jun 19, 2013
commit d32bbd2512656b608b734591b10bfd8aabacfc77
6 changes: 3 additions & 3 deletions Include/OniCTypes.h
Original file line number Diff line number Diff line change
@@ -83,13 +83,13 @@ typedef struct
} OniDeviceInfo;

struct _OniDevice;
typedef _OniDevice* OniDeviceHandle;
typedef struct _OniDevice* OniDeviceHandle;

struct _OniStream;
typedef _OniStream* OniStreamHandle;
typedef struct _OniStream* OniStreamHandle;

struct _OniRecorder;
typedef _OniRecorder* OniRecorderHandle;
typedef struct _OniRecorder* OniRecorderHandle;

/** All information of the current frame */
typedef struct