Updated version to 1.3.4.6.

siliconvalleypilot · Nov 9, 2011 · b8a2e79 · b8a2e79
1 parent ace9d2d
commit b8a2e79
Show file tree

Hide file tree

Showing 159 changed files with 1,499 additions and 2,610 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,25 @@
 Detailed Change log:
 --------------------
 
+Version 1.3.4.6 (Unstable version - Nov 7th 2011)
+-------------------------------------------------
+  * In MockGenerator::SetData, change the node to Generating state so it would be recorded properly.
+  * Added new calibration error messages to the XnCalibrationStatus enum.
+  * XnArray: Allow passing base size in the ctor (to save double allocation).
+  * NiViewer: Removed an unnecessary line from file dialog init
+  * Bug fix: When recording from mock node, the first frame is no longer lost.
+  * XnOS: Added the option to create named objects in a way that will be accessible to other sessions.
+  * Renamed Linux-x86* files to Linux*
+  * Linux Bug Fix: xnOSSeekFile64 did not return OK. This caused problems in playback and recording of ONI files.
+  * Added some error log prints to the codecs and players.
+  * C# wrappers: fixed the marshaling of license struct.
+  * Added the function SetDataBytes to XnBitSet so it now accepts a byte buffer of any size. Note: byte order is different when reading from byte array or dword array in little endian platforms.
+  * C# wrappers: fixed a bug related to ProductionNodeDescription. Might break API, but this API would usually crash, so its OK.
+  * Linux: Switched to newer makefiles. SSE is enabled in debug, always declare sysroot (even for /) so that -I=/usr/include/ni could work properly.
+  * Linux: fix cross compilation and add separate scripts to cross compile on specific machine. Also, binary folders are now named according to platform and configuration.
+  * Documentation: Added a section about creating modules.
+  * Backwards Compatibility Workaround: some old recordings marked nodes as not generating though they contained frames. This resulted in "node is locked" error if trying to start generating them.
+
 Version 1.3.4.3 (Unstable version - Oct 10th 2011)
 --------------------------------------------------
   * Update to newer version of CommonCppMakefile (without the -malign-double flag).

diff --git a/Documentation/OpenNI.chm b/Documentation/OpenNI.chm
diff --git a/Include/XnArray.h b/Include/XnArray.h
@@ -43,9 +43,9 @@ class XnArray
 	typedef const T* ConstIterator;
 
 	/** Default constructor. Initializes the array to BASE_SIZE. **/
-	XnArray()
+	XnArray(XnUInt32 nBaseSize = BASE_SIZE)
 	{
-		Init();
+		Init(nBaseSize);
 	}
 
 	/** Copy constructor. Initializes this array from another array of the same type. **/
@@ -298,10 +298,10 @@ class XnArray
 	}
 
 private:
-	void Init()
+	void Init(XnUInt32 nBaseSize = BASE_SIZE)
 	{
-		m_pData = XN_NEW_ARR(T, BASE_SIZE);
-		m_nAllocatedSize = BASE_SIZE;
+		m_pData = XN_NEW_ARR(T, nBaseSize);
+		m_nAllocatedSize = nBaseSize;
 		m_nSize = 0;
 	}
 

diff --git a/Include/XnBitSet.h b/Include/XnBitSet.h
@@ -75,6 +75,21 @@ class XnBitSet
 		return XN_STATUS_OK;
 	}
 
+	/** Copies raw data from a buffer of bytes to this bitset. **/
+	XnStatus SetDataBytes(const XnUInt8* pData, XnUInt32 nSizeInBytes)
+	{
+		//XnStatus nRetVal = m_array.SetData(reinterpret_cast<const XnUInt32*>(pData), XN_MAX(1, nSizeInBytes >> 2));
+		XnUInt32 nSizeInDwords = XN_MAX(1, nSizeInBytes >> 2);
+		XnStatus nRetVal = m_array.SetSize(nSizeInDwords);
+		XN_IS_STATUS_OK(nRetVal);
+		for (XnUInt32 nDwordIdx = 0, nByteIdx = 0; nDwordIdx < nSizeInDwords; nDwordIdx++, nByteIdx += 4)
+		{
+			m_array[nDwordIdx] = ((pData[nByteIdx] << 24) | (pData[nByteIdx + 1] << 16) | (pData[nByteIdx + 2] << 8) | pData[nByteIdx + 3] );
+		}
+		m_nSize = (nSizeInBytes << 3);
+		return XN_STATUS_OK;
+	}
+
 	/** @returns The raw data of this bitset as a buffer of dwords. **/
 	const XnUInt32* GetData() const
 	{

diff --git a/Include/XnLog.h b/Include/XnLog.h
@@ -407,7 +407,11 @@ XN_C_API XnStatus XN_C_DECL xnLogCreateFileEx(const XnChar* strFileName, XnBool
 
 #define XN_MASK_RETVAL_CHECKS "RetValChecks"
 
+#if XN_PLATFORM == XN_PLATFORM_ARC
+extern "C" XnLogger* XN_LOGGER_RETVAL_CHECKS;
+#else
 XN_C_API XnLogger* XN_LOGGER_RETVAL_CHECKS;
+#endif
 
 /** Validates return value and writes log message with appropriate status string **/
 #define XN_IS_STATUS_OK_LOG_ERROR(what, nRetVal)														\

diff --git a/Include/XnOS.h b/Include/XnOS.h
@@ -531,6 +531,7 @@ XN_C_API XnStatus XN_C_DECL xnOSCreateProcess(const XnChar* strExecutable, XnUIn
 // Mutex
 XN_C_API XnStatus XN_C_DECL xnOSCreateMutex(XN_MUTEX_HANDLE* pMutexHandle);
 XN_C_API XnStatus XN_C_DECL xnOSCreateNamedMutex(XN_MUTEX_HANDLE* pMutexHandle, const XnChar* cpMutexName);
+XN_C_API XnStatus XN_C_DECL xnOSCreateNamedMutexEx(XN_MUTEX_HANDLE* pMutexHandle, const XnChar* cpMutexName, XnBool bAllowOtherUsers);
 XN_C_API XnStatus XN_C_DECL xnOSCloseMutex(XN_MUTEX_HANDLE* pMutexHandle);
 XN_C_API XnStatus XN_C_DECL xnOSLockMutex(const XN_MUTEX_HANDLE MutexHandle, XnUInt32 nMilliseconds);
 XN_C_API XnStatus XN_C_DECL xnOSUnLockMutex(const XN_MUTEX_HANDLE MutexHandle);
@@ -544,7 +545,9 @@ XN_C_API XnStatus XN_C_DECL xnOSLeaveCriticalSection(XN_CRITICAL_SECTION_HANDLE*
 // Events
 XN_C_API XnStatus XN_C_DECL xnOSCreateEvent(XN_EVENT_HANDLE* pEventHandle, XnBool bManualReset);
 XN_C_API XnStatus XN_C_DECL xnOSCreateNamedEvent(XN_EVENT_HANDLE* pEventHandle, const XnChar* cpEventName, XnBool bManualReset);
+XN_C_API XnStatus XN_C_DECL xnOSCreateNamedEventEx(XN_EVENT_HANDLE* pEventHandle, const XnChar* cpEventName, XnBool bManualReset, XnBool bAllowOtherUsers);
 XN_C_API XnStatus XN_C_DECL xnOSOpenNamedEvent(XN_EVENT_HANDLE* pEventHandle, const XnChar* cpEventName);
+XN_C_API XnStatus XN_C_DECL xnOSOpenNamedEventEx(XN_EVENT_HANDLE* pEventHandle, const XnChar* cpEventName, XnBool bAllowOtherUsers);
 XN_C_API XnStatus XN_C_DECL xnOSCloseEvent(XN_EVENT_HANDLE* pEventHandle);
 XN_C_API XnStatus XN_C_DECL xnOSSetEvent(const XN_EVENT_HANDLE EventHandle);
 XN_C_API XnStatus XN_C_DECL xnOSResetEvent(const XN_EVENT_HANDLE EventHandle);
@@ -600,6 +603,8 @@ typedef struct XnOSSharedMemory XnOSSharedMemory, *XN_SHARED_MEMORY_HANDLE;
  */
 XN_C_API XnStatus XN_C_DECL xnOSCreateSharedMemory(const XnChar* strName, XnUInt32 nSize, XnUInt32 nAccessFlags, XN_SHARED_MEMORY_HANDLE* phSharedMem);
 
+XN_C_API XnStatus XN_C_DECL xnOSCreateSharedMemoryEx(const XnChar* strName, XnUInt32 nSize, XnUInt32 nAccessFlags, XnBool bAllowOtherUsers, XN_SHARED_MEMORY_HANDLE* phSharedMem);
+
 /**
  * Opens a shared memory block, and returns the address in which it was mapped to the process' memory.
  *

diff --git a/Include/XnOSCpp.h b/Include/XnOSCpp.h
@@ -60,8 +60,7 @@ class XnAutoCSLocker
 	{
 		if (!m_bLocked)
 		{
-			XnStatus nRetVal = xnOSEnterCriticalSection(&m_hCS);
-			XN_ASSERT(nRetVal == XN_STATUS_OK);
+			xnOSEnterCriticalSection(&m_hCS);
 			m_bLocked = TRUE;
 		}
 	}
@@ -70,8 +69,7 @@ class XnAutoCSLocker
 	{
 		if (m_bLocked)
 		{
-			XnStatus nRetVal = xnOSLeaveCriticalSection(&m_hCS);
-			XN_ASSERT(nRetVal == XN_STATUS_OK);
+			xnOSLeaveCriticalSection(&m_hCS);
 			m_bLocked = FALSE;
 		}
 	}
@@ -128,14 +126,14 @@ class XnOSEvent
 		return xnOSCreateEvent(&m_hEvent, bManualReset);
 	}
 
-	XnStatus Create(const XnChar* strName, XnBool bManualReset)
+	XnStatus Create(const XnChar* strName, XnBool bManualReset, XnBool bAllowOtherUsers = FALSE)
 	{
-		return xnOSCreateNamedEvent(&m_hEvent, strName, bManualReset);
+		return xnOSCreateNamedEventEx(&m_hEvent, strName, bManualReset, bAllowOtherUsers);
 	}
 
-	XnStatus Open(const XnChar* strName)
+	XnStatus Open(const XnChar* strName, XnBool bEnableOtherUsers = FALSE)
 	{
-		return xnOSOpenNamedEvent(&m_hEvent, strName);
+		return xnOSOpenNamedEventEx(&m_hEvent, strName, bEnableOtherUsers);
 	}
 
 	XnStatus Close()

diff --git a/Include/XnTypes.h b/Include/XnTypes.h
@@ -651,15 +651,18 @@ typedef enum XnPoseDetectionStatus
 /** Possible statuses for calibration */
 typedef enum XnCalibrationStatus
 {
-	XN_CALIBRATION_STATUS_OK		= 0,
-	XN_CALIBRATION_STATUS_NO_USER	= 1,
-	XN_CALIBRATION_STATUS_ARM		= 2,
-	XN_CALIBRATION_STATUS_LEG		= 3,
-	XN_CALIBRATION_STATUS_HEAD		= 4,
-	XN_CALIBRATION_STATUS_TORSO		= 5,
-	XN_CALIBRATION_STATUS_TOP_FOV	= 6,
-	XN_CALIBRATION_STATUS_SIDE_FOV	= 7,
-	XN_CALIBRATION_STATUS_POSE		= 8,
+	XN_CALIBRATION_STATUS_OK		    = 0,
+	XN_CALIBRATION_STATUS_NO_USER	    = 1,
+	XN_CALIBRATION_STATUS_ARM		    = 2,
+	XN_CALIBRATION_STATUS_LEG		    = 3,
+	XN_CALIBRATION_STATUS_HEAD		    = 4,
+	XN_CALIBRATION_STATUS_TORSO		    = 5,
+	XN_CALIBRATION_STATUS_TOP_FOV	    = 6,
+	XN_CALIBRATION_STATUS_SIDE_FOV	    = 7,
+	XN_CALIBRATION_STATUS_POSE		    = 8,
+    XN_CALIBRATION_STATUS_MANUAL_ABORT  = 9,
+    XN_CALIBRATION_STATUS_MANUAL_RESET  = 10,
+    XN_CALIBRATION_STATUS_TIMEOUT_FAIL = 11
 } XnCalibrationStatus;
 
 typedef enum XnDirection

diff --git a/Include/XnVersion.h b/Include/XnVersion.h
@@ -37,7 +37,7 @@
 /** OpenNI maintenance version. */ 
 #define XN_MAINTENANCE_VERSION 4
 /** OpenNI build version. */ 
-#define XN_BUILD_VERSION 3
+#define XN_BUILD_VERSION 6
 
 /** OpenNI version (in brief string format): "Major.Minor.Maintenance (Build)" */ 
 #define XN_BRIEF_VERSION_STRING \

diff --git a/Platform/Linux-Arm/Build/CommonMakefile b/Platform/Linux-Arm/Build/CommonMakefile
diff --git a/Platform/Linux-Arm/Build/MakeInstallBeagleboard b/Platform/Linux-Arm/Build/MakeInstallBeagleboard