Skip to content

Commit

Permalink
Upgraded code to version 5.1.0.25
Browse files Browse the repository at this point in the history
  • Loading branch information
avin2 committed Dec 21, 2011
1 parent 257475f commit 52adc2b
Show file tree
Hide file tree
Showing 168 changed files with 3,967 additions and 8,958 deletions.
21 changes: 21 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
Detailed Change log:
--------------------

Version 5.1.0.25 (Unstable version - Dec 18th 2011)
---------------------------------------------------
* Bug Fix: server-client didn't always work due to an uninitialized member.
* Installer bug fix: versions were compared by string instead of by number.
* Added Support for FW 5.5:
1) Support product ID 0601.
2) ISO and BULK interfaces are now switched.
3) AudioGenerator is no longer supported.
* Enumeration Bug Fix: From now on, a generator will not return on enumeration if one already exists from the same device.
* Android: makefiles now match ndk v7.
* Bug Fix: client-server did not pass timestamp correct in the NewDataAvailbale event, causing FrameSync to malfunction.
* Bug Fix: Enumeration for ImageGenerator could cause a crash.
* Default UsbInterface is now BULK on Arm (for performance reasons) and ISO on all other platforms.
* Default Image format is now uncompressed in ISO, and compressed in BULK.
* Server (Multiprocess) is not on by default on Arm.
* BC Bug fix: XnVInitStreamPropertiesInternal::IsProperty did not function correctly.
* BC Bug Fix: XnVDepthRepresentation would not set correct Y resolution.
* Added support for FW 5.6 (no audio)
* Added Android support to open source.
* Temporary patch for MacOSX: Cache the device path's since running enum on the MAC takes several seconds!

Version 5.0.5.1 (Unstable version - Nov 17th 2011)
--------------------------------------------------
* Removed support for very old 2.0 devices.
Expand Down
6 changes: 3 additions & 3 deletions Data/GlobalDefaultsKinect.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ LogWriteToFile=1

;---------------- Server Default Configuration -------------------
[Server]
; Use a server to access sensor. 0 - No (single application), 1 - Yes (multiple applications, default)
; Use a server to access sensor. 0 - No (single application), 1 - Yes (multiple applications). Default: Arm - 0, other platforms - 1. Not supported on Mac.
;EnableMultiProcess=0

; When multi process is enabled, allows server and client running in different sessions. 0 - No (default), 1 - Yes
Expand Down Expand Up @@ -56,7 +56,7 @@ LogWriteToFile=1
; Is APC enabled. 0 - Off, 1 - On (default)
;APCEnabled=1

; USB interface to be used. 0 - FW Default (default), 1 - ISO endpoints, 2 - BULK endpoints
; USB interface to be used. 0 - FW Default, 1 - ISO endpoints, 2 - BULK endpoints. Default: Arm - 2, other platforms - 1
;UsbInterface=2

[Depth]
Expand Down Expand Up @@ -139,7 +139,7 @@ LogWriteToFile=1
; Frames per second (default is 30)
;FPS=30

; Input format. 0 - BAYER (1.3MP or 2.0MP only), 1 - Compressed YUV422, 2 - Jpeg, 5 - Uncompressed YUV422 (default), 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
;InputFormat=5

; Anti Flicker. 0 - Off (default), 50 - 50Hz, 60 - 60 Hz.
Expand Down
4 changes: 2 additions & 2 deletions Include/XnIOFileStream.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ class XN_CORE_CPP_API XnIOFileStream : public XnIOStream
virtual XnStatus Init();
virtual XnStatus Free();

XnStatus Tell(XnUInt32* pnOffset);
XnStatus Seek(XnUInt32 nOffset);
XnStatus Tell(XnUInt64* pnOffset);
XnStatus Seek(XnUInt64 nOffset);

private:
const XnChar* m_pcsFileName;
Expand Down
6 changes: 3 additions & 3 deletions Include/XnPsVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
/** Xiron major version. */
#define XN_PS_MAJOR_VERSION 5
/** Xiron minor version. */
#define XN_PS_MINOR_VERSION 0
#define XN_PS_MINOR_VERSION 1
/** Xiron maintenance version. */
#define XN_PS_MAINTENANCE_VERSION 5
#define XN_PS_MAINTENANCE_VERSION 0
/** Xiron build version. */
#define XN_PS_BUILD_VERSION 1
#define XN_PS_BUILD_VERSION 25

/** Xiron version (in brief string format): "Major.Minor.Maintenance (Build)" */
#define XN_PS_BRIEF_VERSION_STRING \
Expand Down
4 changes: 4 additions & 0 deletions Include/XnStreamParams.h
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,8 @@
#define XN_MODULE_PROPERTY_PHYSICAL_DEVICE_NAME "PhysicalDeviceName"
/** String */
#define XN_MODULE_PROPERTY_VENDOR_SPECIFIC_DATA "VendorSpecificData"
/** Boolean */
#define XN_MODULE_PROPERTY_AUDIO_SUPPORTED "AudioSupported"


//---------------------------------------------------------------------------
Expand Down Expand Up @@ -407,6 +409,8 @@ typedef enum
XN_SENSOR_FW_VER_5_2 = 8,
XN_SENSOR_FW_VER_5_3 = 9,
XN_SENSOR_FW_VER_5_4 = 10,
XN_SENSOR_FW_VER_5_5 = 11,
XN_SENSOR_FW_VER_5_6 = 12,
} XnFWVer;

typedef enum
Expand Down
11 changes: 0 additions & 11 deletions Platform/ARC/Build/BuildNotes.txt

This file was deleted.

Loading

0 comments on commit 52adc2b

Please sign in to comment.