Skip to content

Commit 6f25380

Browse files
committed
modify:webrtc requires xengine v8.29 or above
1 parent 2e6caf2 commit 6f25380

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PullStream/PullStream_ClientWebRtc.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ bool PullStream_ClientWebRtc_SDKPacket(XNETHANDLE xhPacket, bool bVideo, XENGINE
161161
}
162162
bool PullStream_ClientWebRtc_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen)
163163
{
164+
#if XENGINE_VERSION_KERNEL >= 8 && XENGINE_VERSION_MAIN >= 29
164165
int nRVLen = 0;
165166
int nSDLen = 0;
166167
XNETHANDLE xhParse = 0;
@@ -175,7 +176,7 @@ bool PullStream_ClientWebRtc_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam,
175176
XCHAR tszSMSAddr[128] = {};
176177
BaseLib_OperatorString_GetStartEnd(pSt_HTTPParam->tszHttpUri, tszSMSAddr, _X("app="), _X("&"));
177178
_tcsxcat(tszSMSAddr, _X("/"));
178-
BaseLib_OperatorString_GetStartEnd(pSt_HTTPParam->tszHttpUri, tszSMSAddr + _tcsxlen(tszSMSAddr), _X("stream="));
179+
BaseLib_OperatorString_GetStartEnd(pSt_HTTPParam->tszHttpUri, tszSMSAddr + _tcsxlen(tszSMSAddr), _X("stream="), NULL);
179180
//查找流是否存在
180181
XCHAR tszPushAddr[128] = {};
181182
XENGINE_PROTOCOL_AVINFO st_AVInfo = {};
@@ -197,7 +198,7 @@ bool PullStream_ClientWebRtc_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam,
197198
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("WEBRTC:%s,请求拉流的SDP不正确,错误:%lX"), lpszClientAddr, SDPProtocol_GetLastError());
198199
return false;
199200
}
200-
#if XENGINE_VERSION_KERNEL >= 8 && XENGINE_VERSION_MAIN >= 29
201+
201202
bool bAudio = false;
202203
bool bVideo = false;
203204
bool bRTCPMux = false;
@@ -229,7 +230,7 @@ bool PullStream_ClientWebRtc_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam,
229230
PullStream_ClientWebRtc_SDKPacket(xhPacket, true, &st_AVInfo);
230231
SDPProtocol_Packet_GetPacket(xhPacket, tszRVBuffer, &nRVLen);
231232
SDPProtocol_Packet_Destory(xhPacket);
232-
#endif
233+
233234
XCHAR tszHDRStr[MAX_PATH] = {};
234235
XCHAR tszUserStr[MAX_PATH] = {};
235236

@@ -243,5 +244,6 @@ bool PullStream_ClientWebRtc_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam,
243244
HttpProtocol_Server_SendMsgEx(xhHttpPacket, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen, tszHDRStr);
244245
XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_HTTP);
245246
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("WEBRTC:%s,WHEP协议拉流请求成功"), lpszClientAddr);
247+
#endif
246248
return true;
247249
}

0 commit comments

Comments
 (0)