浏览代码

Z991239-6387 #comment: 增加UOS虚拟摄像头驱动加载耗时信息

80274480 2 月之前
父节点
当前提交
6038dfa20e
共有 2 个文件被更改,包括 8 次插入3 次删除
  1. 2 1
      Module/mod_mediacontroller/Event.h
  2. 6 2
      Module/mod_mediacontroller/mod_mediacontroller.cpp

+ 2 - 1
Module/mod_mediacontroller/Event.h

@@ -132,4 +132,5 @@
 #define LOG_WARN_GET_DISABLE_CAMERA_INFO_FAILED					0x208B0008	//获取禁用物理摄像头信息失败
 
 #define LOG_INFO_KERNEL_VERSION									0x208B0009	//机器内核版本信息
-#define LOG_INFO_UNEXPECTED_KERNEL_VERSION						0x208B000A	//与预期不符的内核版本信息
+#define LOG_INFO_UNEXPECTED_KERNEL_VERSION						0x208B000A	//与预期不符的内核版本信息
+#define LOG_INFO_LOADVIRTUALCAM_COST_TIME						0x208B000B  //加载虚拟摄像头组件耗时

+ 6 - 2
Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -456,7 +456,6 @@ static bool IsVirtualcamDriverLoaded()
 
 static bool HandleVirtualcamDriver(CSimpleStringA strCmd)
 {
-	bool bRet = false;
 	std::string sucContent, failedContent;
 	bool ret = SP::Module::Util::ShellExecute(strCmd.GetData(), sucContent, failedContent);
 	if (ret) {
@@ -466,7 +465,7 @@ static bool HandleVirtualcamDriver(CSimpleStringA strCmd)
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s 执行失败.", strCmd.GetData());
 	}
 
-	return bRet;
+	return ret;
 }
 
 static int AddVirtualCamera(const char* strName)
@@ -677,12 +676,17 @@ void CMediaControllerEntity::OnStarted()
 	}
 
 	if (!IsVirtualcamDriverLoaded()) {
+		long lstarttime = SP::Module::Comm::RVCGetTickCount();
 		HandleVirtualcamDriver(CSimpleStringA::Format("insmod ./bin/virtualcam.ko"));
+		long lcosttime = SP::Module::Comm::RVCGetTickCount() - lstarttime;
 		if (!IsVirtualcamDriverLoaded()) {
 			LogWarn(Severity_Middle, Error_Debug, LOG_WARN_LOADVIRTUALCAM_FAILED, CSimpleStringA::Format("加载虚拟摄像头组件失败!"));
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setResultCode("RTA2830")("加载虚拟摄像头组件失败!");
 			HandleVirtualcamDriver(CSimpleStringA::Format("insmod ./bin/virtualcam.ko -f"));
 		}
+		else {
+			LogWarn(Severity_Low, Error_Debug, LOG_INFO_LOADVIRTUALCAM_COST_TIME, CSimpleStringA::Format("加载虚拟摄像头驱动耗时 %dms.", lcosttime));
+		}
 	}
 
 	if (eStand2sType == m_eDeviceType) {