added:custom m3u8 time set

Author: xengine-qyt

XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h

@@ -66,8 +66,9 @@ typedef struct tag_XEngine_ServiceConfig
 		}st_PullFlv;
 		struct
 		{
-			bool bEnable;
 			XCHAR tszHLSPath[MAX_PATH];
+			int nTime;
+			bool bEnable;
 		}st_PullHls;
 		struct  
 		{

XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp

@@ -146,6 +146,7 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	pSt_ServerConfig->st_XPull.st_PullRtsp.nARTPPort = st_PullRtsp["nARTPPort"].asInt();
 	pSt_ServerConfig->st_XPull.st_PullRtsp.nARTCPPort = st_PullRtsp["nARTCPPort"].asInt();
 
+	pSt_ServerConfig->st_XPull.st_PullHls.nTime = st_PullHls["nTime"].asInt();
 	_tcsxcpy(pSt_ServerConfig->st_XPull.st_PullHls.tszHLSPath, st_PullHls["tszHLSPath"].asCString());
 
 	pSt_ServerConfig->st_XPull.st_PullWebRtc.nSTUNPort = st_PullWebRtc["nSTUNPort"].asInt();

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_AVPacket.cpp

@@ -41,7 +41,7 @@ bool XEngine_AVPacket_AVCreate(LPCXSTR lpszClientAddr)
 			_xstprintf(tszFile, _X("%s/%s/%lld.ts"), st_ServiceConfig.st_XPull.st_PullHls.tszHLSPath, tszSMSAddr, time(NULL));
 
 			HLSProtocol_M3u8File_AddStream(xhHLSFile, &xhSub, tszHLSFile, false);
-			HLSProtocol_M3u8File_AddFile(xhHLSFile, xhSub, tszTSFile, 15, false);
+			HLSProtocol_M3u8File_AddFile(xhHLSFile, xhSub, tszTSFile, st_ServiceConfig.st_XPull.st_PullHls.nTime, false);
 			ModuleSession_PushStream_HLSInsert(lpszClientAddr, tszFile, xhSub);
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HLS端:%s,媒体文件创建成功,M3U8文件地址:%s,TS文件地址:%s,数据流地址:%s"), lpszClientAddr, tszHLSFile, tszTSFile, tszFile);
 		}
@@ -424,7 +424,7 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR
 			ModuleSession_PushStream_HLSTimeGet(lpszClientAddr, &nTimeStart);
 
 			__int64u nCalValue = __int64u(nTimeEnd) - nTimeStart;
-			if (nCalValue >= 15)
+			if (nCalValue >= st_ServiceConfig.st_XPull.st_PullHls.nTime)
 			{
 				XNETHANDLE xhSubFile = 0;
 				XCHAR tszTSFile[MAX_PATH] = {};
@@ -435,7 +435,7 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR
 				ModuleSession_PushStream_HLSClose(lpszClientAddr, &xhSubFile);
 				//在打开
 				_xstprintf(tszTSFile, _X("%s/%s/%lld.ts"), st_ServiceConfig.st_XPull.st_PullHls.tszHLSPath, tszSMSAddr, time(NULL));
-				HLSProtocol_M3u8File_AddFile(xhHLSFile, xhSubFile, tszTSFile, nCalValue, false);
+				HLSProtocol_M3u8File_AddFile(xhHLSFile, xhSubFile, tszTSFile, double(nCalValue), false);
 				ModuleSession_PushStream_HLSInsert(lpszClientAddr, tszTSFile, xhSubFile);
 				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HLS端:%s,媒体打包成功,开始处理新的文件:%s,时间:%llu"), lpszClientAddr, tszTSFile, nCalValue);
 			}

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_Network.cpp

@@ -250,6 +250,12 @@ void XEngine_Network_Close(LPCXSTR lpszClientAddr, XSOCKET hSocket, bool bHeart,
 	}
 	if (ModuleSession_PushStream_GetAddrForAddr(lpszClientAddr, tszSMSAddr))
 	{
+		XNETHANDLE xhHLSToken = 0;
+		ModuleSession_PushStream_HLSClose(lpszClientAddr, &xhHLSToken);
+		if (xhHLSToken > 0)
+		{
+			HLSProtocol_M3u8File_Delete(xhHLSFile, xhHLSToken);
+		}
 		ModuleSession_PullStream_PublishDelete(tszSMSAddr);
 		ModuleSession_PushStream_Destroy(lpszClientAddr);
 	}

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_StreamMediaApp.cpp

@@ -505,7 +505,7 @@ int main(int argc, char** argv)
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("启动服务中,启动HLS(M3U8)文件流失败,错误：%d"), HLSProtocol_GetLastError());
 			goto XENGINE_SERVICEAPP_EXIT;
 		}
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,启动HLS(M3U8)文件流成功"));
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,启动HLS(M3U8)文件流成功,TS文件流时间:%d"), st_ServiceConfig.st_XPull.st_PullHls.nTime);
 	}
 
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s,服务版本:%s,发行次数;%d。。。"), BaseLib_OperatorVer_XNumberStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());