Merge branch 'posix' of ssh://git.code.sf.net/p/facetracknoir/codegit into posix

3 files changed, 37 insertions, 114 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31f6f6b4..36917f76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -449,7 +449,7 @@ if(SDK_SM_FACEAPI_PATH)
 endif() 
 if(WIN32 AND NOT SDK_FACEAPI_ONLY)
     add_library(ftnoir-tracker-faceapi SHARED ${ftnoir-tracker-faceapi-c} ${ftnoir-tracker-faceapi-moc} ${ftnoir-tracker-faceapi-uih} ${ftnoir-tracker-faceapi-rcc})
-    target_link_libraries(ftnoir-tracker-faceapi ${MY_QT_LIBS})
+    target_link_libraries(ftnoir-tracker-faceapi ${MY_QT_LIBS} ftnoir-compat)
 endif()
 if(MSVC80 AND SDK_SM_FACEAPI_PATH)
     add_executable(ftnoir-faceapi-wrapper ${ftnoir-faceapi-wrapper-c})
diff --git a/ftnoir_tracker_sm/ftnoir_tracker_faceapi.cpp b/ftnoir_tracker_sm/ftnoir_tracker_faceapi.cpp
index f849392b..09d7432b 100644
--- a/ftnoir_tracker_sm/ftnoir_tracker_faceapi.cpp
+++ b/ftnoir_tracker_sm/ftnoir_tracker_faceapi.cpp
@@ -26,41 +26,27 @@
 #include <QtGui>

 #include "facetracknoir/global-settings.h"

 

-FTNoIR_Tracker::FTNoIR_Tracker()

+FTNoIR_Tracker::FTNoIR_Tracker() : lck_shm(SM_MM_DATA, SM_MUTEX, sizeof(SMMemMap))

 {

+    pMemData = (SMMemMap*) lck_shm.mem;

 }

 

 FTNoIR_Tracker::~FTNoIR_Tracker()

 {

 	qDebug() << "~FTNoIR_Tracker says: cleaning up";

 

-	if ( pMemData != NULL ) {

-		UnmapViewOfFile ( pMemData );

-	}

-

 	bEnableRoll = true;

 	bEnablePitch = true;

 	bEnableYaw = true;

 	bEnableX = true;

 	bEnableY = true;

 	bEnableZ = true;

-

-	CloseHandle( hSMMutex );

-	CloseHandle( hSMMemMap );

-	hSMMemMap = 0;

 }

 

 void FTNoIR_Tracker::StartTracker(QFrame *videoframe )

 {

     qDebug() << "FTNoIR_Tracker::Initialize says: Starting ";

 

-    if (SMCreateMapping()) {

-        qDebug() << "FTNoIR_Tracker::Initialize Mapping created.";

-    }

-    else {

-        QMessageBox::warning(0,"FaceTrackNoIR Error","Memory mapping not created!",QMessageBox::Ok,QMessageBox::NoButton);

-    }

-

     loadSettings();

 

     if ( pMemData != NULL ) {

@@ -111,41 +97,37 @@ bool FTNoIR_Tracker::GiveHeadPoseData(THeadPoseData *data)
 	//

 	// Check if the pointer is OK and wait for the Mutex.

 	//

-	if ( (pMemData != NULL) && (WaitForSingleObject(hSMMutex, 100) == WAIT_OBJECT_0) ) {

-

-//		qDebug() << "FTNoIR_Tracker::GiveHeadPoseData says: Retrieving data.";

-		

-		//

-		// Copy the measurements to FaceTrackNoIR.

-		//

-		if (bEnableX) {

-			data->x     = pMemData->data.new_pose.head_pos.x * 100.0f;						// From meters to centimeters

-		}

-		if (bEnableY) {

-			data->y     = pMemData->data.new_pose.head_pos.y * 100.0f;

-		}

-		if (bEnableZ) {

-			data->z     = pMemData->data.new_pose.head_pos.z * 100.0f;

-		}

-		if (bEnableYaw) {

-			data->yaw   = pMemData->data.new_pose.head_rot.y_rads * 57.295781f;			// From rads to degrees

-		}

-		if (bEnablePitch) {

-			data->pitch = pMemData->data.new_pose.head_rot.x_rads * 57.295781f;

-		}

-		if (bEnableRoll) {

-			data->roll  = pMemData->data.new_pose.head_rot.z_rads * 57.295781f;

-		}

-

-		//

-		// Reset the handshake, to let faceAPI know we're still here!

-		//

-		pMemData->handshake = 0;

-

-		ReleaseMutex(hSMMutex);

-		return ( pMemData->data.new_pose.confidence > 0 );

-	}

-	return false;

+    lck_shm.lock();

+

+    //

+    // Copy the measurements to FaceTrackNoIR.

+    //

+    if (bEnableX) {

+        data->x     = pMemData->data.new_pose.head_pos.x * 100.0f;						// From meters to centimeters

+    }

+    if (bEnableY) {

+        data->y     = pMemData->data.new_pose.head_pos.y * 100.0f;

+    }

+    if (bEnableZ) {

+        data->z     = pMemData->data.new_pose.head_pos.z * 100.0f;

+    }

+    if (bEnableYaw) {

+        data->yaw   = pMemData->data.new_pose.head_rot.y_rads * 57.295781f;			// From rads to degrees

+    }

+    if (bEnablePitch) {

+        data->pitch = pMemData->data.new_pose.head_rot.x_rads * 57.295781f;

+    }

+    if (bEnableRoll) {

+        data->roll  = pMemData->data.new_pose.head_rot.z_rads * 57.295781f;

+    }

+

+    //

+    // Reset the handshake, to let faceAPI know we're still here!

+    //

+    pMemData->handshake = 0;

+    lck_shm.unlock();

+

+    return ( pMemData->data.new_pose.confidence > 0 );

 }

 

 //

@@ -176,63 +158,6 @@ void FTNoIR_Tracker::loadSettings() {
 	iniFile.endGroup ();

 }

 

-//

-// Create a memory-mapping to the faceAPI data.

-// It contains the tracking data, a command-code from FaceTrackNoIR

-//

-//

-bool FTNoIR_Tracker::SMCreateMapping()

-{

-	qDebug() << "FTNoIR_Tracker::FTCreateMapping says: Starting Function";

-

-	//

-	// A FileMapping is used to create 'shared memory' between the faceAPI and FaceTrackNoIR.

-	//

-	// Try to create a FileMapping to the Shared Memory.

-	// If one already exists: close it.

-	//

-    hSMMemMap = CreateFileMappingA( INVALID_HANDLE_VALUE , 00 , PAGE_READWRITE , 0 ,

-		                           sizeof( TFaceData ) + sizeof( HANDLE ) + 100, 

-								   (LPCSTR) SM_MM_DATA );

-

-	if ( hSMMemMap != 0 ) {

-		qDebug() << "FTNoIR_Tracker::FTCreateMapping says: FileMapping Created!";

-	}

-

-	if ( ( hSMMemMap != 0 ) && ( (long) GetLastError == ERROR_ALREADY_EXISTS ) ) {

-		CloseHandle( hSMMemMap );

-		hSMMemMap = 0;

-	}

-

-	//

-	// Create a new FileMapping, Read/Write access

-	//

-    hSMMemMap = OpenFileMappingA( FILE_MAP_WRITE, false , (LPCSTR) SM_MM_DATA );

-	if ( ( hSMMemMap != 0 ) ) {

-		qDebug() << "FTNoIR_Tracker::FTCreateMapping says: FileMapping Created again..." << hSMMemMap;

-        pMemData = (SMMemMap *) MapViewOfFile(hSMMemMap, FILE_MAP_WRITE, 0, 0, sizeof(TFaceData));

-		if (pMemData != NULL) {

-			qDebug() << "FTNoIR_Tracker::FTCreateMapping says: MapViewOfFile OK.";

-//			pMemData->handle = handle;	// The game uses the handle, to send a message that the Program-Name was set!

-		}

-	    hSMMutex = CreateMutexA(NULL, false, SM_MUTEX);

-	}

-	else {

-		qDebug() << "FTNoIR_Tracker::FTCreateMapping says: Error creating Shared Memory for faceAPI!";

-		return false;

-	}

-

-	//if (pMemData != NULL) {

-	//	pMemData->data.DataID = 1;

-	//	pMemData->data.CamWidth = 100;

-	//	pMemData->data.CamHeight = 250;

-	//}

-

-	return true;

-}

-

-

-

 ////////////////////////////////////////////////////////////////////////////////

 // Factory function that creates instances if the Tracker object.

 

diff --git a/ftnoir_tracker_sm/ftnoir_tracker_sm.h b/ftnoir_tracker_sm/ftnoir_tracker_sm.h
index 39997970..ae79436d 100644
--- a/ftnoir_tracker_sm/ftnoir_tracker_sm.h
+++ b/ftnoir_tracker_sm/ftnoir_tracker_sm.h
@@ -32,6 +32,7 @@
 #include "Windows.h"

 #include "math.h"

 #include "facetracknoir/global-settings.h"

+#include "compat/compat.h"

 #include <QFrame>

 

 using namespace std;

@@ -48,18 +49,15 @@ public:
     void WaitForExit();

 

 	void loadSettings();

-	bool SMCreateMapping();

 

 private:

 	//

 	// global variables

 	//

-	HANDLE hSMMemMap;

-	SMMemMap *pMemData;

-	HANDLE hSMMutex;

+    PortableLockedShm lck_shm;

+    SMMemMap *pMemData;

 	QProcess *faceAPI;

 

-//	int numTracker;

 	bool bEnableRoll;

 	bool bEnablePitch;

 	bool bEnableYaw;