added:configure for webrtc

modify:audio webrtc sdp info added

Author: xengine-qyt

XEngine_Source/XEngine_BuildSwitch.h

@@ -10,5 +10,5 @@
 //    Purpose:     编译开关选项
 //    History:
 *********************************************************************/
-#define _XENGINE_STREAMMEDIA_BUILDSWITCH_SRT 0                       //SRT协议编译开关选项
-#define _XENGINE_STREAMMEDIA_BUILDSWITCH_RTC 0                       //WEBRTC协议编译开关选项
+#define _XENGINE_STREAMMEDIA_BUILDSWITCH_SRT 1                       //SRT协议编译开关选项
+#define _XENGINE_STREAMMEDIA_BUILDSWITCH_RTC 1                       //WEBRTC协议编译开关选项

XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h

@@ -89,8 +89,11 @@ typedef struct tag_XEngine_ServiceConfig
 		}st_PullRtsp;
 		struct  
 		{
-			bool bEnable;
+			XCHAR tszPrivateKey[MAX_PATH];
+			XCHAR tszPublicKey[MAX_PATH];
+			XCHAR tszRequestKey[MAX_PATH];
 			int nSTUNPort;
+			bool bEnable;
 		}st_PullWebRtc;
 	}st_XPull;
 	struct  

XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp

@@ -155,6 +155,9 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	_tcsxcpy(pSt_ServerConfig->st_XPull.st_PullHls.tszHLSPath, st_PullHls["tszHLSPath"].asCString());
 
 	pSt_ServerConfig->st_XPull.st_PullWebRtc.nSTUNPort = st_PullWebRtc["nSTUNPort"].asInt();
+	_tcsxcpy(pSt_ServerConfig->st_XPull.st_PullWebRtc.tszPrivateKey, st_PullWebRtc["RSAPrivateKey"].asCString());
+	_tcsxcpy(pSt_ServerConfig->st_XPull.st_PullWebRtc.tszPublicKey, st_PullWebRtc["RSAPublicKey"].asCString());
+	_tcsxcpy(pSt_ServerConfig->st_XPull.st_PullWebRtc.tszRequestKey, st_PullWebRtc["RSARequestKey"].asCString());
 	//日志配置
 	if (st_JsonRoot["XLog"].empty() || (3 != st_JsonRoot["XLog"].size()))
 	{

XEngine_Source/XEngine_ModuleHelp/pch.h

@@ -14,6 +14,7 @@
 #include <WinSock2.h>
 #endif
 #endif //PCH_H
+#include "../XEngine_BuildSwitch.h"
 #include <string.h>
 #include <errno.h>
 #include <time.h>
@@ -34,7 +35,6 @@ using namespace std;
 #include <XEngine_Include/XEngine_Core/OPenSsl_Define.h>
 #include <XEngine_Include/XEngine_Core/OPenSsl_Error.h>
 #include "../XEngine_UserProtocol.h"
-#include "../XEngine_BuildSwitch.h"
 #include "ModuleHelp_Define.h"
 #include "ModuleHelp_Error.h"
 /********************************************************************

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PullStream/PullStream_ClientWebRtc.cpp

@@ -133,6 +133,31 @@ bool PullStream_ClientWebRtc_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam,
 	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("ice-ufrag"), "j107le40");
 	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("ice-pwd"), "3321308h8i6vt3769r6638l1409d50jz");
 
+	int nDLen = 0;
+	XBYTE tszDigestStr[MAX_PATH] = {};
+	XCHAR tszDigestHex[MAX_PATH] = {};
+	int nPos = _xstprintf(tszDigestHex, _X("sha-256 "));
+	OPenSsl_Api_Digest(st_ServiceConfig.st_XPull.st_PullWebRtc.tszRequestKey, tszDigestStr, &nDLen, true, XENGINE_OPENSSL_API_DIGEST_SHA256);
+	for (int i = 0; i < nDLen; i++)
+	{
+		int nRet = _xstprintf(tszDigestHex + nPos, _X("%02X"), tszDigestStr[i]);
+		nPos += nRet;
+		tszDigestHex[nPos] = ':';
+		nPos++;
+	}
+	tszDigestHex[nPos - 1] = '\0';
+
+	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("fingerprint"), tszDigestHex);
+	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("setup"), _X("passive"));
+	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("mid"), _X("0"));
+	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("extmap"), _X("3 http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01"));
+	SDPProtocol_Packet_OnlyRWFlag(xhPacket, true);
+	SDPProtocol_Packet_RtcpComm(xhPacket, true, true);
+	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("rtpmap"), _X("111 opus/48000/2"));
+	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("rtcp-fb"), _X("111 transport-cc"));
+	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("ssrc"), _X("2124085006 cname:79a9722580589zr5"));
+	SDPProtocol_Packet_OptionalAddAttr(xhPacket, _X("ssrc"), _X("2124085006 label:audio-23z8fj2g"));
+	
 	SDPProtocol_Packet_GetPacket(xhPacket, tszRVBuffer, &nRVLen);
 	SDPProtocol_Packet_Destory(xhPacket);
 	BaseLib_OperatorMemory_Free((XPPPMEM)&pptszAVList, 1);

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_Hdr.h

@@ -64,6 +64,7 @@ using namespace std;
 #include <XEngine_Include/XEngine_SystemSdk/SystemApi_Define.h>
 #include <XEngine_Include/XEngine_SystemSdk/SystemApi_Error.h>
 //加载项目相关头文件
+#include "../../XEngine_BuildSwitch.h"
 #include "../../XEngine_UserProtocol.h"
 #include "../../XEngine_ModuleConfigure/ModuleConfig_Define.h"
 #include "../../XEngine_ModuleConfigure/ModuleConfig_Error.h"