fixed:build failure

xengine-qyt · xengine-qyt · commit 6999891855b8 · 2025-08-19T16:04:38.000+08:00
diff --git a/XEngine_Source/XEngine_DependLibrary b/XEngine_Source/XEngine_DependLibrary
@@ -1 +1 @@
-Subproject commit 269830be96d7e95646ce43533294156063178509
+Subproject commit 8970bcc172a44e943e01921ffd398594e58c8d6f
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_AVPacket.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_AVPacket.cpp
@@ -561,7 +561,7 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR
 			if (ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PULL_RTSP == stl_ListIteratorClient->enClientType)
 			{
 				int nPacketCount = 0;
-				STREAMMEDIA_RTPPROTOCOL_PACKET** ppSt_RTPPacket;
+				XENGINE_MSGBUFFER** ppSt_RTPPacket;
 				XCHAR tszSSCRStr[XPATH_MAX] = {};
 				XCHAR tszADDRStr[128] = {};
 
@@ -573,7 +573,7 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR
 					//发送数据,RTSP使用UDP发送
 					for (int i = 0; i < nPacketCount; i++)
 					{
-						NetCore_UDPXCore_SendEx(xhVRTPSocket, tszADDRStr, ppSt_RTPPacket[i]->tszMsgBuffer, ppSt_RTPPacket[i]->nMsgLen);
+						NetCore_UDPXCore_SendEx(xhVRTPSocket, tszADDRStr, ppSt_RTPPacket[i]->unData.tszMSGBuffer, ppSt_RTPPacket[i]->nMSGLen);
 					}
 				}
 				else
@@ -584,7 +584,7 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR
 					//发送数据,RTSP使用UDP发送
 					for (int i = 0; i < nPacketCount; i++)
 					{
-						NetCore_UDPXCore_SendEx(xhARTPSocket, tszADDRStr, ppSt_RTPPacket[i]->tszMsgBuffer, ppSt_RTPPacket[i]->nMsgLen);
+						NetCore_UDPXCore_SendEx(xhARTPSocket, tszADDRStr, ppSt_RTPPacket[i]->unData.tszMSGBuffer, ppSt_RTPPacket[i]->nMSGLen);
 					}
 				}
 				BaseLib_Memory_Free((XPPPMEM)&ppSt_RTPPacket, nPacketCount);
@@ -601,7 +601,7 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR
 			if (ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PULL_RTC == stl_ListIteratorClient->enClientType)
 			{
 				int nPacketCount = 0;
-				STREAMMEDIA_RTPPROTOCOL_PACKET** ppSt_RTPPacket;
+				XENGINE_MSGBUFFER** ppSt_RTPPacket;
 				XCHAR tszSSCRStr[XPATH_MAX] = {};
 				
 				if (0 == byAVType)
@@ -611,8 +611,8 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR
 					//发送数据,RTSP使用UDP发送
 					for (int i = 0; i < nPacketCount; i++)
 					{
-						ModuleHelp_SRTPCore_RTPINProtect(ppSt_RTPPacket[i]->tszMsgBuffer, &ppSt_RTPPacket[i]->nMsgLen);
-						XEngine_Network_Send(stl_ListIteratorClient->tszClientID, ppSt_RTPPacket[i]->tszMsgBuffer, ppSt_RTPPacket[i]->nMsgLen, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PUSH_RTC);
+						ModuleHelp_SRTPCore_RTPINProtect(ppSt_RTPPacket[i]->unData.tszMSGBuffer, &ppSt_RTPPacket[i]->nMSGLen);
+						XEngine_Network_Send(stl_ListIteratorClient->tszClientID, ppSt_RTPPacket[i]->unData.tszMSGBuffer, ppSt_RTPPacket[i]->nMSGLen, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PUSH_RTC);
 					}
 				}
 				else

Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,7 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR`
`561`	`561`	`if (ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PULL_RTSP == stl_ListIteratorClient->enClientType)`
`562`	`562`	`{`
`563`	`563`	`int nPacketCount = 0;`
`564`		`- STREAMMEDIA_RTPPROTOCOL_PACKET** ppSt_RTPPacket;`
	`564`	`+ XENGINE_MSGBUFFER** ppSt_RTPPacket;`
`565`	`565`	`XCHAR tszSSCRStr[XPATH_MAX] = {};`
`566`	`566`	`XCHAR tszADDRStr[128] = {};`
`567`	`567`
`@@ -573,7 +573,7 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR`
`573`	`573`	`//发送数据,RTSP使用UDP发送`
`574`	`574`	`for (int i = 0; i < nPacketCount; i++)`
`575`	`575`	`{`
`576`		`- NetCore_UDPXCore_SendEx(xhVRTPSocket, tszADDRStr, ppSt_RTPPacket[i]->tszMsgBuffer, ppSt_RTPPacket[i]->nMsgLen);`
	`576`	`+ NetCore_UDPXCore_SendEx(xhVRTPSocket, tszADDRStr, ppSt_RTPPacket[i]->unData.tszMSGBuffer, ppSt_RTPPacket[i]->nMSGLen);`
`577`	`577`	`}`
`578`	`578`	`}`
`579`	`579`	`else`
`@@ -584,7 +584,7 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR`
`584`	`584`	`//发送数据,RTSP使用UDP发送`
`585`	`585`	`for (int i = 0; i < nPacketCount; i++)`
`586`	`586`	`{`
`587`		`- NetCore_UDPXCore_SendEx(xhARTPSocket, tszADDRStr, ppSt_RTPPacket[i]->tszMsgBuffer, ppSt_RTPPacket[i]->nMsgLen);`
	`587`	`+ NetCore_UDPXCore_SendEx(xhARTPSocket, tszADDRStr, ppSt_RTPPacket[i]->unData.tszMSGBuffer, ppSt_RTPPacket[i]->nMSGLen);`
`588`	`588`	`}`
`589`	`589`	`}`
`590`	`590`	`BaseLib_Memory_Free((XPPPMEM)&ppSt_RTPPacket, nPacketCount);`
`@@ -601,7 +601,7 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR`
`601`	`601`	`if (ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PULL_RTC == stl_ListIteratorClient->enClientType)`
`602`	`602`	`{`
`603`	`603`	`int nPacketCount = 0;`
`604`		`- STREAMMEDIA_RTPPROTOCOL_PACKET** ppSt_RTPPacket;`
	`604`	`+ XENGINE_MSGBUFFER** ppSt_RTPPacket;`
`605`	`605`	`XCHAR tszSSCRStr[XPATH_MAX] = {};`
`606`	`606`
`607`	`607`	`if (0 == byAVType)`
`@@ -611,8 +611,8 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR`
`611`	`611`	`//发送数据,RTSP使用UDP发送`
`612`	`612`	`for (int i = 0; i < nPacketCount; i++)`
`613`	`613`	`{`
`614`		`- ModuleHelp_SRTPCore_RTPINProtect(ppSt_RTPPacket[i]->tszMsgBuffer, &ppSt_RTPPacket[i]->nMsgLen);`
`615`		`- XEngine_Network_Send(stl_ListIteratorClient->tszClientID, ppSt_RTPPacket[i]->tszMsgBuffer, ppSt_RTPPacket[i]->nMsgLen, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PUSH_RTC);`
	`614`	`+ ModuleHelp_SRTPCore_RTPINProtect(ppSt_RTPPacket[i]->unData.tszMSGBuffer, &ppSt_RTPPacket[i]->nMSGLen);`
	`615`	`+ XEngine_Network_Send(stl_ListIteratorClient->tszClientID, ppSt_RTPPacket[i]->unData.tszMSGBuffer, ppSt_RTPPacket[i]->nMSGLen, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PUSH_RTC);`
`616`	`616`	`}`
`617`	`617`	`}`
`618`	`618`	`else`