Permalink
Browse files

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

…0.1.32)
  • Loading branch information...
avin2 committed Apr 15, 2011
1 parent 0124bd2 commit 19f005a72034eb3b30376e6d996c88611e59a76d
Showing with 6,228 additions and 1,183 deletions.
  1. +62 −0 CHANGES
  2. +6 −8 Data/{GlobalDefaults.ini → GlobalDefaultsKinect.ini}
  3. +5 −0 Include/XnDDK.h
  4. +1 −0 Include/XnFormatsStatus.h
  5. +2 −2 Include/XnPsVersion.h
  6. +55 −6 Include/XnStreamParams.h
  7. +0 −23 NITE/Data/Sample-Scene.xml
  8. +0 −24 NITE/Data/Sample-Tracking.xml
  9. +0 −23 NITE/Data/Sample-User.xml
  10. +4 −6 OpenNI/Data/SamplesConfig.xml
  11. +1 −1 Platform/Linux-x86/Build/Utils/XnSensorServer/Makefile
  12. +1 −1 Platform/Linux-x86/Build/XnDeviceSensorV2/Makefile
  13. +17 −3 Platform/Linux-x86/CreateRedist/RedistMaker
  14. +3 −3 Platform/Linux-x86/CreateRedist/install.sh
  15. +2 −0 Platform/Linux-x86/Install/55-primesense-usb.rules
  16. BIN Platform/Win32/Build/Prerequisites/nsis-2.46-strlen_8192.zip
  17. +177 −6 Platform/Win32/Build/Utils/XnSensorServer/XnSensorServer.vcproj
  18. +202 −7 Platform/Win32/Build/XnCore/XnCore.vcproj
  19. +189 −7 Platform/Win32/Build/XnDDK/XnDDK.vcproj
  20. +183 −7 Platform/Win32/Build/XnDeviceFile/XnDeviceFile.vcproj
  21. +213 −6 Platform/Win32/Build/XnDeviceSensorV2/XnDeviceSensorV2.vcproj
  22. +181 −7 Platform/Win32/Build/XnFormats/XnFormats.vcproj
  23. +26 −0 Platform/Win32/CreateRedist/EE_NI/EE_NI.sln
  24. +86 −0 Platform/Win32/CreateRedist/EE_NI/EE_NI.wixproj
  25. +304 −0 Platform/Win32/CreateRedist/EE_NI/EE_NI.wxs
  26. +99 −0 Platform/Win32/CreateRedist/EE_NI/Fragments/BinariesFragment.wxs
  27. +1,817 −0 Platform/Win32/CreateRedist/EE_NI/Fragments/FilesFragment.wxs
  28. +46 −0 Platform/Win32/CreateRedist/EE_NI/Includes/EENIVariables.wxi
  29. +14 −0 Platform/Win32/CreateRedist/EE_NI/Lang/en-us/Loc_en-us.wxl
  30. BIN Platform/Win32/CreateRedist/EE_NI/Resources/Header.bmp
  31. BIN Platform/Win32/CreateRedist/EE_NI/Resources/mainicon.ico
  32. +76 −0 Platform/Win32/CreateRedist/EE_NI/UI/CustomeInstallUI.wxs
  33. BIN Platform/Win32/CreateRedist/EE_NI/bin/Release/EE_NI_setup.exe
  34. BIN Platform/Win32/CreateRedist/EE_NI/bin/Release/en-us/EE_NI.wixpdb
  35. +1 −0 Platform/Win32/CreateRedist/EE_NI/obj/Release/EE_NI.wixobj
  36. +7 −0 Platform/Win32/CreateRedist/EE_NI/obj/Release/EE_NI.wixproj.FileList.txt
  37. +1 −0 Platform/Win32/CreateRedist/EE_NI/obj/Release/Fragments/BinariesFragment.wixobj
  38. +1 −0 Platform/Win32/CreateRedist/EE_NI/obj/Release/Fragments/FilesFragment.wixobj
  39. +1 −0 Platform/Win32/CreateRedist/EE_NI/obj/Release/Product.Generated.wixobj
  40. +6 −0 Platform/Win32/CreateRedist/EE_NI/obj/Release/Product.Generated.wxs
  41. +1 −0 Platform/Win32/CreateRedist/EE_NI/obj/Release/UI/CustomeInstallUI.wixobj
  42. +1 −0 Platform/Win32/CreateRedist/EE_NI/obj/x64/Release/EE_NI.wixobj
  43. +7 −0 Platform/Win32/CreateRedist/EE_NI/obj/x64/Release/EE_NI.wixproj.FileList.txt
  44. +1 −0 Platform/Win32/CreateRedist/EE_NI/obj/x64/Release/Fragments/BinariesFragment.wixobj
  45. +1 −0 Platform/Win32/CreateRedist/EE_NI/obj/x64/Release/Fragments/FilesFragment.wixobj
  46. +1 −0 Platform/Win32/CreateRedist/EE_NI/obj/x64/Release/Product.Generated.wixobj
  47. +6 −0 Platform/Win32/CreateRedist/EE_NI/obj/x64/Release/Product.Generated.wxs
  48. +1 −0 Platform/Win32/CreateRedist/EE_NI/obj/x64/Release/UI/CustomeInstallUI.wixobj
  49. BIN Platform/Win32/CreateRedist/EE_NI/setup.exe
  50. +0 −217 Platform/Win32/CreateRedist/Engine.nsi
  51. +8 −0 Platform/Win32/CreateRedist/Engine_Config.xml
  52. BIN Platform/Win32/CreateRedist/Header.bmp
  53. +122 −16 Platform/Win32/CreateRedist/Redist.py
  54. +0 −54 Platform/Win32/CreateRedist/x64.nsh
  55. BIN Platform/Win32/Driver/amd64/psdrv3.sys
  56. BIN Platform/Win32/Driver/dpinst-amd64.exe
  57. BIN Platform/Win32/Driver/dpinst-x86.exe
  58. +5 −5 Platform/Win32/Driver/dpinst.xml
  59. BIN Platform/Win32/Driver/psdrv3.cat
  60. +29 −14 Platform/Win32/Driver/psdrv3.inf
  61. BIN Platform/Win32/Driver/x86/psdrv3.sys
  62. BIN Platform/Win32/Tools/vcredist_x86.exe
  63. +21 −39 README
  64. +3 −3 Source/Utils/XnSensorServer/SensorServer.cpp
  65. +136 −0 Source/XnDDK/XnDDK.cpp
  66. +87 −78 Source/XnDDK/XnPixelStream.cpp
  67. +17 −7 Source/XnDDK/XnPixelStream.h
  68. +5 −5 Source/XnDeviceFile/XnExportedFileDevice.cpp
  69. +1 −0 Source/XnDeviceFile/XnFileDevice.cpp
  70. +2 −7 Source/XnDeviceFile/XnFileDeviceBC.cpp
  71. +1 −0 Source/XnDeviceSensorV2/Registration.cpp
  72. +44 −13 Source/XnDeviceSensorV2/XnDataProcessor.cpp
  73. +9 −2 Source/XnDeviceSensorV2/XnDeviceSensor.h
  74. +48 −34 Source/XnDeviceSensorV2/XnDeviceSensorIO.cpp
  75. +5 −3 Source/XnDeviceSensorV2/XnDeviceSensorIO.h
  76. +36 −3 Source/XnDeviceSensorV2/XnDeviceSensorInit.cpp
  77. +30 −23 Source/XnDeviceSensorV2/XnDeviceSensorInit.h
  78. +1 −1 Source/XnDeviceSensorV2/XnDeviceSensorProtocol.cpp
  79. +2 −1 Source/XnDeviceSensorV2/XnDeviceSensorProtocol.h
  80. +34 −2 Source/XnDeviceSensorV2/XnExportedSensorGenerator.cpp
  81. +2 −1 Source/XnDeviceSensorV2/XnExportedSensorGenerator.h
  82. +1 −0 Source/XnDeviceSensorV2/XnFirmwareInfo.h
  83. +9 −3 Source/XnDeviceSensorV2/XnFrameStreamProcessor.cpp
  84. +4 −0 Source/XnDeviceSensorV2/XnFrameStreamProcessor.h
  85. +80 −5 Source/XnDeviceSensorV2/XnHostProtocol.cpp
  86. +4 −0 Source/XnDeviceSensorV2/XnHostProtocol.h
  87. +11 −6 Source/XnDeviceSensorV2/XnImageProcessor.cpp
  88. +3 −1 Source/XnDeviceSensorV2/XnImageProcessor.h
  89. +8 −64 Source/XnDeviceSensorV2/XnJpegImageProcessor.cpp
  90. +1 −20 Source/XnDeviceSensorV2/XnJpegImageProcessor.h
  91. +117 −0 Source/XnDeviceSensorV2/XnJpegToRGBImageProcessor.cpp
  92. +64 −0 Source/XnDeviceSensorV2/XnJpegToRGBImageProcessor.h
  93. +7 −1 Source/XnDeviceSensorV2/XnParams.h
  94. +24 −2 Source/XnDeviceSensorV2/XnSensor.cpp
  95. +3 −0 Source/XnDeviceSensorV2/XnSensor.h
  96. +1 −1 Source/XnDeviceSensorV2/XnSensorAudioGenerator.cpp
  97. +1 −0 Source/XnDeviceSensorV2/XnSensorAudioGenerator.h
  98. +29 −16 Source/XnDeviceSensorV2/XnSensorAudioStream.cpp
  99. +10 −0 Source/XnDeviceSensorV2/XnSensorAudioStream.h
  100. +33 −23 Source/XnDeviceSensorV2/XnSensorClient.cpp
  101. +0 −4 Source/XnDeviceSensorV2/XnSensorClient.h
  102. +5 −1 Source/XnDeviceSensorV2/XnSensorClientStream.cpp
  103. +1 −0 Source/XnDeviceSensorV2/XnSensorClientStream.h
  104. +3 −2 Source/XnDeviceSensorV2/XnSensorDepthGenerator.cpp
  105. +1 −0 Source/XnDeviceSensorV2/XnSensorDepthGenerator.h
  106. +104 −59 Source/XnDeviceSensorV2/XnSensorDepthStream.cpp
  107. +17 −0 Source/XnDeviceSensorV2/XnSensorDepthStream.h
  108. +18 −1 Source/XnDeviceSensorV2/XnSensorDevice.cpp
  109. +7 −1 Source/XnDeviceSensorV2/XnSensorDevice.h
  110. +112 −45 Source/XnDeviceSensorV2/XnSensorFirmwareParams.cpp
  111. +8 −0 Source/XnDeviceSensorV2/XnSensorFirmwareParams.h
  112. +6 −1 Source/XnDeviceSensorV2/XnSensorGenerator.cpp
  113. +1 −0 Source/XnDeviceSensorV2/XnSensorGenerator.h
  114. +1 −9 Source/XnDeviceSensorV2/XnSensorIRGenerator.cpp
  115. +1 −0 Source/XnDeviceSensorV2/XnSensorIRGenerator.h
  116. +66 −36 Source/XnDeviceSensorV2/XnSensorIRStream.cpp
  117. +10 −0 Source/XnDeviceSensorV2/XnSensorIRStream.h
  118. +304 −37 Source/XnDeviceSensorV2/XnSensorImageGenerator.cpp
  119. +18 −3 Source/XnDeviceSensorV2/XnSensorImageGenerator.h
  120. +302 −53 Source/XnDeviceSensorV2/XnSensorImageStream.cpp
  121. +54 −0 Source/XnDeviceSensorV2/XnSensorImageStream.h
  122. +69 −41 Source/XnDeviceSensorV2/XnSensorMapGenerator.cpp
  123. +8 −3 Source/XnDeviceSensorV2/XnSensorMapGenerator.h
  124. +1 −9 Source/XnDeviceSensorV2/XnSensorOpenNiteImpl.cpp
  125. +136 −54 Source/XnDeviceSensorV2/XnSensorServer.cpp
  126. +7 −4 Source/XnDeviceSensorV2/XnSensorServer.h
  127. +17 −9 Source/XnDeviceSensorV2/XnServerSensorInvoker.cpp
  128. +85 −1 Source/XnDeviceSensorV2/XnServerSensorInvoker.h
View
62 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...
@@ -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
View
@@ -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_
@@ -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_
View
@@ -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 \
View
@@ -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)
View
@@ -1,23 +0,0 @@
-<OpenNI>
- <Licenses>
- <License vendor="PrimeSense" key="insert key here"/>
- </Licenses>
- <Log writeToConsole="true" writeToFile="false">
- <!-- 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default) -->
- <LogLevel value="3"/>
- <Masks>
- <Mask name="ALL" on="false"/>
- </Masks>
- <Dumps>
- </Dumps>
- </Log>
- <ProductionNodes>
- <Node type="Depth">
- <Configuration>
- <MapOutputMode xRes="640" yRes="480" FPS="30"/>
- <Mirror on="true"/>
- </Configuration>
- </Node>
- <Node type="Scene" />
- </ProductionNodes>
-</OpenNI>
@@ -1,24 +0,0 @@
-<OpenNI>
- <Licenses>
- <License vendor="PrimeSense" key="insert key here"/>
- </Licenses>
- <Log writeToConsole="true" writeToFile="false">
- <!-- 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default) -->
- <LogLevel value="3"/>
- <Masks>
- <Mask name="ALL" on="false"/>
- </Masks>
- <Dumps>
- </Dumps>
- </Log>
- <ProductionNodes>
- <Node type="Depth">
- <Configuration>
- <MapOutputMode xRes="640" yRes="480" FPS="30"/>
- <Mirror on="true"/>
- </Configuration>
- </Node>
- <Node type="Gesture" />
- <Node type="Hands" />
- </ProductionNodes>
-</OpenNI>
View
@@ -1,23 +0,0 @@
-<OpenNI>
- <Licenses>
- <License vendor="PrimeSense" key="insert key here"/>
- </Licenses>
- <Log writeToConsole="true" writeToFile="false">
- <!-- 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default) -->
- <LogLevel value="3"/>
- <Masks>
- <Mask name="ALL" on="false"/>
- </Masks>
- <Dumps>
- </Dumps>
- </Log>
- <ProductionNodes>
- <Node type="Depth">
- <Configuration>
- <MapOutputMode xRes="640" yRes="480" FPS="30"/>
- <Mirror on="true"/>
- </Configuration>
- </Node>
- <Node type="User" />
- </ProductionNodes>
-</OpenNI>
@@ -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>
@@ -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
@@ -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
Oops, something went wrong.

0 comments on commit 19f005a

Please sign in to comment.