Z991239-6063 #comment 优化脸部跟踪库

Module/mod_facetracking/mod_facetracking.cpp

@@ -64,8 +64,7 @@ public:
 		ErrorCodeEnum Error;
 		bool bRet = false;
 		m_facecapture = new Clibfacecapture(&bRet, this, this, REC_COMMON_VIDEO_ENV_SHM_RTP_QUEUE, REC_COMMON_VIDEO_ENV_SHM_SNAPSHOT_QUEUE, REC_COMMON_VIDEO_OPT_SHM_RTP_QUEUE);
-		if (!bRet) 
-		{
+		if (!bRet) {
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("load libface capture failed!");
 			pTransactionContext->SendAnswer(Error_Resource);
 			return;
@@ -229,7 +228,7 @@ public:
 		{
 			CSmartPointer<IEntityFunction> spFunction = GetFunction();
 			CSimpleStringA strValue;
-			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("OnTimeout, check value, eCamera = %d", status.stCustomerPos.eCamera);
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("OnTimeout, check value, eCamera = %d", status.stCustomerPos.eCamera);
 			spFunction->GetSysVar(SYSVAR_ACTIVETRACKINGCAMERA, strValue); // E or O
 			if (status.stCustomerPos.eCamera == EnvironCamera) 
 			{

Module/mod_interactivecontrol/mod_interactivecontrol.cpp

@@ -1618,6 +1618,9 @@ void CITCtrlEntity::OnSalesRecordingFailed(const char* pszFailedMsg)
 void CITCtrlEntity::OnFaceTrackingMsg(const char* pszFaceTrackingMsg)
 {
 	char strTime[MAX_PATH] = { 0 };
+	CSimpleStringA strValue;
+	GetFunction()->GetSysVar("ActiveTrackingCamera", strValue); // E or O
+	CSimpleStringA strMsg = CSimpleStringA::Format("[%s] ", strValue.GetData());
 #ifdef _WIN32
 	SYSTEMTIME nowTime;                             // 系统时间结构体
 	GetLocalTime(&nowTime);
@@ -1628,7 +1631,7 @@ void CITCtrlEntity::OnFaceTrackingMsg(const char* pszFaceTrackingMsg)
 	pst = localtime(&t);
 	snprintf(strTime, MAX_PATH, "(%02d:%02d:%02d)", pst->tm_hour, pst->tm_min, pst->tm_wday, pst->tm_sec);
 #endif // _WIN32
-	CSimpleStringA strMsg = pszFaceTrackingMsg;
+	strMsg += pszFaceTrackingMsg;
 	strMsg += strTime;
 	FaceTrackingMsg evt;
 	evt.Trackingmsg = CSimpleStringA2W(strMsg);

Other/libvideoqueue/libvideoqueue.cpp

@@ -723,7 +723,7 @@ void Clibvideoqueue::ClearVideoQueue()
 
 int Clibvideoqueue::GetFrameSize(int&width,int&height)
 {
-	int i = m_pImpl->GetFrameSize(width,height);
+	int i = m_pImpl->GetFrameSize(width, height);
 	return i;
 }