improved:webrtc sdp parse and packet

Author: xengine-qyt

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PullStream/PullStream_ClientWebRtc.cpp

@@ -88,24 +88,24 @@ bool PullStream_ClientProtocol_Handle(LPCXSTR lpszClientAddr, XSOCKET hSocket, L
 
 	return true;
 }
-bool PullStream_ClientWebRtc_SDKPacket(XNETHANDLE xhPacket, LPCXSTR lpszSMSAddr, bool bVideo, XENGINE_PROTOCOL_AVINFO* pSt_AVInfo)
+bool PullStream_ClientWebRtc_SDKPacket(XNETHANDLE xhPacket, bool bVideo, XENGINE_PROTOCOL_AVINFO* pSt_AVInfo)
 {
+#if XENGINE_VERSION_KERNEL >= 8 && XENGINE_VERSION_MAIN >= 29
 	XCHAR** pptszAVList;
 	BaseLib_OperatorMemory_Malloc((XPPPMEM)&pptszAVList, 1, MAX_PATH);
 
 	if (bVideo)
 	{
 		_tcsxcpy(pptszAVList[0], _X("106"));
-		SDPProtocol_Packet_AddMedia(xhPacket, _X("video"), _X("UDP/TLS/RTP/SAVPF"), &pptszAVList, 1);
+		SDPProtocol_Packet_AddMedia(xhPacket, _X("video"), _X("UDP/TLS/RTP/SAVPF"), &pptszAVList, 1, 9);
 	}
 	else
 	{
 		_tcsxcpy(pptszAVList[0], _X("111"));
-		SDPProtocol_Packet_AddMedia(xhPacket, _X("audio"), _X("UDP/TLS/RTP/SAVPF"), &pptszAVList, 1);
+		SDPProtocol_Packet_AddMedia(xhPacket, _X("audio"), _X("UDP/TLS/RTP/SAVPF"), &pptszAVList, 1, 9);
 	}
 	//生成用户和密码
-	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("ice-ufrag"), "j107le40");
-	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("ice-pwd"), "3321308h8i6vt3769r6638l1409d50jz");
+	SDPProtocol_Packet_ICEUser(xhPacket, _X("j107le40"), _X("3321308h8i6vt3769r6638l1409d50jz"));
 
 	int nDLen = 0;
 	XBYTE tszDigestStr[MAX_PATH] = {};
@@ -145,20 +145,18 @@ bool PullStream_ClientWebRtc_SDKPacket(XNETHANDLE xhPacket, LPCXSTR lpszSMSAddr,
 		st_SDPMedia.st_FmtpVideo.tszLeaveId[1] = tszSPSBuffer[1];
 		st_SDPMedia.st_FmtpVideo.tszLeaveId[2] = tszSPSBuffer[2];
 		SDPProtocol_Packet_VideoFmt(xhPacket, 106, &st_SDPMedia, true);
+		SDPProtocol_Packet_CName(xhPacket, 2124085006, _X("79a9722580589zr5"), _X("video-666q08to"));
 	}
 	else
 	{
 		SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("mid"), _X("0"));
 		SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("rtpmap"), _X("111 opus/48000/2"));
 		SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("rtcp-fb"), _X("111 transport-cc"));
+		SDPProtocol_Packet_CName(xhPacket, 2124085006, _X("79a9722580589zr5"), _X("audio-23z8fj2g"));
 	}
-	
-	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("ssrc"), _X("2124085006 cname:79a9722580589zr5"));
-	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("ssrc"), _X("2124085006 label:audio-23z8fj2g"));
-#if XENGINE_VERSION_KERNEL >= 8 && XENGINE_VERSION_MAIN >= 29
 	SDPProtocol_Packet_OptionalCandidate(xhPacket, st_ServiceConfig.tszIPAddr, st_ServiceConfig.nRTCPort);
-#endif
 	BaseLib_OperatorMemory_Free((XPPPMEM)&pptszAVList, 1);
+#endif
 	return true;
 }
 bool PullStream_ClientWebRtc_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen)
@@ -199,63 +197,39 @@ bool PullStream_ClientWebRtc_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam,
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("WEBRTC:%s,请求拉流的SDP不正确,错误:%lX"), lpszClientAddr, SDPProtocol_GetLastError());
 		return false;
 	}
-	bool bBundle = false;
+#if XENGINE_VERSION_KERNEL >= 8 && XENGINE_VERSION_MAIN >= 29
+	bool bAudio = false;
+	bool bVideo = false;
 	bool bRTCPMux = false;
 	int nListCount = 0;
 	XCHAR tszICEUser[MAX_PATH] = {};
 	XCHAR tszICEPass[MAX_PATH] = {};
+	XCHAR tszAlgType[MAX_PATH] = {};
 	XCHAR tszHMacStr[MAX_PATH] = {};
 	STREAMMEDIA_SDPPROTOCOL_ATTR** ppSt_ListAttr;
 	SDPProtocol_Parse_GetAttr(xhParse, &ppSt_ListAttr, &nListCount);
-	for (int i = 0; i < nListCount; i++)
-	{
-		LPCXSTR lpszAttrGroup = _X("group");
-		LPCXSTR lpszAttrMux = _X("rtcp-mux");
-		LPCXSTR lpszICEUfrag = _X("ice-ufrag");
-		LPCXSTR lpszICEPwd = _X("ice-pwd");
-		LPCXSTR lpszFinger = _X("fingerprint");
-		if (0 == _tcsxnicmp(lpszAttrGroup, ppSt_ListAttr[i]->tszAttrKey, _tcsxlen(lpszAttrGroup)))
-		{
-			LPCXSTR lpszBundleStr = _X("BUNDLE");
-			if (0 == _tcsxnicmp(lpszBundleStr, ppSt_ListAttr[i]->tszAttrValue, _tcsxlen(lpszBundleStr)))
-			{
-				//是否启用了端口一致绑定
-				bBundle = true;
-			}
-		}
-		else if (0 == _tcsxnicmp(lpszAttrMux, ppSt_ListAttr[i]->tszAttrKey, _tcsxlen(lpszAttrMux)))
-		{
-			bRTCPMux = true;  //复用端口检查
-		}
-		else if (0 == _tcsxnicmp(lpszICEUfrag, ppSt_ListAttr[i]->tszAttrKey, _tcsxlen(lpszICEUfrag)))
-		{
-			_tcsxcpy(tszICEUser, ppSt_ListAttr[i]->tszAttrValue);
-		}
-		else if (0 == _tcsxnicmp(lpszICEPwd, ppSt_ListAttr[i]->tszAttrKey, _tcsxlen(lpszICEPwd)))
-		{
-			_tcsxcpy(tszICEPass, ppSt_ListAttr[i]->tszAttrValue);
-		}
-		else if (0 == _tcsxnicmp(lpszFinger, ppSt_ListAttr[i]->tszAttrKey, _tcsxlen(lpszFinger)))
-		{
-			XCHAR tszKeyStr[MAX_PATH] = {};
-			BaseLib_OperatorString_GetKeyValue(ppSt_ListAttr[i]->tszAttrValue, _X(" "), tszKeyStr, tszHMacStr);
-		}
-	}
+
+	SDPProtocol_Parse_AttrBundle(&ppSt_ListAttr, nListCount, &bAudio, &bVideo, &bRTCPMux);
+	SDPProtocol_Parse_AttrICEUser(&ppSt_ListAttr, nListCount, tszICEUser, tszICEPass);
+	SDPProtocol_Parse_AttrFinger(&ppSt_ListAttr, nListCount, tszAlgType, tszHMacStr);
 	SDPProtocol_Parse_Destory(xhParse);
 	BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListAttr, nListCount);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("WEBRTC:%s,请求的SDP信息属性解析完毕,总共解析了:%d 个属性"), lpszClientAddr, nListCount);
 
 	SDPProtocol_Packet_Create(&xhPacket);
 	SDPProtocol_Packet_Owner(xhPacket, _X("rtc"), xhPacket, _X("0.0.0.0"));
 	SDPProtocol_Packet_Session(xhPacket, _X("XEngine_Session"));
+	SDPProtocol_Packet_KeepTime(xhPacket);
+	SDPProtocol_Packet_Bundle(xhPacket);
 	SDPProtocol_Packet_OptionalRange(xhPacket);
 	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("ice-lite"));
-	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("group"), _X("BUNDLE 0 1"));
 	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("msid-semantic"), _X("WMS live/livestream"));
 
+	PullStream_ClientWebRtc_SDKPacket(xhPacket, false, &st_AVInfo);
+	PullStream_ClientWebRtc_SDKPacket(xhPacket, true, &st_AVInfo);
 	SDPProtocol_Packet_GetPacket(xhPacket, tszRVBuffer, &nRVLen);
 	SDPProtocol_Packet_Destory(xhPacket);
-	
+#endif
 	st_HDRParam.nHttpCode = 201;
 	HttpProtocol_Server_SendMsgEx(xhHttpPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
 	XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_HTTP);