Merge remote-tracking branch 'origin/orbbec-dev'

# Conflicts:
#	Makefile
#	README
#	Source/Tools/NiViewer/Makefile
#	ThirdParty/GL/glh/glh_convenience.h
#	ThirdParty/PSCommon/XnLib/Source/Win32/XnWin32OS.cpp

Author: poqudrof

.gitignore

@@ -7,16 +7,24 @@ Bin
 *.pyc
 *.py~
 *.bz2
-source/Documentation/html
 Redist/Output*
 Redist/Install/obj*
 Redist/build.*
 Redist/Install/Fragments/RedistFragments.wxs
 Redist/*-src
 *.bak
-Source/Documentation/xml
 Temp
+Build
 Redist/Final
 Redist/compile.log
 Redist/OpenNI-*
 Source/Documentation/html
+Source/Documentation/java
+Source/Documentation/xml
+Source/Documentation/cpp
+OpenNI.xcodeproj
+.DS_Store
+local.properties
+build.android.log
+gen/
+Packaging/Final/

Android.mk

@@ -14,26 +14,5 @@
 # limitations under the License. 
 
 
-# Check if we're building from OS or NDK
-ifdef TARGET_BUILD_VARIANT
-	OPENNI2_ANDROID_OS_BUILD := true
-else
-	OPENNI2_ANDROID_NDK_BUILD := true
-endif
-
-# Setup OpenNI2 local variables
-OPENNI2_CFLAGS := -O3 -ftree-vectorize -ffast-math -funroll-loops -fPIC -fvisibility=hidden
-
-ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) 
-	OPENNI2_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mtune=cortex-a9 -mfpu=vfp
-endif
-
-ifeq ($(ARCH_ARM_HAVE_NEON),true)
-	OPENNI2_CFLAGS += -mfpu=neon -DHAVE_NEON=1 -flax-vector-conversions
-endif
-
 # Recurse through all subdirs
 include $(call all-subdir-makefiles)
-
-# Cleanup the local variables
-OPENNI2_CFLAGS := 

CHANGES.txt

@@ -1,7 +1,94 @@
 Change Log:
 -----------
 
-OpenNI 2.2.0:
+OpenNI 2.3:
+  - Android support added
+    - OpenNIHelper class to handle device permissions
+    - OpenNIView class to allow drawing of VideoFrameRef objects
+    - SimpleRead and SimpleViewer sample applications
+    - NiViewer application
+  - Fix pure-C APIs
+  - Allow providing driver list from config file
+  - Auto-recording feature (see OpenNI.ini)
+  - Bug Fix: depth/world conversion was wrong when depth is in 100 um format
+  - Adding logs for endpoints bandwidth and FPS
+  - Better handling of cases where device does not report its FOV
+  - Remove GLH from samples
+  - NiViewer: 
+    - IR emitter on/off is added for both PS1080 and Kinect.
+    - Near mode on/off is added for Kinect (was already there for PS1080)
+    - IR now also uses an histogram
+    - draw textures according to aspect ratio
+    - Cleanup help screen
+  - Java APIs
+    - Add log APIs
+    - Implemented hashCode() and equals() for VideoMode
+    - Bug Fix: VideoFrameRef.getData() returned ByteBuffer with big endianity, whereas data was with little endianity
+    - Bug Fix: bad JNI calls in oniGetDeviceList, oniStreamGetSensorInfo and oniDeviceGetSensorInfo.
+    - Fix callbacks JNI calls
+    - Bug Fix: memory leak in waitForAnyStream()
+  - Java SimpleViewer
+    - Allow passing file name in command prompt
+    - Add support for IR streams
+  - Carmine:
+    - Add support for FW 5.9
+    - PS1080Console bug: "startread" did not work properly
+    - Added support for the fast zoom crop (640x480 regular -> 640x480 zoomed) - 'z' in NiViewer
+    - Add a property that allows reading from endpoints without creating streams
+    - Bug Fix: Disconnect event was fired twice
+    - Implement MAX_PIXEL_VALUE for IR stream
+    - Bug Fix: Single pixel translation is wrong when image res is 1280x1024
+    - Windows: print USB banndwidth to log
+  - Kinect:
+    - Add mirror support
+    - Rewrite image registration for better performance
+    - Support of additional properties (exposed via KinectProperties.h):
+      - 3D sensing properties: Near Mode, IR Emitter On/Off
+      - Non-3D sensing properties: Camera Elevation, Accelerometer, Audio Array ID
+  - Capri:
+    - Bug Fix: Depth stops working if switching to QQVGA and then back to VGA
+    - i2c device list now also states the master and slave IDs
+    - Fixed a weird log during shutdown
+    - Add projector commands: projector on/off, pulse on/off
+    - Add commands for setting CMOS gain
+    - Add commands for reading temperature sensors
+    - Add commands for toggling ACC, periodic-BIST and VDD
+    - Print test name when running BIST
+    - Default resolution is now QQVGA on ARM machines
+    - Bug Fix: Setting Mirror from INI file didn't work
+    - Handle some protocol error codes that weren't handled
+    - Bug Fix: error strings were missing from log
+    - Implement MAX_PIXEL_VALUE for IR stream
+    - Bug Fix: no even frame indexes from Capri devices.
+    - Properties are now saved in recordings
+    - PSLinkConsole: allow running a single command and exit
+    - PresetsAHB property now supports comments in files
+    - Add ReadDebugData command
+    - Support 100um mode
+    - Can turn on firmware log from INI file
+    - Bug Fix: log stream might lose the first packet
+    - PSLinkConsole Bug Fix: FormatZone command did not work.
+    - Capri: don't set USB interface if not doing reset (console mode)
+    - Bug: Couldn't set video mode to IR stream
+  - OniFile:
+    - Allow calling setVideoMode() as long as it's the same mode (needed by some applications)
+    - Properties are now saved in recordings
+    - allow playback of recordings that don't have the cropping property (just assume it's disabled)
+    - Bug Fix: potential crash when playback restarts
+    - Fix a potential deadlock if calling stop() immediately after a repeat occurred
+    - potential crash when closing recorder
+    - Can control playback speed and repeat options from INI file
+  - Build:
+    - Support gold linker in compilation
+    - Add Linux prerequisites to release notes
+    - Add release notes and change log to installation
+    - Refactor TestDevice so it can actually be used for testing
+    - ReleaseVersion script now also creates a full Android package
+
+OpenNI 2.2.1:
+  - PS1080: Added a property for reading from all endpoints, regardless of streams
+
+OpenNI 2.2:
   - Added getDepthColorSyncEnabled() API
   - Added log settings API
   - Add a typedef: OniGrayscale8Pixel
@@ -50,7 +137,7 @@ OpenNI 2.2.0:
     - Support WIX 3.6 and up
     - ReleaseVersion script won't fail if output file exists (overwrite it)
 
-OpenNI 2.1.0:
+OpenNI 2.1:
   - 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
@@ -80,7 +167,7 @@ OpenNI 2.1.0:
   - 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:
+OpenNI 2:
   - 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)

Config/OpenNI.ini

@@ -1,14 +1,17 @@
 [Log]
 ; 0 - Verbose; 1 - Info; 2 - Warning; 3 - Error. Default - None
-Verbosity=3
-LogToConsole=0
-LogToFile=0
+;Verbosity=0
+;LogToConsole=1
+;LogToFile=1
+;LogToAndroidLog=1
 
 [Device]
-;Override=""
+;Override=
+;RecordTo=
 
 [Drivers]
-; Location of the drivers specified by a relative path based on OpenNI's shared library or an absolute path.
-; Path separator "/" can be used to be portable for any platforms.
-; Default - OpenNI2/Drivers
+; Location of the drivers, relative to OpenNI shared library location. When not provided, "OpenNI2/Drivers" will be used.
 ;Repository=OpenNI2/Drivers
+
+; List of drivers to load, separated by commas. When not provided, OpenNI will try to load each shared library in Repository.
+;List=

Config/OpenNI2/Drivers/OniFile.ini

@@ -0,0 +1,7 @@
+;---------------- Player Configuration -------------------
+[Player]
+; Speed. 1.0 - 1.0 * fps (default), Values can be R while R is real and grater the 0
+;Speed=1.0
+
+; Repeat. 1 - on (default), 0 - off
+;Repeat=1

Config/OpenNI2/Drivers/PSLink.ini

@@ -4,6 +4,9 @@
 ; USB interface to be used. 0 - FW Default, 1 - ISO endpoints (default on Windows), 2 - BULK endpoints (default on Linux/Mac/Android machines)
 ;UsbInterface=2
 
+; Enable firmware logs. 0 - Off (default), 1 - On
+;FirmwareLog=1
+
 [Depth]
 ; Allows dumping all frames to files. 0 - Off (default), 1 - On
 ;DumpData=1

Config/OpenNI2/Drivers/orbbec.ini

@@ -0,0 +1,158 @@
+;---------------- Sensor Default Configuration -------------------
+[Device]
+; Mirroring. 0 - Off (default), 1 - On
+;Mirror=1
+
+; FrameSync. 0 - Off (default), 1 - On
+;FrameSync=1
+
+; Stream Data Timestamps. 0 - milliseconds, 1 - microseconds (default)
+;HighResTimestamps=1
+
+; Stream Data Timestamps Source. 0 - Firmware (default), 1 - Host
+;HostTimestamps=0
+
+; A filter for the firmware log. Default is determined by firmware.
+;FirmwareLogFilter=0
+
+; Automatic firmare log retrieval. 0 - Off (default), or the number of milliseconds between log retrievals operations.
+;FirmwareLogInterval=1000
+
+; Print firmware log to console when automatic firmware log retrieval is on. 0 - Off (default), 1 - On
+;FirmwareLogPrint=1
+
+; Is APC enabled. 0 - Off, 1 - On (default)
+;APCEnabled=1
+
+; USB interface to be used. 0 - FW Default, 1 - ISO endpoints (default on Windows), 2 - BULK endpoints (default on Linux/Mac/Android machines), 3 - ISO endpoints for low-bandwidth depth
+UsbInterface=2
+
+[Depth]
+; Output format. 100 - 1mm depth values (default), 102 - u9.2 Shift values.
+;OutputFormat=100
+
+; Is stream mirrored. 0 - Off, 1 - On
+;Mirror=1
+
+; 0 - QVGA, 1 - VGA, 4 - QQVGA. Default: Arm - 4, other platforms - 0
+Resolution=1
+
+; Frames per second (default is 30)
+;FPS=30
+
+; Min depth cutoff. 0-10000 mm (default is 0)
+;MinDepthValue=0
+
+; Max depth cutoff. 0-10000 mm (default is 10000)
+;MaxDepthValue=10000
+
+; Input format. 0 - Uncompressed 16-bit, 1 - PS Compression, 3 - Packed 11-bit, 4 - Packed 12-bit. Default: Arm - 4, other platforms - 3
+InputFormat=3
+
+; Registration. 0 - Off (default), 1 - On
+;Registration=1
+
+; Registration Type. 0 - Don't care (default), 1 - use hardware accelaration, 2 - perform in software
+;RegistrationType=0
+
+; Hole Filler. 0 - Off, 1 - On (default)
+;HoleFilter=0
+
+; White Balance. 0 - Off, 1 - On (default)
+;WhiteBalancedEnabled=0
+
+; Gain. 0-50 (0 - Auto, 1 - Min., 50 - Max.). Default value is set by firmware.
+;Gain=0
+
+; Close Range Mode. 0 - Off (default), 1 - On
+;CloseRange=1
+
+; GMC Mode. 0 - Off, 1 - On (default)
+;GMCMode=0
+
+; GMC Debug. 0 - Off (default), 1 - On
+;GMCDebug=1
+
+; Depth Auto Gain Region-of-Interest. Default values are set by firmware.
+;DepthAGCBin0MinDepth=500
+;DepthAGCBin0MaxDepth=800
+;DepthAGCBin1MinDepth=1500
+;DepthAGCBin1MaxDepth=1800
+;DepthAGCBin2MinDepth=2500
+;DepthAGCBin2MaxDepth=2800
+;DepthAGCBin3MinDepth=3500
+;DepthAGCBin3MaxDepth=3800
+
+; Wavelength Correction Mechanism. 0 - Off (default), 1 - On
+;WavelengthCorrection=1
+
+; Wavelength Correction debug info. 0 - Off (default), 1 - On
+;WavelengthCorrectionDebug=1
+
+; Cropping mode. 1 - Normal (default), 2 - Increased FPS, 3 - Software only
+;CroppingMode=2
+
+; Cropping area
+[Depth.Cropping]
+OffsetX=0
+OffsetY=0
+SizeX=320
+SizeY=240
+;Enabled=1
+
+[Image]
+; Output format. 200 - RGB888 (default), 201 - YUV422, 202 - Gray8 (2.0 MP only), 205 - YUYV
+;OutputFormat=201
+
+; Is stream mirrored. 0 - Off, 1 - On
+;Mirror=1
+
+; 0 - QVGA (default), 1 - VGA, 2 - SXGA (1.3MP), 3 - UXGA (2.0MP), 14 - 720p, 15 - 1280x960
+Resolution=1
+
+; Frames per second (default is 30)
+;FPS=30
+
+; Input format. 0 - Compressed 8-bit 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 (1.3MP or 2.0MP only), 7 - Uncompressed YUYV
+InputFormat=5
+
+; Anti Flicker. 0 - Off (default), 50 - 50Hz, 60 - 60 Hz.
+;Flicker=50
+
+; Image quality when using Jpeg. 1-10 (1 - Lowest, 10 - Highest (default))
+;Quality=10
+
+; Cropping mode. 1 - Normal (default), 2 - Increased FPS, 3 - Software only
+;CroppingMode=1
+
+; Cropping area
+[Image.Cropping]
+;OffsetX=0
+;OffsetY=0
+;SizeX=320
+;SizeY=240
+;Enabled=1
+
+[IR]
+; Output format. 200 - RGB888, 203 - Grayscale 16-bit (default)
+;OutputFormat=203
+
+; Is stream mirrored. 0 - Off, 1 - On
+;Mirror=1
+
+; 0 - QVGA (default), 1 - VGA, 2 - SXGA(1.3MP)
+;Resolution=0
+
+; Frames per second (default is 30)
+;FPS=30
+
+; Cropping mode. 1 - Normal (default), 2 - Increased FPS, 3 - Software only
+;CroppingMode=1
+
+; Cropping area
+[IR.Cropping]
+;OffsetX=0
+;OffsetY=0
+;SizeX=320
+;SizeY=240
+;Enabled=1

Include/Android-Arm/OniPlatformAndroid-Arm.h

@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_PLATFORM_ANDROID_ARM_H_
-#define _ONI_PLATFORM_ANDROID_ARM_H_
+#ifndef ONIPLATFORMANDROID_ARM_H
+#define ONIPLATFORMANDROID_ARM_H
 
 // Start with Linux-x86, and override what's different
 #include "../Linux-x86/OniPlatformLinux-x86.h"
@@ -40,4 +40,4 @@
 	#define ONI_PLATFORM_STRING "AndroidOS-Arm"
 #endif
 
-#endif //_ONI_PLATFORM_LINUX_ARM_H_
+#endif // ONIPLATFORMANDROID_ARM_H