modify:unified pre play code

Author: xengine-qyt

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PushStream/PushStream_RTMPTask.cpp

@@ -212,22 +212,7 @@ bool PushStream_RTMPTask_Handle(XENGINE_RTMPHDR* pSt_RTMPHdr, LPCXSTR lpszClient
 		ModuleSession_PushStream_SetAVInfo(lpszClientAddr, &st_AVInfo);
 		BaseLib_Memory_Free((XPPPMEM)&st_RTMPData.ppSt_CMDProperty, st_RTMPData.nCount);
 		//如果启用了预拉流
-		if (st_ServiceConfig.st_XPull.st_PullRtmp.bPrePull)
-		{
-			XCHAR tszSMSAddr[MAX_PATH] = {};
-			ModuleSession_PushStream_GetAddrForAddr(lpszClientAddr, tszSMSAddr);
-
-			int nListCount = 0;
-			STREAMMEDIA_PULLLISTINFO** ppSt_PullList;
-			ModuleSession_PullStream_GetList(&ppSt_PullList, &nListCount, tszSMSAddr);
-			for (int i = 0; i < nListCount; i++)
-			{
-				PushStream_RTMPTask_Play(ppSt_PullList[i]->tszClientAddr, lpszClientAddr, ptszSDBuffer);
-				ModuleSession_PullStream_SetPushAddr(ppSt_PullList[i]->tszClientAddr, lpszClientAddr);
-			}
-			BaseLib_Memory_Free((XPPPMEM)&ppSt_PullList, nListCount);
-			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("RTMP推流端：%s,预发布流通知成功,个数:%d"), lpszClientAddr, nListCount);
-		}
+		XEngine_AVPacket_AVPrePlay(lpszClientAddr, ptszSDBuffer, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PUSH_RTMP);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("RTMP推流端：%s,请求数据协议解析成功,数据列表个数:%d"), lpszClientAddr, st_RTMPData.nCount);
 	}
 	else if (XENGINE_STREAMMEDIA_RTMP_MSGTYPE_COMMAND == pSt_RTMPHdr->byTypeID)

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_AVPacket.cpp

@@ -80,6 +80,31 @@ bool XEngine_AVPacket_AVSetTime(LPCXSTR lpszClientAddr, int nVideoParament, int
 	}
 	return true;
 }
+bool XEngine_AVPacket_AVPrePlay(LPCXSTR lpszClientAddr, XCHAR* ptszSDBuffer, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE enPushType)
+{
+	XCHAR tszSMSAddr[MAX_PATH] = {};
+	ModuleSession_PushStream_GetAddrForAddr(lpszClientAddr, tszSMSAddr);
+	//获得所有预拉流客户端
+	int nListCount = 0;
+	STREAMMEDIA_PULLLISTINFO** ppSt_PullList;
+	ModuleSession_PullStream_GetList(&ppSt_PullList, &nListCount, tszSMSAddr);
+	for (int i = 0; i < nListCount; i++)
+	{
+		//rtmp预拉流
+		if (st_ServiceConfig.st_XPull.st_PullRtmp.bPrePull && ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PUSH_RTMP == enPushType)
+		{
+			//判断客户端
+			if (ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PULL_RTMP == ppSt_PullList[i]->enStreamType)
+			{
+				PushStream_RTMPTask_Play(ppSt_PullList[i]->tszClientAddr, lpszClientAddr, ptszSDBuffer);
+				ModuleSession_PullStream_SetPushAddr(ppSt_PullList[i]->tszClientAddr, lpszClientAddr);
+			}
+		}
+	}
+	BaseLib_Memory_Free((XPPPMEM)&ppSt_PullList, nListCount);
+	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("RTMP推流端：%s,预发布流通知成功,个数:%d"), lpszClientAddr, nListCount);
+	return true;
+}
 bool XEngine_AVPacket_AVHdr(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, XBYTE byAVType, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE enClientType)
 {
 	XENGINE_PROTOCOL_AVINFO st_AVInfo = {};

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_AVPacket.h

@@ -20,5 +20,6 @@ typedef struct
 bool XEngine_AVPacket_AVCreate(LPCXSTR lpszClientAddr);
 bool XEngine_AVPacket_AVDelete(LPCXSTR lpszClientAddr);
 bool XEngine_AVPacket_AVSetTime(LPCXSTR lpszClientAddr, int nVideoParament, int nAudioParament);
+bool XEngine_AVPacket_AVPrePlay(LPCXSTR lpszClientAddr, XCHAR* ptszSDBuffer, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE enPushType);
 bool XEngine_AVPacket_AVHdr(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, XBYTE byAVType, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE enClientType);
 bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszRVBuffer, int* pInt_RVLen, LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, XBYTE byAVType);