Skip to content

Commit 8f199ca

Browse files
committed
Updated codebase to the latest OpenNI / Sensor version (1.1.0.39 / 5.0.1.32)
1 parent b7cd39d commit 8f199ca

File tree

157 files changed

+9106
-3066
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+9106
-3066
lines changed
526 KB
Binary file not shown.
530 KB
Binary file not shown.
841 KB
Binary file not shown.
4.14 MB
Binary file not shown.

Bin/SensorKinect-Win32-5.0.0.exe

-8.83 MB
Binary file not shown.

CHANGES

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
Detailed Change log:
2+
--------------------
3+
4+
Version 5.0.1.32 (Unstable version - Apr 11th 2010)
5+
---------------------------------------------------
6+
* Fixing log prints of resolutions (-1 appeared as MAX_UINT64...) to the resolution name.
7+
* Linux Bug Fix: Server creates two log files, one in the client folder and one in /var/log/primesense/XnSensorServer
8+
* Fixed a memory leak when rewinding old XNS files.
9+
* Win32: WIX installer (replacing NSIS)
10+
* Fixed wrong version in XnDeviceFile
11+
12+
Version 5.0.1.31 (Stable version - Apr 11th 2010)
13+
-------------------------------------------------
14+
* Fix BULK timeout - it was too small...
15+
* Bug Fix: IR only works in QVGA...
16+
* Added 64bit support for the installers.
17+
* Fix wrong uses of the XN_IS_STATUS_OK macro (value is evaluated twice).
18+
* Adding support for MJPEG pass-through.
19+
* Adding initial support for new CMOS interfaces
20+
* Adding initial JPEG support
21+
* Fix for UAC installer problems.
22+
* Fixed uninstall without OpenNI.
23+
* Set minimum OpenNI version check in the installer.
24+
* Fix seeking to first frame in old XNS files.
25+
* Bug Fix: Client would fail to connect if trying to connect while server is shutting down.
26+
* Improving the timestamps algorithm.
27+
* performance improvement when enumerating for image nodes - a sensor should only be checked once.
28+
* improving error message for setting grayscale8 in low resolutions.
29+
* Improve thread-safety when starting server
30+
* Bug Fix: a crash when trying to open a non-existing XNS file.
31+
* Bug Fix: a potential crash if Init of depth generator fails.
32+
* Sensor now supports the Device Identification capability.
33+
* Server: fixing a deadlock problem between closing a stream and getting new data from it. This was done by splitting the sensor lock into two locks: one for changes on the sensor and one for changing the stream collection.
34+
* MultiProcess Bug Fix: the lock on a sensor didn't exist, so nothing was synchronized.
35+
* ImageGenerator now also changes InputFormat when changing resolution if needed (when switching from hi-res to normal & vice versa).
36+
* Adding frame IDs to Audio (just counting)
37+
* restoring defaults to QVGA.
38+
* Add support for sensors with no image CMOS.
39+
* Updated low-bandwidth USB devices buffer information.
40+
* Added the Asus WAVI auto-detection for Win32.
41+
* Low bandwidth devices now use bigger USB delays.
42+
* New defaults are now VGA, uncompressed.
43+
* Initial support for low-band devices:
44+
1. Image, IR and audio does not enumerate.
45+
2. Defaults changed to QVGA, compressed.
46+
47+
Version 5.0.0.25 (Unstable version - Jan 6th 2011)
48+
--------------------------------------------------
49+
* Bug fix: infinite loop in server when a client tries to disconnect and streams can't be closed (usb timeout for example).
50+
* Added MacOSX platform support.
51+
* Added the unstable README file.
52+
* Removed useless win32 prerequisites...
53+
* Fixing audio to work properly in the client-server model.
54+
* Server Bug Fix: a potential dead lock was solved.
55+
* Sensor Server now supports multiple sensors.
56+
* Refactored server to a better design, which should decrease deadlocks and make code more readable.
57+
* Adding support for enumerating and opening different sensors.
58+
* Bug Fix: GetStringProperty would always return XN_STATUS_ERROR.
59+
60+
Version 5.0.0.24 (Stable version - Dec 8th 2010)
61+
------------------------------------------------
62+
* Initial release...
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Core]
22
; 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default)
3-
LogLevel=0
3+
LogLevel=3
44
; leave empty for nothing (default). ALL - all masks
55
LogMasks=ALL
66
; 0 - No (default), 1 - Yes
@@ -75,14 +75,14 @@ LogWriteToFile=1
7575
; Max depth cutoff. 0-10000 mm (default is 10000)
7676
;MaxDepthValue=10000
7777

78-
; Input format. 0 - Uncompressed 16-bit, 1 - PS Compression (default), 3 - Packed 11-bit
79-
InputFormat=3
78+
; Input format. 0 - Uncompressed 16-bit, 1 - PS Compression, 3 - Packed 11-bit (default)
79+
;InputFormat=1
8080

8181
; Registration. 0 - Off (default), 1 - On
8282
;Registration=1
8383

8484
; Registration Type. 0 - Don't care (default), 1 - use hardware accelaration, 2 - perform in software
85-
RegistrationType=2
85+
;RegistrationType=0
8686

8787
; Hole Filler. 0 - Off, 1 - On (default)
8888
;HoleFilter=1
@@ -136,8 +136,8 @@ RegistrationType=2
136136
; Frames per second (default is 30)
137137
;FPS=30
138138

139-
; Input format. 0 - BAYER (1.3MP or 2.0MP only), 1 - Compressed YUV422 (default), 2 - Jpeg, 5 - Uncompressed YUV422, 6 - Uncompressed 8-bit BAYER
140-
InputFormat=6
139+
; Input format. 0 - BAYER (1.3MP or 2.0MP only), 1 - Compressed YUV422, 2 - Jpeg, 5 - Uncompressed YUV422 (default), 6 - Uncompressed 8-bit BAYER
140+
;InputFormat=5
141141

142142
; Anti Flicker. 0 - Off (default), 50 - 50Hz, 60 - 60 Hz.
143143
;Flicker=50

Include/XnDDK.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include <XnPlatform.h>
3232
#include <XnStatus.h>
3333
#include <XnDDKStatus.h>
34+
#include <XnStreamParams.h>
3435

3536
#ifdef __cplusplus
3637
#ifdef XN_DDK_EXPORTS
@@ -80,4 +81,8 @@ XN_DDK_API XnStatus XnDDKInitFromINIFile(const XnChar* cpINIFileName);
8081
*/
8182
XN_DDK_API XnStatus XnDDKShutdown();
8283

84+
XN_DDK_API XnResolutions XnDDKGetResolutionFromXY(XnUInt32 nXRes, XnUInt32 nYRes);
85+
XN_DDK_API XnBool XnDDKGetXYFromResolution(XnResolutions res, XnUInt32* pnXRes, XnUInt32* pnYRes);
86+
XN_DDK_API const XnChar* XnDDKGetResolutionName(XnResolutions res);
87+
8388
#endif //_XN_DDK_H_

Include/XnFormatsStatus.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ XN_STATUS_MESSAGE(XN_STATUS_IO_INVALID_STREAM_DEPTH_BUFFER_SIZE, "Invalid Xiron
6464
XN_STATUS_MESSAGE(XN_STATUS_IO_INVALID_STREAM_IMAGE_BUFFER_SIZE, "Invalid Xiron I/O stream image buffer size!")
6565
XN_STATUS_MESSAGE(XN_STATUS_IO_INVALID_STREAM_MISC_BUFFER_SIZE, "Invalid Xiron I/O stream misc buffer size!")
6666
XN_STATUS_MESSAGE(XN_STATUS_IO_INVALID_STREAM_AUDIO_BUFFER_SIZE, "Invalid Xiron I/O stream audio buffer size!")
67+
XN_STATUS_MESSAGE(XN_STATUS_INVALID_OUTPUT_FORMAT_FOR_RESOLUTION, "Pixel format is not supported for this resolution!")
6768
XN_PS_STATUS_MESSAGE_MAP_END(XN_ERROR_GROUP_FORMATS)
6869

6970
#endif //_XN_FORMATS_STATUS_H_

Include/XnPsVersion.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
/** Xiron minor version. */
4242
#define XN_PS_MINOR_VERSION 0
4343
/** Xiron maintenance version. */
44-
#define XN_PS_MAINTENANCE_VERSION 0
44+
#define XN_PS_MAINTENANCE_VERSION 1
4545
/** Xiron build version. */
46-
#define XN_PS_BUILD_VERSION 24
46+
#define XN_PS_BUILD_VERSION 32
4747

4848
/** Xiron version (in brief string format): "Major.Minor.Maintenance (Build)" */
4949
#define XN_PS_BRIEF_VERSION_STRING \

0 commit comments

Comments
 (0)