Merge branch 'develop' of ssh://git/localhome/GIT/Software/OpenNI2 in…

…to develop

CHANGES.txt

@@ -0,0 +1,68 @@
+Change Log:
+-----------
+
+OpenNI 2.2.0:
+  - Added getDepthColorSyncEnabled API
+  - Merge pull request #7: Driver path resolution based on the shared library location See https://github.com/OpenNI/OpenNI2/pull/7 for details (thanks Tomoto)
+  - Build: Rename Redist dir to Packaging
+  - Build: Remove all warnings during build. Treat all warnings as errors.
+  - Bug Fix: Failed to use after OpenCL was initialized
+  - Rewrote the android make files to proper standards
+  - Fix Linux identification (apparently -std=c1x defines only __linux and not linux)
+  - PS1080 Bug Fix: handle file system lock when uploading only in supporting firmwares
+  - PS1080: Add NESA unlimited to BIST
+  - PS1080: improved hardware name detection
+  - PS1080: IR stream now also supports RGB888
+  - Bug Fix: Visual Sutdio 2008 wasn't supported
+  - Add a typedef: OniGrayscale8Pixel
+  - Make sure device is still open when closing a stream that uses it.
+  - Add support for Capri devices
+  - New Java Wrappers
+  - New Java sample: SimpleViewer.java
+  - Support WIX 3.6 and up
+  - Kinect: wrong error code returned when trying to change video mode while streaming
+  - invoke() method signature was updated - data is no longer const
+  - PrimeSense: move common properties (PS1080 and Capri) to PrimeSense.h
+  - PS1080: add new property for turning on hardware frame sync, with no OpenNI checks
+  - New pixel format: YUYV. PS1080 now supports it (on newer firmwares)
+  - PS1080: add lots of debug commands
+  - ReleaseVersion script: don't fail if output file exists (overwrite it)
+  - PS1080: add new file type (vendor data)
+
+OpenNI 2.1.0:
+  - API change: each event now has its own addListener()/removeListener() methods. A listener object can now be added only once.
+  - Support for Mac OSX
+  - Support for Linux on Arm
+  - Support for Android (native only)
+  - Kinect: implementing convertDepthToColorCoordinates()
+  - Kinect: implementing CameraSettings
+  - Kinect Bug Fix: can now switch between color and IR streams
+  - Kinect Bug Fix: wrong mirror value was returned
+  - PS1080 Bug Fix: trying to open more than 8 devices will crash
+  - PS1080 Bug Fix: on Linux 64-bit, color frames are sometimes corrupt
+  - PS1080 Bug Fix: a potential crash with older firmwares
+  - NiViewer now browses whenever a recording is started
+  - NiViewer: added 'i' key for toggling image-registration (also added current status in the status bar)
+  - Minor memory leak fixes
+  - EventBasedRead Sample Bug Fix: will not get device events
+  - EventBasedRead Sample now prints the list of connected devices and every change that occurs
+  - Recordings are now also compatible with OpenNI 1.x and NiTE 1.x
+  - Potential starvation bug fix when application takes much time handling events
+  - Log file now closes on shutdown(), and a new one is created on initialize()
+  - SimpleRead is now the default project in the VS solution (thanks eranws)
+  - Bug Fix: did not support Visual Studio 2008 and older
+  - Bug Fix: did not support Visual Studio 2012 and newer
+  - Bug Fix: did not support Visual Studio Express (thanks rh-galaxy)
+  - NiViewer Bug Fix: Mirror did not change IR state
+  - Kinect: providing Kinect for Windows PID and VID in the device info struct
+  - ONI files: providing driver name in the device info struct
+  - Bug Fix: ReleaseVersion script did not work on 32-bit machines
+  - Linux Bug Fix: log timestamps did not start from 0.
+
+OpenNI 2.0.0:
+  - Brand new API (see documentation)
+  - Algorithms API were removed, and are now part of middleware libraries (such as NiTE)
+  - New deployment model - private copy to each application (see documentation)
+  - Added support for turning off Auto Exposure and Auto White Balance of the color CMOS in PS1080 devices
+  - Built-in support for Kinect devices via the Kinect SDK (Windows only)
+  - Added support for translating a depth pixel to color map coordinates

Config/OpenNI2/Drivers/PS1080.ini

@@ -101,7 +101,7 @@
 ;Enabled=1
 
 [Image]
-; Output format. 200 - RGB888 (default), 201 - YUV422, 202 - Gray8 (2.0 MP only)
+; Output format. 200 - RGB888 (default), 201 - YUV422, 202 - Gray8 (2.0 MP only), 205 - YUYV
 ;OutputFormat=200
 
 ; Is stream mirrored. 0 - Off, 1 - On
@@ -113,7 +113,7 @@
 ; Frames per second (default is 30)
 ;FPS=30
 
-; Input format. 0 - BAYER (1.3MP or 2.0MP only), 1 - Compressed YUV422 (default in BULK), 2 - Jpeg, 5 - Uncompressed YUV422 (default in ISO), 6 - Uncompressed 8-bit BAYER
+; Input format. 0 - BAYER (1.3MP or 2.0MP only), 1 - Compressed YUV422 (default in BULK), 2 - Jpeg, 5 - Uncompressed YUV422 (default in ISO), 6 - Uncompressed 8-bit BAYER, 7 - Uncompressed YUYV
 ;InputFormat=5
 
 ; Anti Flicker. 0 - Off (default), 50 - 50Hz, 60 - 60 Hz.

Include/Driver/OniDriverAPI.h

@@ -47,7 +47,7 @@ class StreamBase
 	virtual OniStatus setProperty(int /*propertyId*/, const void* /*data*/, int /*dataSize*/) {return ONI_STATUS_NOT_IMPLEMENTED;}
 	virtual OniStatus getProperty(int /*propertyId*/, void* /*data*/, int* /*pDataSize*/) {return ONI_STATUS_NOT_IMPLEMENTED;}
 	virtual OniBool isPropertySupported(int /*propertyId*/) {return FALSE;}
-	virtual OniStatus invoke(int /*commandId*/, const void* /*data*/, int /*dataSize*/) {return ONI_STATUS_NOT_IMPLEMENTED;}
+	virtual OniStatus invoke(int /*commandId*/, void* /*data*/, int /*dataSize*/) {return ONI_STATUS_NOT_IMPLEMENTED;}
 	virtual OniBool isCommandSupported(int /*commandId*/) {return FALSE;}
 
 	virtual OniStatus start() = 0;
@@ -88,7 +88,7 @@ class DeviceBase
 	virtual OniStatus setProperty(int /*propertyId*/, const void* /*data*/, int /*dataSize*/) {return ONI_STATUS_NOT_IMPLEMENTED;}
 	virtual OniStatus getProperty(int /*propertyId*/, void* /*data*/, int* /*pDataSize*/) {return ONI_STATUS_NOT_IMPLEMENTED;}
 	virtual OniBool isPropertySupported(int /*propertyId*/) {return FALSE;}
-	virtual OniStatus invoke(int /*commandId*/, const void* /*data*/, int /*dataSize*/) {return ONI_STATUS_NOT_IMPLEMENTED;}
+	virtual OniStatus invoke(int /*commandId*/, void* /*data*/, int /*dataSize*/) {return ONI_STATUS_NOT_IMPLEMENTED;}
 	virtual OniBool isCommandSupported(int /*commandId*/) {return FALSE;}
 	virtual OniStatus tryManualTrigger() {return ONI_STATUS_OK;}
 
@@ -254,7 +254,7 @@ ONI_C_API_EXPORT void oniDriverDeviceNotifyAllProperties(oni::driver::DeviceBase
 	pDevice->notifyAllProperties();																							\
 }																															\
 ONI_C_API_EXPORT OniStatus oniDriverDeviceInvoke(oni::driver::DeviceBase* pDevice, int commandId,							\
-												const void* data, int dataSize)												\
+												void* data, int dataSize)													\
 {																															\
 	return pDevice->invoke(commandId, data, dataSize);																		\
 }																															\
@@ -297,7 +297,7 @@ ONI_C_API_EXPORT void oniDriverStreamNotifyAllProperties(oni::driver::StreamBase
 	pStream->notifyAllProperties();																							\
 }																															\
 ONI_C_API_EXPORT OniStatus oniDriverStreamInvoke(oni::driver::StreamBase* pStream, int commandId,							\
-												const void* data, int dataSize)												\
+												void* data, int dataSize)													\
 {																															\
 	return pStream->invoke(commandId, data, dataSize);																		\
 }																															\

Include/OniCAPI.h

@@ -84,7 +84,7 @@ ONI_C_API OniStatus oniDeviceGetProperty(OniDeviceHandle device, int propertyId,
 /** Check if the property is supported by the device. Use the properties listed in OniTypes.h: ONI_DEVICE_PROPERTY_..., or specific ones supplied by the device. */
 ONI_C_API OniBool oniDeviceIsPropertySupported(OniDeviceHandle device, int propertyId);
 /** Invoke an internal functionality of the device. */
-ONI_C_API OniStatus oniDeviceInvoke(OniDeviceHandle device, int commandId, const void* data, int dataSize);
+ONI_C_API OniStatus oniDeviceInvoke(OniDeviceHandle device, int commandId, void* data, int dataSize);
 /** Check if a command is supported, for invoke */
 ONI_C_API OniBool oniDeviceIsCommandSupported(OniDeviceHandle device, int commandId);
 
@@ -118,7 +118,7 @@ ONI_C_API OniStatus oniStreamGetProperty(OniStreamHandle stream, int propertyId,
 /** Check if the property is supported the stream. Use the properties listed in OniTypes.h: ONI_STREAM_PROPERTY_..., or specific ones supplied by the device for its streams. */
 ONI_C_API OniBool oniStreamIsPropertySupported(OniStreamHandle stream, int propertyId);
 /** Invoke an internal functionality of the stream. */
-ONI_C_API OniStatus oniStreamInvoke(OniStreamHandle stream, int commandId, const void* data, int dataSize);
+ONI_C_API OniStatus oniStreamInvoke(OniStreamHandle stream, int commandId, void* data, int dataSize);
 /** Check if a command is supported, for invoke */
 ONI_C_API OniBool oniStreamIsCommandSupported(OniStreamHandle stream, int commandId);
 // handle registration of pixel

Include/OniCEnums.h

@@ -58,6 +58,7 @@ typedef enum
 	ONI_PIXEL_FORMAT_GRAY8 = 202,
 	ONI_PIXEL_FORMAT_GRAY16 = 203,
 	ONI_PIXEL_FORMAT_JPEG = 204,
+	ONI_PIXEL_FORMAT_YUYV = 205,
 } OniPixelFormat;
 
 typedef enum

Include/OniEnums.h

@@ -61,6 +61,7 @@ typedef enum
 	PIXEL_FORMAT_GRAY8 = 202,
 	PIXEL_FORMAT_GRAY16 = 203,
 	PIXEL_FORMAT_JPEG = 204,
+	PIXEL_FORMAT_YUYV = 205,
 } PixelFormat;
 
 typedef enum

Include/OniVersion.h

@@ -23,7 +23,7 @@
 #define ONI_VERSION_MAJOR	2
 #define ONI_VERSION_MINOR	2
 #define ONI_VERSION_MAINTENANCE	0
-#define ONI_VERSION_BUILD	3
+#define ONI_VERSION_BUILD	7
 
 /** OpenNI version (in brief string format): "Major.Minor.Maintenance (Build)" */ 
 #define ONI_BRIEF_VERSION_STRING \

Include/OpenNI.h

@@ -1096,7 +1096,7 @@ class VideoStream
 	@returns Status code indicating success or failure of this operation.
 	*/
 	template <class T>
-	Status invoke(int commandId, const T& value)
+	Status invoke(int commandId, T& value)
 	{
 		return invoke(commandId, &value, sizeof(T));
 	}
@@ -1505,7 +1505,7 @@ class Device
 	@param [in] dataSize size of the buffer passed in @c data.
 	@returns Status code indicating success or failure of this operation.
 	*/
-	Status invoke(int commandId, const void* data, int dataSize)
+	Status invoke(int commandId, void* data, int dataSize)
 	{
 		return (Status)oniDeviceInvoke(m_device, commandId, data, dataSize);
 	}
@@ -1520,7 +1520,7 @@ class Device
 	@returns Status code indicating success or failure of this operation.
 	*/
 	template <class T>
-	Status invoke(int propertyId, const T& value)
+	Status invoke(int propertyId, T& value)
 	{
 		return invoke(propertyId, &value, sizeof(T));
 	}