|
@@ -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) {
|