Updated codebase to the latest OpenNI / Sensor version (1.1.0.39 / 5.…

…0.1.32)

CHANGES

@@ -0,0 +1,62 @@
+Detailed Change log:
+--------------------
+
+Version 5.0.1.32 (Unstable version - Apr 11th 2010)
+---------------------------------------------------
+  * Fixing log prints of resolutions (-1 appeared as MAX_UINT64...) to the resolution name.
+  * Linux Bug Fix: Server creates two log files, one in the client folder and one in /var/log/primesense/XnSensorServer
+  * Fixed a memory leak when rewinding old XNS files.
+  * Win32: WIX installer (replacing NSIS)
+  * Fixed wrong version in XnDeviceFile
+
+Version 5.0.1.31 (Stable version - Apr 11th 2010)
+-------------------------------------------------
+  * Fix BULK timeout - it was too small...
+  * Bug Fix: IR only works in QVGA...
+  * Added 64bit support for the installers.
+  * Fix wrong uses of the XN_IS_STATUS_OK macro (value is evaluated twice).
+  * Adding support for MJPEG pass-through.
+  * Adding initial support for new CMOS interfaces
+  * Adding initial JPEG support
+  * Fix for UAC installer problems.
+  * Fixed uninstall without OpenNI.
+  * Set minimum OpenNI version check in the installer.
+  * Fix seeking to first frame in old XNS files.
+  * Bug Fix: Client would fail to connect if trying to connect while server is shutting down.
+  * Improving the timestamps algorithm.
+  * performance improvement when enumerating for image nodes - a sensor should only be checked once.
+  * improving error message for setting grayscale8 in low resolutions.
+  * Improve thread-safety when starting server
+  * Bug Fix: a crash when trying to open a non-existing XNS file.
+  * Bug Fix: a potential crash if Init of depth generator fails.
+  * Sensor now supports the Device Identification capability.
+  * 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.
+  * MultiProcess Bug Fix: the lock on a sensor didn't exist, so nothing was synchronized.
+  * ImageGenerator now also changes InputFormat when changing resolution if needed (when switching from hi-res to normal & vice versa).
+  * Adding frame IDs to Audio (just counting)
+  * restoring defaults to QVGA.
+  * Add support for sensors with no image CMOS.
+  * Updated low-bandwidth USB devices buffer information.
+  * Added the Asus WAVI auto-detection for Win32.
+  * Low bandwidth devices now use bigger USB delays.
+  * New defaults are now VGA, uncompressed.
+  * Initial support for low-band devices:
+    1. Image, IR and audio does not enumerate.
+    2. Defaults changed to QVGA, compressed.
+
+Version 5.0.0.25 (Unstable version - Jan 6th 2011)
+--------------------------------------------------
+  * Bug fix: infinite loop in server when a client tries to disconnect and streams can't be closed (usb timeout for example).
+  * Added MacOSX platform support.
+  * Added the unstable README file.
+  * Removed useless win32 prerequisites...
+  * Fixing audio to work properly in the client-server model.
+  * Server Bug Fix: a potential dead lock was solved.
+  * Sensor Server now supports multiple sensors. 
+  * Refactored server to a better design, which should decrease deadlocks and make code more readable.
+  * Adding support for enumerating and opening different sensors.
+  * Bug Fix: GetStringProperty would always return XN_STATUS_ERROR.
+
+Version 5.0.0.24 (Stable version - Dec 8th 2010)
+------------------------------------------------
+  * Initial release... 

Data/GlobalDefaults.ini → Data/GlobalDefaultsKinect.ini

@@ -1,6 +1,6 @@
 [Core]
 ; 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default)
-LogLevel=0
+LogLevel=3
 ; leave empty for nothing (default). ALL - all masks
 LogMasks=ALL
 ; 0 - No (default), 1 - Yes
@@ -75,15 +75,14 @@ LogWriteToFile=1
 ; Max depth cutoff. 0-10000 mm (default is 10000)
 ;MaxDepthValue=10000
 
-; Input format. 0 - Uncompressed 16-bit, 1 - PS Compression (default), 3 - Packed 11-bit
-InputFormat=3
+; Input format. 0 - Uncompressed 16-bit, 1 - PS Compression, 3 - Packed 11-bit (default)
+;InputFormat=1
 
 ; Registration. 0 - Off (default), 1 - On
 ;Registration=1
 
 ; Registration Type. 0 - Don't care (default), 1 - use hardware accelaration, 2 - perform in software
-; --avin mod--
-RegistrationType=2
+;RegistrationType=0
 
 ; Hole Filler. 0 - Off, 1 - On (default)
 ;HoleFilter=1
@@ -137,9 +136,8 @@ RegistrationType=2
 ; Frames per second (default is 30)
 ;FPS=30
 
-; Input format. 0 - BAYER (1.3MP or 2.0MP only), 1 - Compressed YUV422 (default), 2 - Jpeg, 5 - Uncompressed YUV422, 6 - Uncompressed 8-bit BAYER
-; --avin mod--
-InputFormat=6
+; Input format. 0 - BAYER (1.3MP or 2.0MP only), 1 - Compressed YUV422, 2 - Jpeg, 5 - Uncompressed YUV422 (default), 6 - Uncompressed 8-bit BAYER
+;InputFormat=5
 
 ; Anti Flicker. 0 - Off (default), 50 - 50Hz, 60 - 60 Hz.
 ;Flicker=50

Include/XnDDK.h

@@ -31,6 +31,7 @@
 #include <XnPlatform.h>
 #include <XnStatus.h>
 #include <XnDDKStatus.h>
+#include <XnStreamParams.h>
 
 #ifdef __cplusplus
 	#ifdef XN_DDK_EXPORTS
@@ -80,4 +81,8 @@ XN_DDK_API XnStatus XnDDKInitFromINIFile(const XnChar* cpINIFileName);
 */
 XN_DDK_API XnStatus XnDDKShutdown();
 
+XN_DDK_API XnResolutions XnDDKGetResolutionFromXY(XnUInt32 nXRes, XnUInt32 nYRes);
+XN_DDK_API XnBool XnDDKGetXYFromResolution(XnResolutions res, XnUInt32* pnXRes, XnUInt32* pnYRes);
+XN_DDK_API const XnChar*  XnDDKGetResolutionName(XnResolutions res);
+
 #endif //_XN_DDK_H_

Include/XnFormatsStatus.h

@@ -64,6 +64,7 @@ XN_STATUS_MESSAGE(XN_STATUS_IO_INVALID_STREAM_DEPTH_BUFFER_SIZE, "Invalid Xiron
 XN_STATUS_MESSAGE(XN_STATUS_IO_INVALID_STREAM_IMAGE_BUFFER_SIZE, "Invalid Xiron I/O stream image buffer size!")
 XN_STATUS_MESSAGE(XN_STATUS_IO_INVALID_STREAM_MISC_BUFFER_SIZE, "Invalid Xiron I/O stream misc buffer size!")
 XN_STATUS_MESSAGE(XN_STATUS_IO_INVALID_STREAM_AUDIO_BUFFER_SIZE, "Invalid Xiron I/O stream audio buffer size!")
+XN_STATUS_MESSAGE(XN_STATUS_INVALID_OUTPUT_FORMAT_FOR_RESOLUTION, "Pixel format is not supported for this resolution!")
 XN_PS_STATUS_MESSAGE_MAP_END(XN_ERROR_GROUP_FORMATS)
 
 #endif //_XN_FORMATS_STATUS_H_

Include/XnPsVersion.h

@@ -41,9 +41,9 @@
 /** Xiron minor version. */ 
 #define XN_PS_MINOR_VERSION 0
 /** Xiron maintenance version. */ 
-#define XN_PS_MAINTENANCE_VERSION 0
+#define XN_PS_MAINTENANCE_VERSION 1
 /** Xiron build version. */ 
-#define XN_PS_BUILD_VERSION 25
+#define XN_PS_BUILD_VERSION 32
 
 /** Xiron version (in brief string format): "Major.Minor.Maintenance (Build)" */ 
 #define XN_PS_BRIEF_VERSION_STRING \

Include/XnStreamParams.h

@@ -138,12 +138,19 @@
 /** XnCropping */ 
 #define XN_STREAM_PROPERTY_CROPPING					"Cropping"
 
+/** Boolean */
+#define XN_STREAM_PROPERTY_WHITE_BALANCE_ENABLED	"WhiteBalancedEnabled"
+/** Integer */ 
+#define XN_STREAM_PROPERTY_GAIN						"Gain"
+/** Integer */
+#define XN_STREAM_PROPERTY_SUPPORT_MODES_COUNT		"SupportedModesCount"
+/** General (XnCmosPreset array) */
+#define XN_STREAM_PROPERTY_SUPPORT_MODES			"SupportedModes"
+
 //---------------------------------------------------------------------------
 // Depth Specific Properties
 //---------------------------------------------------------------------------
 /** Integer */ 
-#define XN_STREAM_PROPERTY_GAIN						"Gain"
-/** Integer */ 
 #define XN_STREAM_PROPERTY_HOLE_FILTER				"HoleFilter"
 /** Integer */ 
 #define XN_STREAM_PROPERTY_MIN_DEPTH				"MinDepthValue"
@@ -157,8 +164,6 @@
 #define XN_STREAM_PROPERTY_REGISTRATION				"Registration"
 /** XnProcessingType */ 
 #define XN_STREAM_PROPERTY_REGISTRATION_TYPE		"RegistrationType"
-/** Boolean */
-#define XN_STREAM_PROPERTY_WHITE_BALANCE_ENABLED	"WhiteBalancedEnabled"
 /** XnDepthAGCBin* */
 #define XN_STREAM_PROPERTY_AGC_BIN					"AGCBin"
 /** Integer */ 
@@ -231,6 +236,28 @@
 #define XN_STREAM_PROPERTY_FLICKER					"Flicker"
 /** Integer */ 
 #define XN_STREAM_PROPERTY_QUALITY					"Quality"
+/** Float */
+#define XN_STREAM_PROPERTY_BRIGHTNESS				XN_CAPABILITY_BRIGHTNESS
+/** Float */
+#define XN_STREAM_PROPERTY_CONTRAST					XN_CAPABILITY_CONTRAST
+/** Float */
+#define XN_STREAM_PROPERTY_SATURATION				XN_CAPABILITY_SATURATION
+/** Float */
+#define XN_STREAM_PROPERTY_SHARPNESS				XN_CAPABILITY_SHARPNESS
+/** Float */
+#define XN_STREAM_PROPERTY_COLOR_TEMPERATURE		XN_CAPABILITY_COLOR_TEMPERATURE
+/** Float */
+#define XN_STREAM_PROPERTY_BACKLIGHT_COMPENSATION	XN_CAPABILITY_BACKLIGHT_COMPENSATION
+/** Float */
+#define XN_STREAM_PROPERTY_ZOOM						XN_CAPABILITY_ZOOM
+/** Integer (in microseconds) */
+#define XN_STREAM_PROPERTY_EXPOSURE					XN_CAPABILITY_EXPOSURE
+/** Float */
+#define XN_STREAM_PROPERTY_PAN						XN_CAPABILITY_PAN
+/** Float */
+#define XN_STREAM_PROPERTY_TILT						XN_CAPABILITY_TILT
+/** Boolean */
+#define XN_STREAM_PROPERTY_LOW_LIGHT_COMPENSATION	XN_CAPABILITY_LOW_LIGHT_COMPENSATION
 
 //---------------------------------------------------------------------------
 // Audio Specific Properties
@@ -319,6 +346,10 @@
 #define XN_MODULE_PROPERTY_ERROR_STATE				"ErrorState"
 /** Boolean */
 #define XN_MODULE_PROPERTY_ENABLE_MULTI_PROCESS		"EnableMultiProcess"
+/** String */
+#define XN_MODULE_PROPERTY_PHYSICAL_DEVICE_NAME		"PhysicalDeviceName"
+/** String */
+#define XN_MODULE_PROPERTY_VENDOR_SPECIFIC_DATA		"VendorSpecificData"
 
 
 //---------------------------------------------------------------------------
@@ -351,8 +382,18 @@ typedef enum XnResolutions
 	XN_RESOLUTION_VGA = 1, // 640x480
 	XN_RESOLUTION_SXGA = 2, // 1280x1024
 	XN_RESOLUTION_UXGA = 3, // 1600x1200
-
-	XN_RESOLUTION_COUNT,
+	XN_RESOLUTION_QQVGA = 4, // 160x120
+	XN_RESOLUTION_QCIF = 5, // 176x144
+	XN_RESOLUTION_240P = 6, // 432x240
+	XN_RESOLUTION_CIF = 7, // 352x288
+	XN_RESOLUTION_WVGA = 8, // 640x360
+	XN_RESOLUTION_480P = 9, // 864x480
+	XN_RESOLUTION_800_448 = 10, // 800x448
+	XN_RESOLUTION_SVGA = 11, // 800x600
+	XN_RESOLUTION_576P = 12, // 1024x576
+	XN_RESOLUTION_DV = 13, // 960x720
+	XN_RESOLUTION_720P = 14, // 1280x720
+	XN_RESOLUTION_1280_960 = 15, // 1280x960
 } XnResolutions;
 
 typedef enum 
@@ -367,6 +408,7 @@ typedef enum
 	XN_SENSOR_FW_VER_5_1 = 7,
 	XN_SENSOR_FW_VER_5_2 = 8,
 	XN_SENSOR_FW_VER_5_3 = 9,
+	XN_SENSOR_FW_VER_5_4 = 10,
 } XnFWVer;
 
 typedef enum
@@ -526,6 +568,13 @@ typedef struct XnDynamicSizeBuffer
 	XnUInt32 nDataSize;
 } XnDynamicSizeBuffer;
 
+typedef struct XnCmosPreset
+{
+	XnUInt16 nFormat;
+	XnUInt16 nResolution;
+	XnUInt16 nFPS;
+} XnCmosPreset;
+
 
 #pragma pack (pop)
 

OpenNI/Data/SamplesConfig.xml

@@ -4,27 +4,26 @@
 		<License vendor="vendor" key="key"/>
 		-->
 	</Licenses>
-	<Log writeToConsole="true" writeToFile="false">
+	<Log writeToConsole="false" writeToFile="false">
 		<!-- 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default) -->
 		<LogLevel value="3"/>
 		<Masks>
-			<Mask name="ALL" on="false"/>
+			<Mask name="ALL" on="true"/>
 		</Masks>
 		<Dumps>
 		</Dumps>
 	</Log>
 	<ProductionNodes>	
 		<!-- Normal Image -->
-		<Node type="Image" name="Image1">
+		<Node type="Image" name="Image1" stopOnError="false"> 
 			<Configuration>
-				<MapOutputMode xRes="640" yRes="480" FPS="30"/>
 				<Mirror on="true"/>
 			</Configuration>
 		</Node>	
 
 		<!-- HighRes Image -->
 		<!--
-		<Node type="Image" name="Image1">
+		<Node type="Image" name="Image1" stopOnError="false"> 
 			<Configuration>
 				<MapOutputMode xRes="1280" yRes="1024" FPS="15"/>
 				<Mirror on="true"/>
@@ -54,7 +53,6 @@
 
 		<Node type="Depth" name="Depth1">
 			<Configuration>
-				<MapOutputMode xRes="640" yRes="480" FPS="30"/>
 				<Mirror on="true"/>
 			</Configuration>
 		</Node>

Platform/Linux-x86/Build/Utils/XnSensorServer/Makefile

@@ -1,7 +1,7 @@
 SRC_FILES = ../../../../../Source/Utils/XnSensorServer/*.cpp
 
 EXE_NAME = XnSensorServer
-USED_LIBS = OpenNI XnCore XnFormats XnDDK XnDeviceSensorV2
+USED_LIBS = OpenNI XnCore XnFormats XnDDK XnDeviceSensorV2KM
 
 include ../EngineUtilMakefile
 

Platform/Linux-x86/Build/XnDeviceSensorV2/Makefile

@@ -1,7 +1,7 @@
 SRC_FILES = \
 	../../../../Source/XnDeviceSensorV2/*.cpp
 
-LIB_NAME = XnDeviceSensorV2
+LIB_NAME = XnDeviceSensorV2KM
 USED_LIBS = XnCore XnFormats XnDDK OpenNI
 DEFINES = XN_DEVICE_EXPORTS