Z991239-5647 #comment 优化音频设备故障时弹框提示功能

Module/mod_counterconnector/mod_counterconnector.cpp

@@ -664,7 +664,6 @@ void CCounterConnectorEntity ::OnReceivePkt(int type, int sub_type, const char *
 			{
 				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("agent want change audiodevice to handfree,but the device is handfree now");
 			}
-			SendCurAudioDevice();
 			break;
 			//change to pickup
 		case ACM_CHANGE_PICKUP:
@@ -678,7 +677,6 @@ void CCounterConnectorEntity ::OnReceivePkt(int type, int sub_type, const char *
 			{
 				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("agent want change audio device to pickup,but the device is pickup now");
 			}
-			SendCurAudioDevice();
 			break;
 		default:
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unknown sub_type %d from agent!", sub_type);

Module/mod_livenessdetection/Event.h

@@ -1,30 +1,5 @@
 #pragma once
 
-#define WM_CAMERA_FAULT	    (WM_USER+100)
-#define WM_LIVENESS_DONE	(WM_USER+101)
-#define WM_IMAGE_INFO		(WM_USER+102)
-#define WM_TIME_UPDATE		(WM_USER+103)
-#define WM_CAMERA_ECHO	    (WM_USER+104)
-
-// 被动活体超时时间
-#define TIME_LIMIT_PASSIVE		300
-// 主动活体超时时间
-#define TIME_LIMIT_ACTIVE		120
-// 主动回显最短时间
-#define TIME_LEAST_ACTIVE_SHOW	5
-//消息发送间隔时间
-#define TIME_INTERVAL_SENDINFO 3000
-
-#define LOG_EVT_STARTACTIVECAPTURE			0x31400001				//开始主动活体
-#define LOG_EVT_STOPACTIVECAPTURE			0x31400002				//停止主动活体
-#define LOG_EVT_SHOWACTIVECAPTUREMSG		0x31400003				//显示主动活体提示消息
-#define LOG_EVT_ECHOACTIVECAPTURECAM		0x31400004				//通知主动活体回显摄像头号
-#define LOG_EVT_ECHOACTIVECAPTUREIMG		0x31400005				//通知主动活体回显图片
-#define LOG_EVT_ACTIVECAPTURECOST           0x31400006              //主动抓拍时长
-#define LOG_EVT_ACTIVECAPTURELOADDEPFAIL    0x31400007              //主动抓拍依赖加载失败
-#define LOG_EVT_ACTIVECAPTURENOVIDEO        0x31400008              //没有获取到视频帧
-
-
 #define LOG_EVT_STARTVIDEOTRANS				0x31480001				//开始视频传输
 #define LOG_EVT_STOPVIDEOTRANS				0x31480002				//停止视频传输
 #define LOG_EVT_STARTVIDEOCAPTURE			0x31480003				//开始视频抓拍

Module/mod_sipphone/Event.h

@@ -175,7 +175,6 @@
 #define LOG_EVT_EXIT_ACM_FLOW										0x30500002  //进入坐席控制流程(initiactivetransfer发送)
 
 
-#define LOG_EVT_CHANGELIVEDETECTIONCAM								0x31400004  //通知主动活体回显摄像头号
 #define LOG_EVT_RELEASELIVEDETECTION								0x30400003  //通知sipphone释放主动活体
 //add by chh 20170104
 #define LOG_EVT_UI_HIDEONLINEVIDEO									0x30B00010	//隐藏视频连线窗口
@@ -188,15 +187,15 @@
 #define LOG_EVT_UI_SHOWPERSONAREA									0x30B00015	//显示隐藏人形框
 
 	
-#define LOG_EVT_UI_STARTRECORD					0x30B00001				//开始录像
-#define LOG_EVT_UI_STOPRECORD					0x30B00002				//停止录像
-#define LOG_EVT_UI_RETURNMENU					0x30B00006				//退出到主菜单
+#define LOG_EVT_UI_STARTRECORD										0x30B00001	//开始录像
+#define LOG_EVT_UI_STOPRECORD										0x30B00002	//停止录像
+#define LOG_EVT_UI_RETURNMENU										0x30B00006	//退出到主菜单
 
-#define LOG_EVT_UI_STARTREMOTERECORD			0x30B0000F				//开始远程双录
-#define LOG_EVT_UI_STOPREMOTERECORD				0x30B00018				//停止远程录像
+#define LOG_EVT_UI_STARTREMOTERECORD								0x30B0000F	//开始远程双录
+#define LOG_EVT_UI_STOPREMOTERECORD									0x30B00018	//停止远程录像
 
-#define LOG_EVT_HANDFREE_MODE_REMOTE_CALL		0x30400006				//以免提模式开始远程连线
-#define LOG_EVT_PICKUP_MODE_REMOTE_CALL			0x30400007				//以话筒模式开始远程连线
+#define LOG_EVT_HANDFREE_MODE_REMOTE_CALL							0x30400006	//以免提模式开始远程连线
+#define LOG_EVT_PICKUP_MODE_REMOTE_CALL								0x30400007	//以话筒模式开始远程连线
 
 #define ACM_CONTROL_PERSONAREA					0x30 // 控制人形框，0：隐藏，1：显示
 

Module/mod_sipphone/mod_sipphone.cpp

@@ -384,20 +384,6 @@ void CSIPEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,const
 		}
 		break;
 
-	case LOG_EVT_CHANGELIVEDETECTIONCAM:
-		{
-			if (pszMessage && strlen(pszMessage) > 0) 
-			{
-				int i = atoi(pszMessage);
-				m_stVideoParam.iCameraSwitch = i;
-			} 
-			else 
-			{
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("change active display camera param error");
-			}
-		}
-		break;
-
 	case LOG_EVT_RELEASELIVEDETECTION:
 		{
 			m_stVideoParam.bActiveInspect = 0;
@@ -970,7 +956,7 @@ ErrorCodeEnum CSIPEntity::__OnStart(ErrorCodeEnum preOperationError)
 		CSmartPointer<IEntityFunction> Func = GetFunction();
 		CUUID id;
 		int i = 0;
-		m_arrListener.Init(27);
+		m_arrListener.Init(26);
 		Func->SubscribeLog(id, this, Log_Event, Severity_None, Error_IgnoreAll, EVENT_MOD_CONNECT_HANDFREE_TO_PICKUP, EVT_CONVERTER);
 		m_arrListener[i++] = id;
 		Func->SubscribeLog(id, this, Log_Event, Severity_None, Error_IgnoreAll, EVENT_MOD_CONNECT_PICKUP_TO_HANDFREE, EVT_CONVERTER);
@@ -991,8 +977,6 @@ ErrorCodeEnum CSIPEntity::__OnStart(ErrorCodeEnum preOperationError)
 		m_arrListener[i++] = id;
 		Func->SubscribeLog(id, this, Log_Event, Severity_None, Error_IgnoreAll, LOG_EVT_EXIT_ACM_FLOW,NULL,false);
 		m_arrListener[i++] = id;
-		Func->SubscribeLog(id, this, Log_Event, Severity_None, Error_IgnoreAll, LOG_EVT_CHANGELIVEDETECTIONCAM,NULL,false);
-		m_arrListener[i++] = id;
 		Func->SubscribeLog(id, this, Log_Event, Severity_None, Error_IgnoreAll, LOG_EVT_RELEASELIVEDETECTION,NULL,false);
 		m_arrListener[i++] = id;
 		Func->SubscribeLog(id, this, Log_Event, Severity_None, Error_IgnoreAll, LOG_EVT_UI_HIDEONLINEVIDEO,NULL,false);

Other/unix/libvideorender/libvideorender.cpp

@@ -158,7 +158,7 @@ int VideoRenderImpl::VideoRenderSetParam(videorender_param_t* tparam)
 	static bool blog = true;
 	/* Print the list of the available renderers*/
 	if (blog) {
-		RenderLog(RENDER_LOG_INFO, "RENDER: Available SDL2 rendering drivers:");
+		RenderLog(RENDER_LOG_DEBUG, "RENDER: Available SDL2 rendering drivers:");
 	}
 	
 	for (int i = 0; i < SDL_GetNumRenderDrivers(); i++){
@@ -167,7 +167,7 @@ int VideoRenderImpl::VideoRenderSetParam(videorender_param_t* tparam)
 		}
 		else {
 			if (blog) {
-				RenderLog(RENDER_LOG_INFO, " %2d: %s", i, rend_info->name);
+				RenderLog(RENDER_LOG_DEBUG, " %2d: %s", i, rend_info->name);
 			}
 			//m_callback->Debug("    SDL_RENDERER_TARGETTEXTURE [%c]", (rend_info->flags & SDL_RENDERER_TARGETTEXTURE) ? 'X' : ' ');
 			//m_callback->Debug("    SDL_RENDERER_SOFTWARE      [%c]", (rend_info->flags & SDL_RENDERER_SOFTWARE) ? 'X' : ' ');