Skip to content

Commit 43daec9

Browse files
xengine-qytxengine-qyt
committed
added:rtcp parse supported
1 parent 6bf4c4a commit 43daec9

File tree

6 files changed

+18
-13
lines changed

6 files changed

+18
-13
lines changed

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool
1212
-lXEngine_ModuleConfigure -lXEngine_ModuleProtocol -lXEngine_ModuleSession -lXEngine_ModuleHelp -lXEngine_ModuleQueue \
1313
-ljsoncpp -lsrt-gnutls
1414
LIBEX =
15-
OBJECTS = PullStream_ClientGet.o PullStream_ClientMethod.o \
15+
OBJECTS = PullStream_ClientGet.o PullStream_ClientRtsp.o \
1616
PushStream_JT1078Task.o PushStream_RTMPTask.o PushStream_XStreamTask.o PushStream_SrtTask.o \
1717
StreamMedia_HTTPApi.o \
1818
XEngine_AVPacket.o XEngine_Configure.o XEngine_HttpTask.o XEngine_Network.o XEngine_StreamMediaApp.o
@@ -54,8 +54,8 @@ all:$(OBJECTS)
5454

5555
PullStream_ClientGet.o:./StreamMedia_PullStream/PullStream_ClientGet.cpp
5656
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./StreamMedia_PullStream/PullStream_ClientGet.cpp
57-
PullStream_ClientMethod.o:./StreamMedia_PullStream/PullStream_ClientMethod.cpp
58-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./StreamMedia_PullStream/PullStream_ClientMethod.cpp
57+
PullStream_ClientRtsp.o:./StreamMedia_PullStream/PullStream_ClientRtsp.cpp
58+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./StreamMedia_PullStream/PullStream_ClientRtsp.cpp
5959

6060
PushStream_XStreamTask.o:./StreamMedia_PushStream/PushStream_XStreamTask.cpp
6161
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./StreamMedia_PushStream/PushStream_XStreamTask.cpp

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_Hdr.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ using namespace std;
5050
#include <XEngine_Include/XEngine_StreamMedia/RTSPProtocol_Error.h>
5151
#include <XEngine_Include/XEngine_StreamMedia/RTPProtocol_Define.h>
5252
#include <XEngine_Include/XEngine_StreamMedia/RTPProtocol_Error.h>
53+
#include <XEngine_Include/XEngine_StreamMedia/RTCPProtocol_Define.h>
54+
#include <XEngine_Include/XEngine_StreamMedia/RTCPProtocol_Error.h>
5355
#include <XEngine_Include/XEngine_AVCodec/AVCollect_Define.h>
5456
#include <XEngine_Include/XEngine_AVCodec/VideoCodec_Define.h>
5557
#include <XEngine_Include/XEngine_AVCodec/AudioCodec_Define.h>
@@ -80,7 +82,7 @@ using namespace std;
8082
#include "./StreamMedia_PushStream/PushStream_RTMPTask.h"
8183
#include "./StreamMedia_PushStream/PushStream_SrtTask.h"
8284
#include "./StreamMedia_PullStream/PullStream_ClientGet.h"
83-
#include "./StreamMedia_PullStream/PullStream_ClientMethod.h"
85+
#include "./StreamMedia_PullStream/PullStream_ClientRtsp.h"
8486
/********************************************************************
8587
// Created: 2023/06/04 10:35:46
8688
// File Name: D:\XEngine_StreamMedia\XEngine_Source\XEngine_ServiceApp\XEngine_StreamMediaApp\XEngine_Hdr.h
@@ -170,6 +172,7 @@ extern FILE* pSt_AFile;
170172
#pragma comment(lib,"XEngine_StreamMedia/StreamMedia_HLSProtocol.lib")
171173
#pragma comment(lib,"XEngine_StreamMedia/StreamMedia_RTSPProtocol.lib")
172174
#pragma comment(lib,"XEngine_StreamMedia/StreamMedia_RTPProtocol.lib")
175+
#pragma comment(lib,"XEngine_StreamMedia/StreamMedia_RTCPProtocol.lib")
173176
#pragma comment(lib,"XEngine_AVCodec/XEngine_AVHelp.lib")
174177
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIHelp.lib")
175178
#pragma comment(lib,"Ws2_32.lib")

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_HttpTask.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ bool XEngine_HTTPTask_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXSTR
129129
else
130130
{
131131
//可能是RTSP
132-
PullStream_ClientMethod_Handle(pSt_HTTPParam, lpszClientAddr, lpszMsgBuffer, nMsgLen, &pptszList, nListCount, ppptszHDRList, nHDRCount);
132+
PullStream_ClientRtsp_Handle(pSt_HTTPParam, lpszClientAddr, lpszMsgBuffer, nMsgLen, &pptszList, nListCount, ppptszHDRList, nHDRCount);
133133
}
134134
BaseLib_OperatorMemory_Free((XPPPMEM)&pptszList, nListCount);
135135
return true;

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_Network.cpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,19 +142,21 @@ void CALLBACK Network_Callback_SRTLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket,
142142
//RTSP
143143
void CALLBACK Network_Callback_VideoRTPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
144144
{
145-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("RTP视频客户端：%s，发送数据大小:%d 给服务器"), lpszClientAddr, nMsgLen);
145+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("RTP视频客户端：%s，发送数据大小:%d 给服务器"), lpszClientAddr, nMsgLen);
146146
}
147147
void CALLBACK Network_Callback_VideoRTCPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
148148
{
149-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("RTCP视频客户端：%s，发送数据大小:%d 给服务器"), lpszClientAddr, nMsgLen);
149+
PullStream_ClientRtsp_RTCPProcess(lpszClientAddr, hSocket, lpszRecvMsg, nMsgLen);
150+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("RTCP视频客户端：%s，发送数据大小:%d 给服务器"), lpszClientAddr, nMsgLen);
150151
}
151152
void CALLBACK Network_Callback_AudioRTPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
152153
{
153-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("RTP音频客户端：%s，发送数据大小:%d 给服务器"), lpszClientAddr, nMsgLen);
154+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("RTP音频客户端：%s，发送数据大小:%d 给服务器"), lpszClientAddr, nMsgLen);
154155
}
155156
void CALLBACK Network_Callback_AudioRTCPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
156157
{
157-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("RTCP音频客户端：%s，发送数据大小:%d 给服务器"), lpszClientAddr, nMsgLen);
158+
PullStream_ClientRtsp_RTCPProcess(lpszClientAddr, hSocket, lpszRecvMsg, nMsgLen);
159+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("RTCP音频客户端：%s，发送数据大小:%d 给服务器"), lpszClientAddr, nMsgLen);
158160
}
159161
//////////////////////////////////////////////////////////////////////////网络IO关闭操作
160162
void XEngine_Network_Close(LPCXSTR lpszClientAddr, XSOCKET hSocket, bool bHeart, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE enClientType)

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_StreamMediaApp.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<ItemGroup>
146146
<ClCompile Include="StreamMedia_HTTPApi\StreamMedia_HTTPApi.cpp" />
147147
<ClCompile Include="StreamMedia_PullStream\PullStream_ClientGet.cpp" />
148-
<ClCompile Include="StreamMedia_PullStream\PullStream_ClientMethod.cpp" />
148+
<ClCompile Include="StreamMedia_PullStream\PullStream_ClientRtsp.cpp" />
149149
<ClCompile Include="StreamMedia_PushStream\PushStream_SrtTask.cpp" />
150150
<ClCompile Include="StreamMedia_PushStream\PushStream_XStreamTask.cpp" />
151151
<ClCompile Include="StreamMedia_PushStream\PushStream_JT1078Task.cpp" />
@@ -159,7 +159,7 @@
159159
<ItemGroup>
160160
<ClInclude Include="StreamMedia_HTTPApi\StreamMedia_HTTPApi.h" />
161161
<ClInclude Include="StreamMedia_PullStream\PullStream_ClientGet.h" />
162-
<ClInclude Include="StreamMedia_PullStream\PullStream_ClientMethod.h" />
162+
<ClInclude Include="StreamMedia_PullStream\PullStream_ClientRtsp.h" />
163163
<ClInclude Include="StreamMedia_PushStream\PushStream_SrtTask.h" />
164164
<ClInclude Include="StreamMedia_PushStream\PushStream_XStreamTask.h" />
165165
<ClInclude Include="StreamMedia_PushStream\PushStream_JT1078Task.h" />

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_StreamMediaApp.vcxproj.filters‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<ClCompile Include="StreamMedia_PullStream\PullStream_ClientGet.cpp">
6767
<Filter>源文件\StreamMedia_PullStream</Filter>
6868
</ClCompile>
69-
<ClCompile Include="StreamMedia_PullStream\PullStream_ClientMethod.cpp">
69+
<ClCompile Include="StreamMedia_PullStream\PullStream_ClientRtsp.cpp">
7070
<Filter>源文件\StreamMedia_PullStream</Filter>
7171
</ClCompile>
7272
</ItemGroup>
@@ -104,7 +104,7 @@
104104
<ClInclude Include="StreamMedia_PullStream\PullStream_ClientGet.h">
105105
<Filter>头文件\StreamMedia_PullStream</Filter>
106106
</ClInclude>
107-
<ClInclude Include="StreamMedia_PullStream\PullStream_ClientMethod.h">
107+
<ClInclude Include="StreamMedia_PullStream\PullStream_ClientRtsp.h">
108108
<Filter>头文件\StreamMedia_PullStream</Filter>
109109
</ClInclude>
110110
</ItemGroup>

0 commit comments

Comments
 (0)