modify:rtcp protocol process

Author: xengine-qyt

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PullStream/PullStream_ClientRtsp.cpp

@@ -16,12 +16,12 @@ bool PullStream_ClientRtsp_RTCPProcess(LPCXSTR lpszClientAddr, XSOCKET hSocket,
 	{
 		int nPos = 0;
 		RTCPPROTOCOL_RTCPHDR st_RTCPHdr = {};
-		RTCPProtocol_Parse_Header(&st_RTCPHdr, lpszMsgBuffer, nMsgLen);
+		RTCPProtocol_Parse_Header(lpszMsgBuffer, nMsgLen, &st_RTCPHdr);
 		nPos += sizeof(RTCPPROTOCOL_RTCPHDR);
 
 		int nListCount;
 		RTCPPROTOCOL_RTCPRECVER** ppSt_ListRecvInfo;
-		RTCPProtocol_Parse_Recver(&ppSt_ListRecvInfo, &nListCount, &st_RTCPHdr, lpszMsgBuffer + nPos, nMsgLen - nPos);
+		RTCPProtocol_Parse_Recver(lpszMsgBuffer + nPos, nMsgLen - nPos, &st_RTCPHdr, &ppSt_ListRecvInfo, &nListCount);
 		nPos += sizeof(RTCPPROTOCOL_RTCPRECVER);
 		//后续是否还有数据
 		if (nMsgLen - nPos > 0)
@@ -31,14 +31,14 @@ bool PullStream_ClientRtsp_RTCPProcess(LPCXSTR lpszClientAddr, XSOCKET hSocket,
 			int nListCount = 0;
 			STREAMMEDIA_RTCPPROTOCOL_SDESINFO** ppSt_ListSdeser;
 
-			RTCPProtocol_Parse_Header(&st_RTCPHdr, lpszMsgBuffer + nPos, nMsgLen - nPos);
+			RTCPProtocol_Parse_Header(lpszMsgBuffer + nPos, nMsgLen - nPos, &st_RTCPHdr);
 			nPos += sizeof(RTCPPROTOCOL_RTCPHDR);
 
 			if (ENUM_STREAMMEDIA_RTCPPROTOCOL_PACKET_TYPE_SDES == st_RTCPHdr.byPT)
 			{
 				nPos -= sizeof(uint32_t);
 			}
-			RTCPProtocol_Parse_Sdeser(&ppSt_ListSdeser, &nListCount, &st_RTCPHdr, lpszMsgBuffer + nPos, nMsgLen - nPos);
+			RTCPProtocol_Parse_Sdeser(lpszMsgBuffer + nPos, nMsgLen - nPos, &st_RTCPHdr, &ppSt_ListSdeser, &nListCount);
 			BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListSdeser, nListCount);
 		}
 		/*

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PullStream/PullStream_ClientWebRtc.cpp

@@ -97,9 +97,16 @@ bool PullStream_ClientProtocol_Handle(LPCXSTR lpszClientAddr, XSOCKET hSocket, L
 	}
 	else if ((lpszMsgBuffer[0] >> 6 == 2))
 	{
-		if ((lpszMsgBuffer[1] >= 200) && (lpszMsgBuffer[1] <= 204))
+		if ((lpszMsgBuffer[1] >= 200) && (lpszMsgBuffer[1] <= 207))
 		{
 			//RTCP
+			RTCPPROTOCOL_RTCPHDR st_RTCPHdr = {};
+			if (!RTCPProtocol_Parse_Header(lpszMsgBuffer, nMsgLen, &st_RTCPHdr))
+			{
+				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("RTC客户端:%s,RTCP协议解析失败,大小:%d,错误码:%lX"), lpszClientAddr, nMsgLen, RTCPProtocol_GetLastError());
+				return false;
+			}
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("RTC客户端:%s,请求的RTCP协议处理成功,请求处理的协议:%d"), lpszClientAddr, st_RTCPHdr.byPT);
 		}
 		else
 		{