Z991239-4806 #comment 优化自动核身流程

Module/mod_livenessdetection/RvcFaceVideo.h

@@ -2,7 +2,10 @@
 #include "../../Other/libvideoqueue/libvideoqueue.h"
 #include "../../Other/libvideoframework/videoutil.h"
 
+#ifndef MAX_PATH
 #define MAX_PATH          260
+#endif // !MAX_PATH
+
 
 class RvcFaceVideo
 {

Module/mod_livenessdetection/mod_livenessdetection.cpp

@@ -118,6 +118,13 @@ ErrorCodeEnum CLivenessDetectionEntity::__OnStart(ErrorCodeEnum preOperationErro
 	m_iCameraState = 'N';
 	BOOL bRet = FALSE;
 
+	if (eStand1SPlusType == m_eDeviceType){
+		m_pFaceVideo->InitVideoQueue(REC_COMMON_VIDEO_ENV_SHM_SNAPSHOT_QUEUE, NULL, REC_COMMON_VIDEO_ENV_SHM_PREVIEW_QUEUE, NULL);
+	}
+	else{
+		m_pFaceVideo->InitVideoQueue(REC_COMMON_VIDEO_ENV_SHM_SNAPSHOT_QUEUE, REC_COMMON_VIDEO_OPT_SHM_SNAPSHOT_QUEUE, REC_COMMON_VIDEO_ENV_SHM_PREVIEW_QUEUE, REC_COMMON_VIDEO_OPT_SHM_PREVIEW_QUEUE);
+	}
+
 	int i = 0;
 	m_arrListener.Init(2);
 	GetFunction()->SubscribeLog(m_arrListener[i++], this, Log_Event, Severity_Middle, Error_IgnoreAll, LOG_EVT_BEGIN_HANDLE_BUSINESS, NULL, false);
@@ -241,7 +248,6 @@ int CLivenessDetectionEntity::on_get_videodata(eVideoType eType, eCameraType eca
 		idatalen = m_pFaceVideo->GetVideoFrameSize(ecameraid, width, height);
 	}
 
-
 	if (0 < idatalen) {
 		video_frame vframe = { 0 };
 		vframe.format = VIDEO_FORMAT_RGB24;