Z991239-4157 #comment mod_mediacontroller实体启动优化

Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -602,22 +602,17 @@ void CMediaControllerEntity::OnTimeCameraStatusCheck()
 	capture_detect_camera_bug(m_capture, &env_n, &opt_n, bIsPadType);
 	capture_get_last_frametime(m_capture, &nLastEnvTime, &nLastOptTime, bIsPadType);
 
-	if (env_n == 0)
-	{
-		if (m_iEnvEmptyTimes < CAMERA_BUG_THRESHOLD)
-		{
-			m_iEnvEmptyTimes++;
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get env camera picture fail，Times=%d", m_iEnvEmptyTimes);
-		}
-	}
-	else if (env_n == -1)
-	{
+	if (env_n == 0) {
+		if (m_iEnvEmptyTimes < CAMERA_BUG_THRESHOLD){
+			m_iEnvEmptyTimes++; 
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get env camera picture fail,Times=%d",m_iEnvEmptyTimes);
+		}	
+	} 
+	else if (env_n == -1){
 		m_iEnvEmptyTimes = CAMERA_BUG_THRESHOLD;
 	}
-	else
-	{
-		if (m_iEnvEmptyTimes == CAMERA_BUG_THRESHOLD)
-		{
+	else {
+		if (m_iEnvEmptyTimes == CAMERA_BUG_THRESHOLD){
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("env camera get right!");
 		}
 		m_iEnvEmptyTimes = 0;
@@ -646,45 +641,42 @@ void CMediaControllerEntity::OnTimeCameraStatusCheck()
 		if ((ePadtype == m_eDeviceType) || (eMobilePadType == m_eDeviceType) || (eDesk2SType == m_eDeviceType) || (eDesk1SType == m_eDeviceType) || (eDesk2SIntegratedType == m_eDeviceType))
 		{
 			m_nCameraErrorCode = Error_AllCamera;
-			/*ChangeSysvar(m_nCameraErrorCode);*/
 			ChangeSysvar(Error_EnvCamera);
 			if (!m_bIsRemoteRecord) {
 				RealSelfCheck();
 			}
 			return;
 		}
-		else
-		{
-			if (m_nCameraErrorCode == Error_Succeed)
-			{
+		else{
+			if (m_nCameraErrorCode == Error_Succeed){
 				m_nCameraErrorCode = Error_EnvCamera;
 				ChangeSysvar(m_nCameraErrorCode);
 			}
-			else if (m_nCameraErrorCode == Error_OptCamera)
-			{
+			else if (m_nCameraErrorCode == Error_OptCamera){
 				m_nCameraErrorCode = Error_AllCamera;
 				ChangeSysvar(m_nCameraErrorCode);
 				if (!m_bIsRemoteRecord) {
 					RealSelfCheck();
 				}
+
 				return;
 			}
 		}
 	}
-	else if ((m_iEnvEmptyTimes != CAMERA_BUG_THRESHOLD) && !bEnvTimeout && ((m_nCameraErrorCode == Error_EnvCamera) || (m_nCameraErrorCode == Error_AllCamera)))
+	else if((m_iEnvEmptyTimes != CAMERA_BUG_THRESHOLD)&&!bEnvTimeout&&((m_nCameraErrorCode == Error_EnvCamera)||(m_nCameraErrorCode == Error_AllCamera)))
 	{
-		if ((ePadtype == m_eDeviceType) || (eMobilePadType == m_eDeviceType) || (eDesk2SType == m_eDeviceType) || (eDesk1SType == m_eDeviceType) || (eDesk2SIntegratedType == m_eDeviceType))
+		if ((ePadtype == m_eDeviceType)||(eMobilePadType == m_eDeviceType)||(eDesk2SType == m_eDeviceType)||(eDesk1SType == m_eDeviceType)||(eDesk2SIntegratedType == m_eDeviceType))
 		{
 			m_nCameraErrorCode = Error_Succeed;
 			ChangeSysvar(m_nCameraErrorCode);
 		}
-		else {
-			if (m_nCameraErrorCode == Error_EnvCamera) {
+		else{
+			if (m_nCameraErrorCode == Error_EnvCamera){
 				m_nCameraErrorCode = Error_Succeed;
 				ChangeSysvar(m_nCameraErrorCode);
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("changeSysvar to No_Error");
 			}
-			else if (m_nCameraErrorCode == Error_AllCamera) {
+			else if (m_nCameraErrorCode == Error_AllCamera){
 				m_nCameraErrorCode = Error_OptCamera;
 				ChangeSysvar(m_nCameraErrorCode);
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("changeSysvar to Opt_Error");
@@ -695,12 +687,12 @@ void CMediaControllerEntity::OnTimeCameraStatusCheck()
 	//opt是否没有图像
 	if (eStand2sType == m_eDeviceType)
 	{
-		if (opt_n == 0)
+		if (opt_n == 0) 
 		{
 			if (m_iOptEmptyTimes < CAMERA_BUG_THRESHOLD)
 			{
-				m_iOptEmptyTimes++;
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get opt camera picture fail, Times=%d", m_iOptEmptyTimes);
+				m_iOptEmptyTimes++; 
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get opt camera picture fail, Times=%d",m_iOptEmptyTimes);
 			}
 		}
 		else if (opt_n == -1)
@@ -708,7 +700,7 @@ void CMediaControllerEntity::OnTimeCameraStatusCheck()
 			m_iOptEmptyTimes = CAMERA_BUG_THRESHOLD;
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get opt camera picture fail");
 		}
-		else
+		else 
 		{
 			if (m_iOptEmptyTimes == CAMERA_BUG_THRESHOLD)
 			{
@@ -733,11 +725,13 @@ void CMediaControllerEntity::OnTimeCameraStatusCheck()
 		}
 	}
 	//opt是否100S没有图像或者图像20秒没有更新
-	if (((m_iOptEmptyTimes == CAMERA_BUG_THRESHOLD) || bOptTimeout) && (m_nCameraErrorCode != Error_OptCamera) && (m_nCameraErrorCode != Error_AllCamera) && (eStand2sType == m_eDeviceType))
+	if(((m_iOptEmptyTimes == CAMERA_BUG_THRESHOLD)||bOptTimeout)&&(m_nCameraErrorCode!=Error_OptCamera)&&(m_nCameraErrorCode!=Error_AllCamera)&&(eStand2sType == m_eDeviceType))
 	{
-		char strMessage[MAX_PATH * 2] = { 0 };
-		get_camera_exception_message(strMessage, MAX_PATH * 2, conf.strVideoOpt, "Opt camera bug detected!");
-		LogWarn(Severity_Middle, Error_Hardware, ERROR_MOD_MEDIACONTROLLER_OPECAMERA_BUG, strMessage);
+		char strMessage[MAX_PATH*2] = {0};
+		get_camera_exception_message(strMessage, MAX_PATH*2, conf.strVideoOpt, "Opt camera bug detected!");
+		char strInfo[MAX_PATH*2] = {0};
+		_snprintf(strInfo, MAX_PATH*2, "%s and cpu usage is %f, and current time = %u, opt last capture time = %u, video queue LastOptTime = %u.",strMessage, GetSystemCpuUsage(), y2k_time_now(), m_capture->opt_video->ulastcaptime, nLastOptTime);
+		LogWarn(Severity_Middle, Error_Hardware, ERROR_MOD_MEDIACONTROLLER_OPECAMERA_BUG, strInfo);
 		if (m_nCameraErrorCode == Error_Succeed)
 		{
 			m_nCameraErrorCode = Error_OptCamera;
@@ -753,7 +747,7 @@ void CMediaControllerEntity::OnTimeCameraStatusCheck()
 			return;
 		}
 	}
-	else if ((m_iOptEmptyTimes != CAMERA_BUG_THRESHOLD) && !bOptTimeout && ((m_nCameraErrorCode == Error_OptCamera) || (m_nCameraErrorCode == Error_AllCamera)) && (eStand2sType == m_eDeviceType))
+	else if((m_iOptEmptyTimes != CAMERA_BUG_THRESHOLD)&&!bOptTimeout&&((m_nCameraErrorCode == Error_OptCamera)||(m_nCameraErrorCode == Error_AllCamera))&&(eStand2sType == m_eDeviceType))
 	{
 		if (m_nCameraErrorCode == Error_OptCamera)
 		{
@@ -770,7 +764,7 @@ void CMediaControllerEntity::OnTimeCameraStatusCheck()
 	}
 
 	//重启摄像头
-	if ((m_nCameraErrorCode == Error_EnvCamera) && (m_nEnvCameraRestartNum < CAMERA_RESTARTNUM))
+	if((m_nCameraErrorCode == Error_EnvCamera)&&(m_nEnvCameraRestartNum<CAMERA_RESTARTNUM))
 	{
 		if (ReStartCamera(ENVCAMERA) != Error_Succeed)
 		{
@@ -787,7 +781,7 @@ void CMediaControllerEntity::OnTimeCameraStatusCheck()
 			nLastEnvTime = y2k_time_now();
 		}
 	}
-	else if ((m_nCameraErrorCode == Error_OptCamera) && (m_nOptCameraRestartNum < CAMERA_RESTARTNUM) && (eStand2sType == m_eDeviceType))
+	else if((m_nCameraErrorCode == Error_OptCamera)&&(m_nOptCameraRestartNum<CAMERA_RESTARTNUM)&&(eStand2sType == m_eDeviceType))
 	{
 		if (ReStartCamera(OPTCAMERA) != Error_Succeed)
 			m_nOptCameraRestartNum++;
@@ -804,7 +798,7 @@ void CMediaControllerEntity::OnTimeCameraStatusCheck()
 	}
 	else if (m_nCameraErrorCode == Error_AllCamera)
 	{
-		if (m_nEnvCameraRestartNum < CAMERA_RESTARTNUM)
+		if (m_nEnvCameraRestartNum<CAMERA_RESTARTNUM)
 		{
 			if (ReStartCamera(ENVCAMERA) != Error_Succeed)
 				m_nEnvCameraRestartNum++;
@@ -818,7 +812,7 @@ void CMediaControllerEntity::OnTimeCameraStatusCheck()
 			}
 		}
 
-		if ((m_nOptCameraRestartNum < CAMERA_RESTARTNUM) && (eStand2sType == m_eDeviceType))
+		if((m_nOptCameraRestartNum<CAMERA_RESTARTNUM)&&(eStand2sType == m_eDeviceType))
 		{
 			if (ReStartCamera(OPTCAMERA) != Error_Succeed)
 				m_nOptCameraRestartNum++;
@@ -831,7 +825,7 @@ void CMediaControllerEntity::OnTimeCameraStatusCheck()
 				{
 					m_nCameraErrorCode = Error_EnvCamera;
 					ChangeSysvar(m_nCameraErrorCode);
-				}
+				} 
 				else
 				{
 					m_nCameraErrorCode = Error_Succeed;