modify:hls supported delete file when stream closed

Author: xengine-qyt

XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h

@@ -69,6 +69,7 @@ typedef struct tag_XEngine_ServiceConfig
 			XCHAR tszHLSPath[MAX_PATH];
 			int nTime;
 			bool bEnable;
+			bool bClear;
 		}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.bClear = st_PullHls["bClear"].asBool();
 	pSt_ServerConfig->st_XPull.st_PullHls.nTime = st_PullHls["nTime"].asInt();
 	_tcsxcpy(pSt_ServerConfig->st_XPull.st_PullHls.tszHLSPath, st_PullHls["tszHLSPath"].asCString());
 

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_AVPacket.cpp

@@ -34,7 +34,7 @@ bool XEngine_AVPacket_AVCreate(LPCXSTR lpszClientAddr)
 			_xstprintf(tszHLSFile, _X("%s/%s.m3u8"), st_ServiceConfig.st_XPull.st_PullHls.tszHLSPath, tszSMSAddr);
 			_xstprintf(tszTSFile, _X("%s/%s/%lld.ts"), st_ServiceConfig.st_XPull.st_PullHls.tszHLSPath, tszSMSAddr, time(NULL));
 
-			HLSProtocol_M3u8File_AddStream(xhHLSFile, &xhSub, tszHLSFile, false);
+			HLSProtocol_M3u8Packet_AddStream(xhHLSFile, &xhSub, tszHLSFile, false);
 			ModuleSession_PushStream_HLSInsert(lpszClientAddr, tszTSFile, xhSub);
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HLS端:%s,媒体文件创建成功,M3U8文件地址:%s,TS文件地址:%s"), lpszClientAddr, tszHLSFile, tszTSFile);
 		}
@@ -432,7 +432,7 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR
 				ModuleSession_PushStream_HLSClose(lpszClientAddr, &xhSubFile);
 
 				BaseLib_OperatorString_GetSeparatorStr(tszHLSFile, _X("/"), tszFile, 2, false);
-				HLSProtocol_M3u8File_AddFile(xhHLSFile, xhSubFile, tszFile, double(nCalValue), false);
+				HLSProtocol_M3u8Packet_AddFile(xhHLSFile, xhSubFile, tszFile, double(nCalValue), false);
 				//打开新的
 				_xstprintf(tszTSFile, _X("%s/%s/%lld.ts"), st_ServiceConfig.st_XPull.st_PullHls.tszHLSPath, tszSMSAddr, time(NULL));
 				ModuleSession_PushStream_HLSInsert(lpszClientAddr, tszTSFile, xhSubFile);

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_Network.cpp

@@ -254,7 +254,7 @@ void XEngine_Network_Close(LPCXSTR lpszClientAddr, XSOCKET hSocket, bool bHeart,
 		ModuleSession_PushStream_HLSClose(lpszClientAddr, &xhHLSToken);
 		if (xhHLSToken > 0)
 		{
-			HLSProtocol_M3u8File_Delete(xhHLSFile, xhHLSToken);
+			HLSProtocol_M3u8Packet_Delete(xhHLSFile, xhHLSToken, st_ServiceConfig.st_XPull.st_PullHls.bClear);
 		}
 		ModuleSession_PullStream_PublishDelete(tszSMSAddr);
 		ModuleSession_PushStream_Destroy(lpszClientAddr);

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_StreamMediaApp.cpp

@@ -88,7 +88,7 @@ void ServiceApp_Stop(int signo)
 		ManagePool_Thread_NQDestroy(xhJT1078Pool);
 		//销毁其他资源
 		ModuleHelp_SrtCore_Destory();
-		HLSProtocol_M3u8File_Delete(xhHLSFile);
+		HLSProtocol_M3u8Packet_Delete(xhHLSFile);
 		srt_cleanup();
 
 		HelpComponents_XLog_Destroy(xhLog);
@@ -500,7 +500,7 @@ int main(int argc, char** argv)
 
 	if (st_ServiceConfig.st_XPull.st_PullHls.bEnable)
 	{
-		if (!HLSProtocol_M3u8File_Create(&xhHLSFile, NULL))
+		if (!HLSProtocol_M3u8Packet_Create(&xhHLSFile, NULL))
 		{
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("启动服务中,启动HLS(M3U8)文件流失败,错误：%d"), HLSProtocol_GetLastError());
 			goto XENGINE_SERVICEAPP_EXIT;
@@ -555,7 +555,7 @@ int main(int argc, char** argv)
 		ManagePool_Thread_NQDestroy(xhJT1078Pool);
 		//销毁其他资源
 		ModuleHelp_SrtCore_Destory();
-		HLSProtocol_M3u8File_Delete(xhHLSFile);
+		HLSProtocol_M3u8Packet_Delete(xhHLSFile);
 		srt_cleanup();
 
 		HelpComponents_XLog_Destroy(xhLog);