Z991239-4806 #comment UOS单屏支持远程连线功能

Module/mod_interactioncontext/mod_interactioncontext.cpp

@@ -394,11 +394,11 @@ void CtxSyncServerSession::Handle_GetSessionData(SpReqAnsContext<SyncService_Get
 {
 	CSimpleStringA value;
 	bool rt;
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get session Data: key=%s", (LPCSTR)ctx->Req.key);
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get session Data: key=%s", ctx->Req.key.GetData());
 	rt = m_pEntity->GetValue(ACM_CTX_SESSION, ctx->Req.key,value);
 	if (rt == true)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("founded, data=%s", (LPCSTR)value);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("founded, data=%s", value.GetData());
 		ctx->Ans.value = value;
 		ctx->Answer(Error_Succeed);
 	}
@@ -413,7 +413,7 @@ void CtxSyncServerSession::Handle_GetSessionData(SpReqAnsContext<SyncService_Get
 void CtxSyncServerSession::Handle_SetMachineData(SpOnewayCallContext<SyncService_SetMachineData_Info>::Pointer ctx)
 {
 	bool	rt;
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Set machine Data: key=%s, data=%s", (LPCSTR)ctx->Info.key, (LPCSTR)ctx->Info.data);
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Set machine Data: key=%s, data=%s", ctx->Info.key.GetData(), ctx->Info.data.GetData());
 	rt = m_pEntity->SetValue(ACM_CTX_MACHINE, ctx->Info.key, ctx->Info.data);
 }
 
@@ -422,11 +422,11 @@ void CtxSyncServerSession::Handle_GetMachineData(SpReqAnsContext<SyncService_Get
 {
 	CSimpleStringA value;
 	bool rt;
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get machine Data: key=%s", (LPCSTR)ctx->Req.key);
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get machine Data: key=%s", ctx->Req.key.GetData());
 	rt = m_pEntity->GetValue(ACM_CTX_MACHINE, ctx->Req.key,value);
 	if (rt == true)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("founded, data=%s", (LPCSTR)value);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("founded, data=%s", value.GetData());
 		ctx->Ans.value = value;
 		ctx->Answer(Error_Succeed);
 	}

Module/mod_sipphone/Event.h

@@ -13,27 +13,27 @@
 #define		ERROR_MOD_SIP_SES_CREATE_FAILED				0x30188037   //创建会话失败
 #define		ERROR_MOD_SIP_SES_SOCKET_INUSED				0x30188038   //会话端口被占用
 
-#define		ERROR_MOD_SIP_INVALID_REQPACKAGE			0x30188041  //无效请求包, 级别3
-#define		ERROR_MOD_SIP_AUTH_UNRECOG					0x30188051  //鉴权不可识别, 级别3
-#define		ERROR_MOD_SIP_AUTH_MISMATCH					0x30188052  //鉴权信息不匹配, 级别2
-#define		EVENT_MOD_SIP_CONNECT_FAIL					0x301880F1  //当前区域连接失败, 级别2,需要等待业务完成或退出后才能释放，即BussinessState=‘0’
+#define		ERROR_MOD_SIP_INVALID_REQPACKAGE			0x30188041   //无效请求包, 级别3
+#define		ERROR_MOD_SIP_AUTH_UNRECOG					0x30188051   //鉴权不可识别, 级别3
+#define		ERROR_MOD_SIP_AUTH_MISMATCH					0x30188052   //鉴权信息不匹配, 级别2
+#define		EVENT_MOD_SIP_CONNECT_FAIL					0x301880F1   //当前区域连接失败, 级别2,需要等待业务完成或退出后才能释放，即BussinessState=‘0’
 //媒体通信产生的事件
-#define     EVENT_MOD_SIP_START_VOICECONNECT			0x30100111  //声音连接发起
-#define     EVENT_MOD_SIP_RECV_DATA						0x30100112  //接收到对端数据
-#define     EVENT_MOD_SIP_STOP_VOICECONNECT				0x30100113  //声音通道结束
-#define     EVENT_MOD_SIP_START_CLIENTVIDEO				0x30100121  //客户视频发起		
-#define     EVENT_MOD_SIP_STOP_CLIENTVIDEO				0x30100122  //客户视频结束		
-#define     EVENT_MOD_SIP_RECV_LOWAGENTVIDEO			0x30100131  //接收到低清柜员视频	
-#define     EVENT_MOD_SIP_STOP_LOWAGENTVIDEO			0x30100132  //断开低清柜员视频通道			
-#define     EVENT_MOD_SIP_RECV_HIGHAGENTVIDEO			0x30100141  //接收高清柜员视频	
-#define     EVENT_MOD_SIP_STOP_HIGHAGENTVIDEO			0x30100142  //断开高清柜员视频通道		
+#define     EVENT_MOD_SIP_START_VOICECONNECT			0x30100111   //声音连接发起
+#define     EVENT_MOD_SIP_RECV_DATA						0x30100112   //接收到对端数据
+#define     EVENT_MOD_SIP_STOP_VOICECONNECT				0x30100113   //声音通道结束
+#define     EVENT_MOD_SIP_START_CLIENTVIDEO				0x30100121   //客户视频发起		
+#define     EVENT_MOD_SIP_STOP_CLIENTVIDEO				0x30100122   //客户视频结束		
+#define     EVENT_MOD_SIP_RECV_LOWAGENTVIDEO			0x30100131   //接收到低清柜员视频	
+#define     EVENT_MOD_SIP_STOP_LOWAGENTVIDEO			0x30100132   //断开低清柜员视频通道			
+#define     EVENT_MOD_SIP_RECV_HIGHAGENTVIDEO			0x30100141   //接收高清柜员视频	
+#define     EVENT_MOD_SIP_STOP_HIGHAGENTVIDEO			0x30100142   //断开高清柜员视频通道		
 //媒体通信错误码			
-#define		ERROR_MOD_SIP_NO_AGENTVOICEPACKAGE			0x30180110  //没收到柜员端语音包,等待超时后，仍然没有数据包到达		
-#define		ERROR_MOD_SIP_LOSS_AGENTVOICEPACKAGE		0x30180111	//柜员端声音严重丢包,包括时延太大		
-#define		ERROR_MOD_SIP_DISCONNECT_VOICECHANN			0x30180112  //声音通道中断,有一段时间不能收到声音数据包
-#define		ERROR_MOD_SIP_NO_AGENTVIDEOPACKAGE			0x30180120  //没收到柜员图像包,等待超时后，仍然没有数据包到达		
-#define		ERROR_MOD_SIP_LOSS_AGENTVIDEOPACKAGE		0x30180121	//柜员视频严重丢包,视频对时延的容忍度大，可以设较长时延都收不齐数据包	
-#define		ERROR_MOD_SIP_DISCONNECT_VIDEOCHANN			0x30180122  //柜员视频中断,有一段时间不能收到视频数据包
+#define		ERROR_MOD_SIP_NO_AGENTVOICEPACKAGE			0x30180110   //没收到柜员端语音包,等待超时后，仍然没有数据包到达		
+#define		ERROR_MOD_SIP_LOSS_AGENTVOICEPACKAGE		0x30180111	 //柜员端声音严重丢包,包括时延太大		
+#define		ERROR_MOD_SIP_DISCONNECT_VOICECHANN			0x30180112   //声音通道中断,有一段时间不能收到声音数据包
+#define		ERROR_MOD_SIP_NO_AGENTVIDEOPACKAGE			0x30180120   //没收到柜员图像包,等待超时后，仍然没有数据包到达		
+#define		ERROR_MOD_SIP_LOSS_AGENTVIDEOPACKAGE		0x30180121	 //柜员视频严重丢包,视频对时延的容忍度大，可以设较长时延都收不齐数据包	
+#define		ERROR_MOD_SIP_DISCONNECT_VIDEOCHANN			0x30180122   //柜员视频中断,有一段时间不能收到视频数据包
 
 //前端媒体错误
 	
@@ -53,12 +53,12 @@
 
 #define EVENT_MOD_SIP_LOCAL_WINDOW_CREATE_FAILED		0x30190501	//创建本地图像渲染框失败
 #define EVENT_MOD_SIP_REMOTE_WINDOW_CREATE_FAILED		0x30190502  //创建远端图像渲染框失败
-#define EVENT_MOD_SIP_LOCAL_WINDOW_CREATE_SUCCESS		0x30190503	 //创建本地视频框成功
-#define EVENT_MOD_SIP_REMOTE_WINDOW_CREATE_SUCCESS		0x30190504   //创建远端视频框成功
-#define EVENT_MOD_SIP_LOCAL_WINDOW_DESTROY_SUCCESS		0x30190505	 //销毁本地视频框成功
-#define EVENT_MOD_SIP_REMOTE_WINDOW_DESTROY_SUCCESS		0x30190506   //销毁远端视频框成功
+#define EVENT_MOD_SIP_LOCAL_WINDOW_CREATE_SUCCESS		0x30190503	//创建本地视频框成功
+#define EVENT_MOD_SIP_REMOTE_WINDOW_CREATE_SUCCESS		0x30190504  //创建远端视频框成功
+#define EVENT_MOD_SIP_LOCAL_WINDOW_DESTROY_SUCCESS		0x30190505	//销毁本地视频框成功
+#define EVENT_MOD_SIP_REMOTE_WINDOW_DESTROY_SUCCESS		0x30190506  //销毁远端视频框成功
 
-#define EVENT_MOD_SIP_GET_CAMERA_INFO_FINISHED			0x30190513   //完成摄像头信息获取
+#define EVENT_MOD_SIP_GET_CAMERA_INFO_FINISHED			0x30190513  //完成摄像头信息获取
 
 #define EVENT_MOD_SIP_AUDIO_DEVICE_INFO					0x30190521
 #define EVENT_MOD_SIP_AUDIO_VOLUME_INFO					0x30190522
@@ -129,29 +129,29 @@
 #define EVENT_MOD_SIP_CALL_AUDIO_NEGOTIATE							0x30190904  //音频协商信息
 #define EVENT_MOD_SIP_CALL_VIDEO_NEGOTIATE							0x30190905  //视频协商信息
 
-#define EVENT_MOD_SIP_ENTITY_STARTED		0x301A0001		//sipphone entity start
-#define EVENT_MOD_SIP_INVITE_SEND			0x301A0002		//sip invite send
-#define EVENT_MOD_SIP_PROCESS_MSG			0x301A0003		//sip process messsage
+#define EVENT_MOD_SIP_ENTITY_STARTED								0x301A0001	//sipphone entity start
+#define EVENT_MOD_SIP_INVITE_SEND									0x301A0002	//sip invite send
+#define EVENT_MOD_SIP_PROCESS_MSG									0x301A0003	//sip process messsage
 
 //event
-#define EVENT_MOD_CONNECT_PICKUP_CALL			0x10303041	// 提机呼叫
+#define EVENT_MOD_CONNECT_PICKUP_CALL								0x10303041	//提机呼叫
 
-#define EVENT_MOD_CONNECT_HANDFREE_TO_PICKUP	0x10303046	// 免提->提机
-#define EVENT_MOD_CONNECT_PICKUP_TO_HANDFREE	0x10303047	// 提机->免提
+#define EVENT_MOD_CONNECT_HANDFREE_TO_PICKUP						0x10303046	//免提->提机
+#define EVENT_MOD_CONNECT_PICKUP_TO_HANDFREE						0x10303047	//提机->免提
 
 
-#define EVENT_MOD_CONNECT_SLV_HANDFREECALL		0x10303050	   //界面拨号，免提呼叫发送给SIPPHONE
-#define EVENT_MOD_CONNECT_SLV_PICKUPCALL		0x10303051     //界面拨号，话筒呼叫发送给SIPPHONE
+#define EVENT_MOD_CONNECT_SLV_HANDFREECALL							0x10303050	//界面拨号，免提呼叫发送给SIPPHONE
+#define EVENT_MOD_CONNECT_SLV_PICKUPCALL							0x10303051  //界面拨号，话筒呼叫发送给SIPPHONE
 
-#define EVENT_MOD_CONNECT_AGENT_HANDFREE_PICKUP			0x10303052	//坐席控制免提转话筒
-#define EVENT_MOD_CONNECT_AGENT_PICKUP_HANDFREE			0x10303053	//坐席控制话筒转免提
+#define EVENT_MOD_CONNECT_AGENT_HANDFREE_PICKUP						0x10303052	//坐席控制免提转话筒
+#define EVENT_MOD_CONNECT_AGENT_PICKUP_HANDFREE						0x10303053	//坐席控制话筒转免提
 
-#define EVENT_MOD_CONNECT_STOP_RECORD_BROADCAST			0x10303060	// 结束双录语音播报
-#define EVENT_MOD_CONNECT_BEGAIN_RECORD_CALL			0x10303061	// 开始双录呼叫
+#define EVENT_MOD_CONNECT_STOP_RECORD_BROADCAST						0x10303060	//结束双录语音播报
+#define EVENT_MOD_CONNECT_BEGAIN_RECORD_CALL						0x10303061	//开始双录呼叫
 
 
-#define LOG_EVT_ENTER_ACM_FLOW		0x30500001          //进入坐席控制流程(initiactivetransfer发送)
-#define LOG_EVT_EXIT_ACM_FLOW		0x30500002          //进入坐席控制流程(initiactivetransfer发送)
+#define LOG_EVT_ENTER_ACM_FLOW										0x30500001	//进入坐席控制流程(initiactivetransfer发送)
+#define LOG_EVT_EXIT_ACM_FLOW										0x30500002  //进入坐席控制流程(initiactivetransfer发送)
 
 
 //sysvar
@@ -160,10 +160,11 @@
 #define CAMERA_ENV_ERROR	"E"
 #define CAMERA_OPT_ERROR	"O"
 #define CAMERA_BOTH_ERROR	"B"
-#define LOG_EVT_STARTLIVEDETECTDISPLAY				0x30400004    //开始主动活体回显
-#define LOG_EVT_STOPLIVEDETECTDISPLAY				0x30400005    //停止主动活体回显
 
-#define LOG_EVT_CHANGELIVEDETECTIONCAM	0x31400004    //通知主动活体回显摄像头号
+#define LOG_EVT_STARTLIVEDETECTDISPLAY								0x30400004	//开始主动活体回显
+#define LOG_EVT_STOPLIVEDETECTDISPLAY								0x30400005  //停止主动活体回显
+
+#define LOG_EVT_CHANGELIVEDETECTIONCAM								0x31400004    //通知主动活体回显摄像头号
 #define LOG_EVT_RELEASELIVEDETECTION	0x30400003    //通知sipphone释放主动活体
 //add by chh 20170104
 #define LOG_EVT_UI_HIDEONLINEVIDEO		0x30B00010	//隐藏视频连线窗口

Module/mod_sipphone/video_session.cpp

@@ -397,7 +397,7 @@ static int on_rx_frame(video_frame *frame, void *user_data)
 			session->conf.video_render_cb.on_stop_remote_video_render(session->conf.video_render_cb.user_data);
 		}
 
-		if (eStand2sType == session->conf.eDeviceType) {
+		if (eStand2sType == session->conf.eDeviceType || eStand1SPlusType == session->conf.eDeviceType) {
 			//大机对远端视频进行缩放匹配
 			video_frame* recordframe = NULL;
 			if (0 == translate_image_resolution(&recordframe, REC_COMMON_VIDEO_SNAPSHOT_PREVIEW_WIDTH, REC_COMMON_VIDEO_SNAPSHOT_PREVIEW_HEIGHT, frame)) {
@@ -797,7 +797,7 @@ static int get_local_video_frame(void* user_data, video_frame** frame)
 		}
 		else if (*session->conf.ref_Is_ActiveInspect == 1)
 		{
-			if ((session->conf.eDeviceType == eMobilePadType) || (session->conf.eDeviceType == ePadtype) || (session->conf.eDeviceType == eDesk2SType) || (session->conf.eDeviceType == eDesk1SType) || (session->conf.eDeviceType == eDesk2SIntegratedType))
+			if (session->conf.eDeviceType == eMobilePadType)
 			{
 				tmp_frame_preview = video_frame_new(REC_COMMON_VIDEO_PREVIEW_WIDTH, REC_COMMON_VIDEO_PREVIEW_HEIGHT, VIDEO_FORMAT_RGB24);
 				videoq_frame frm;
@@ -918,16 +918,10 @@ static int start_video_rtpsession(video_session_t* session)
 	int rc = -1;
 	videortp_config_t config = { 0 };
 	config.fps_den = REC_COMMON_VIDEO_FPS_DEN;
-	if (session->conf.eDeviceType == eMobilePadType)
-	{
+	if (eMobilePadType == session->conf.eDeviceType){
 		config.fps_num = REC_COMMON_VIDEO_FPS_MOBILE_AGENT;
 	}
-	else if ((session->conf.eDeviceType == ePadtype) || (session->conf.eDeviceType == eDesk2SType) || (session->conf.eDeviceType == eDesk1SType) || (session->conf.eDeviceType == eDesk2SIntegratedType))
-	{
-		config.fps_num = REC_COMMON_VIDEO_FPS_MOBILE;
-	}
-	else if (session->conf.eDeviceType == eStand2sType)
-	{
+	else {
 		config.fps_num = REC_COMMON_VIDEO_FPS_NUM;
 	}
 	config.capture_height = -1; // not use
@@ -978,19 +972,12 @@ static int start_local_video_clock(video_session_t* session)
 {
 	int rc = -1;
 
-	if (session->conf.eDeviceType == eMobilePadType){
+	if (eMobilePadType == session->conf.eDeviceType){
 		rc = videoclock_create(REC_COMMON_VIDEO_FPS_MOBILE, REC_COMMON_VIDEO_FPS_DEN,
 			REC_COMMON_VIDEO_RTP_WIDTH, REC_COMMON_VIDEO_RTP_HEIGHT, VIDEO_FORMAT_RGB24,
 			&local_put_frame, session, &local_get_frame, session, &session->local_clock, session->conf.ref_Up_Fps, &__dbg);
 	}
-	else if ((session->conf.eDeviceType == ePadtype) || (session->conf.eDeviceType == eDesk2SType) || (session->conf.eDeviceType == eDesk1SType) || (session->conf.eDeviceType == eDesk2SIntegratedType))
-	{
-		rc = videoclock_create(REC_COMMON_VIDEO_FPS_MOBILE, REC_COMMON_VIDEO_FPS_DEN,
-			REC_COMMON_VIDEO_RTP_WIDTH, REC_COMMON_VIDEO_RTP_HEIGHT, VIDEO_FORMAT_RGB24,
-			&local_put_frame, session, &local_get_frame, session, &session->local_clock, session->conf.ref_Up_Fps, &__dbg);
-	}
-	else if (session->conf.eDeviceType == eStand2sType)
-	{
+	else{
 		rc = videoclock_create(REC_COMMON_VIDEO_FPS_NUM, REC_COMMON_VIDEO_FPS_DEN,
 			REC_COMMON_VIDEO_RTP_WIDTH, REC_COMMON_VIDEO_RTP_HEIGHT, VIDEO_FORMAT_RGB24,
 			&local_put_frame, session, &local_get_frame, session, &session->local_clock, session->conf.ref_Up_Fps, &__dbg);
@@ -2203,7 +2190,7 @@ int video_session_create(const video_session_conf_t *conf, video_session_t **p_s
 		{
 			if (session->personimage == NULL)
 			{
-				if((session->conf.eDeviceType == eMobilePadType)||(session->conf.eDeviceType == ePadtype)||(session->conf.eDeviceType == eDesk2SType)||(session->conf.eDeviceType == eDesk1SType)||(session->conf.eDeviceType == eDesk2SIntegratedType))
+				if(eMobilePadType == session->conf.eDeviceType)
 				{
 					//pad版对人形区域放大处理
 					session->personimage = cvLoadImage(strPersonPath);	
@@ -2220,7 +2207,7 @@ int video_session_create(const video_session_conf_t *conf, video_session_t **p_s
 			}
 			if (session->personmask == NULL )
 			{
-				if((session->conf.eDeviceType == eMobilePadType)||(session->conf.eDeviceType == ePadtype)||(session->conf.eDeviceType == eDesk2SType)||(session->conf.eDeviceType == eDesk1SType)||(session->conf.eDeviceType == eDesk2SIntegratedType))
+				if(eMobilePadType == session->conf.eDeviceType)
 				{
 					//pad版对人形区域放大处理
 					session->personmask = cvLoadImage(strPersonPath,0);	

Other/libvideorecord/libvideorecord_impl.cpp

@@ -1040,7 +1040,6 @@ int libvideorecord_impl::GetDestTypeVideoFrameData(videoq_frame* Video, int flag
 	int iRet = 0;
 	if (m_opt_videoqueue) {  
 		iRet = GetDoubleCameraVideoFrameData(Video, flags, bSwitchCam, iInitCam, eRecordType);
-		//m_pHostApi->Debug(RECORD_LOG_DEBUG, "GetDoubleCameraVideoFrameData result = %d.", iRet);
 	}
 	else {
 		iRet = GetSingleCameraVideoFrameData(Video, flags, eRecordType);
@@ -1052,8 +1051,7 @@ int libvideorecord_impl::GetDestTypeVideoFrameData(videoq_frame* Video, int flag
 int libvideorecord_impl::GetSingleCameraVideoFrameData(videoq_frame* Video, int flags, eRvcRecordType eRecordType)
 {
 	int iRet = 0;
-	if (eSingleSide == m_eRecordType) 
-	{
+	if (eSingleSide == m_eRecordType) {
 		if (!m_SubtitleParam.bSubtitle || !m_SubtitleParam.bSubtitleSection){
 			return m_env_videoqueue->GetVideo(Video, flags) ? 0 : -1;
 		}
@@ -1160,14 +1158,12 @@ int libvideorecord_impl::GetStand2SVideoFrameData(videoq_frame* Video, int flags
 		//}
 		int imaxheight = localtmp_frm.height > Video->height ? Video->height : localtmp_frm.height;
 		if (0 == nActiveCam) {
-			for (int i = imaxheight - 1, j = 0; i >= 0 && j < imaxheight; i--, j++)
-			{
+			for (int i = imaxheight - 1, j = 0; i >= 0 && j < imaxheight; i--, j++){
 				memcpy(Video->data + nOffset + j * Video->width * 3, localtmp_frm.data[0] + i * localtmp_frm.linesize[0], localtmp_frm.linesize[0]);
 			}
 		}
 		else {
-			for (int i = 0; i < imaxheight; i++)
-			{
+			for (int i = 0; i < imaxheight; i++){
 				memcpy(Video->data + nOffset + i * Video->width * 3, localtmp_frm.data[0] + i * localtmp_frm.linesize[0], localtmp_frm.linesize[0]);
 			}
 		}
@@ -1261,12 +1257,12 @@ int libvideorecord_impl::GetSingleSideVideoFrameData(videoq_frame* Video, int fl
 	return 0;
 }
 
+
 int libvideorecord_impl::GetDoubleCameraVideoFrameData(videoq_frame* Video, int flags, const bool bSwitchCam, int iInitCam, eRvcRecordType eRecordType)
 {
 	int iRet = 0;
 	if (eStand2Agent == m_eRecordType) {  //如果远端队列不为空，且录制双向视频
 		iRet = GetStand2SVideoFrameData(Video, flags, bSwitchCam, iInitCam, eRecordType);
-		//m_pHostApi->Debug(RECORD_LOG_DEBUG, "GetStand2SVideoFrameData result = %d.", iRet);
 	}
 	else if(eSingleSide == eRecordType){
 		iRet = GetSingleSideVideoFrameData(Video, flags, bSwitchCam, iInitCam);
@@ -1275,6 +1271,7 @@ int libvideorecord_impl::GetDoubleCameraVideoFrameData(videoq_frame* Video, int
 		m_pHostApi->Debug(RECORD_LOG_ERROR, "invalid record type.");
 		iRet =  -1;
 	}
+
 	return iRet;
 }