added:rtp and rtcp udp socket supported

Author: xengine-qyt

XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h

@@ -71,6 +71,8 @@ typedef struct tag_XEngine_ServiceConfig
 		struct  
 		{
 			bool bEnable;
+			int nRTPPort;
+			int nRTCPPort;
 		}st_PullRtsp;
 	}st_XPull;
 	struct  

XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp

@@ -136,7 +136,11 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	pSt_ServerConfig->st_XPull.st_PullXStream.bEnable = st_PullXStream["bEnable"].asBool();
 	pSt_ServerConfig->st_XPull.st_PullRtmp.bEnable = st_PullRtmp["bEnable"].asBool();
 	pSt_ServerConfig->st_XPull.st_PullFlv.bEnable = st_PullFlv["bEnable"].asBool();
+	
 	pSt_ServerConfig->st_XPull.st_PullRtsp.bEnable = st_PullRtsp["bEnable"].asBool();
+	pSt_ServerConfig->st_XPull.st_PullRtsp.nRTPPort = st_PullRtsp["nRTPPort"].asInt();
+	pSt_ServerConfig->st_XPull.st_PullRtsp.nRTCPPort = st_PullRtsp["nRTCPPort"].asInt();
+
 	pSt_ServerConfig->st_XPull.st_PullHls.bEnable = st_PullHls["bEnable"].asBool();
 	//日志配置
 	if (st_JsonRoot["XLog"].empty() || (3 != st_JsonRoot["XLog"].size()))

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_Hdr.h

@@ -109,12 +109,14 @@ extern XHANDLE xhRTMPSocket;
 extern XHANDLE xhRTMPHeart;
 extern XHANDLE xhRTMPPool;
 extern XHANDLE xhSRTPool;
-//配置文件
 //JT1078推流
 extern XHANDLE xhJT1078Socket;
 extern XHANDLE xhJT1078Heart;
 extern XHANDLE xhJT1078Pkt;
 extern XHANDLE xhJT1078Pool;
+//RTSP的UDP网络
+extern XHANDLE xhRTPSocket;
+extern XHANDLE xhRTCPSocket;
 //配置文件
 extern XENGINE_SERVICECONFIG st_ServiceConfig;
 //调试

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_Network.cpp

@@ -138,6 +138,15 @@ void CALLBACK Network_Callback_SRTLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket,
 {
 	XEngine_Network_Close(lpszClientAddr, hSocket, false, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PUSH_SRT);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("SRT客户端：%s，离开了服务器"), lpszClientAddr);
+}
+//UDP
+void CALLBACK Network_Callback_RTPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
+{
+
+}
+void CALLBACK Network_Callback_RTCPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
+{
+
 }
 //////////////////////////////////////////////////////////////////////////网络IO关闭操作
 void XEngine_Network_Close(LPCXSTR lpszClientAddr, XSOCKET hSocket, bool bHeart, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE enClientType)

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_Network.h

@@ -34,6 +34,9 @@ void CALLBACK Network_Callback_JT1078HBLeave(LPCXSTR lpszClientAddr, XSOCKET hSo
 bool CALLBACK Network_Callback_SRTLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
 void CALLBACK Network_Callback_SRTRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam);
 void CALLBACK Network_Callback_SRTLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
+//UDP
+void CALLBACK Network_Callback_RTPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam);
+void CALLBACK Network_Callback_RTCPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam);
 //关闭与发送
 void XEngine_Network_Close(LPCXSTR lpszClientAddr, XSOCKET hSocket, bool bHeart, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE enClientType);
 bool XEngine_Network_Send(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE enClientType);

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_StreamMediaApp.cpp

@@ -32,6 +32,9 @@ XHANDLE xhJT1078Socket = NULL;
 XHANDLE xhJT1078Heart = NULL;
 XHANDLE xhJT1078Pkt = NULL;
 XHANDLE xhJT1078Pool = NULL;
+//RTSP的UDP网络
+XHANDLE xhRTPSocket = NULL;
+XHANDLE xhRTCPSocket = NULL;
 //配置文件
 XENGINE_SERVICECONFIG st_ServiceConfig;
 //调试
@@ -49,6 +52,11 @@ void ServiceApp_Stop(int signo)
 		NetCore_TCPXCore_DestroyEx(xhXStreamSocket);
 		NetCore_TCPXCore_DestroyEx(xhRTMPSocket);
 		NetCore_TCPXCore_DestroyEx(xhJT1078Socket);
+		if (st_ServiceConfig.st_XPull.st_PullRtsp.bEnable)
+		{
+			NetCore_UDPXCore_DestroyEx(xhRTPSocket);
+			NetCore_UDPXCore_DestroyEx(xhRTCPSocket);
+		}
 		//销毁心跳
 		SocketOpt_HeartBeat_DestoryEx(xhHttpHeart);
 		SocketOpt_HeartBeat_DestoryEx(xhXStreamHeart);
@@ -431,6 +439,21 @@ int main(int argc, char** argv)
 		}
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,启动SRT端处理线程池成功,线程个数:%d"), st_ServiceConfig.st_XMax.nSRTThread);
 	}
+
+	if (st_ServiceConfig.st_XPull.st_PullRtsp.bEnable)
+	{
+		xhRTPSocket = NetCore_UDPXCore_StartEx(st_ServiceConfig.st_XPull.st_PullRtsp.nRTPPort, 1);
+		if (NULL == xhSRTPool)
+		{
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("启动服务中,启动RTSP的RTP网络端口失败,错误：%d"), errno);
+			goto XENGINE_SERVICEAPP_EXIT;
+		}
+		xhRTCPSocket = NetCore_UDPXCore_StartEx(st_ServiceConfig.st_XPull.st_PullRtsp.nRTCPPort, 1);
+
+		NetCore_UDPXCore_RegisterCallBackEx(xhRTPSocket, Network_Callback_RTPRecv);
+		NetCore_UDPXCore_RegisterCallBackEx(xhRTCPSocket, Network_Callback_RTCPRecv);
+	}
+
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s,服务版本:%s,发行次数;%d。。。"), BaseLib_OperatorVer_XNumberStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());
 
 	while (true)
@@ -448,6 +471,11 @@ int main(int argc, char** argv)
 		NetCore_TCPXCore_DestroyEx(xhXStreamSocket);
 		NetCore_TCPXCore_DestroyEx(xhRTMPSocket);
 		NetCore_TCPXCore_DestroyEx(xhJT1078Socket);
+		if (st_ServiceConfig.st_XPull.st_PullRtsp.bEnable)
+		{
+			NetCore_UDPXCore_DestroyEx(xhRTPSocket);
+			NetCore_UDPXCore_DestroyEx(xhRTCPSocket);
+		}
 		//销毁心跳
 		SocketOpt_HeartBeat_DestoryEx(xhHttpHeart);
 		SocketOpt_HeartBeat_DestoryEx(xhXStreamHeart);