modify:avformat instead xstream

Author: xengine-qyt

XEngine_Source/VSCopy_Arm64.bat

@@ -6,7 +6,6 @@ copy /y "%XEngine_LibArm64%\XEngine_Core\XEngine_ManagePool.dll" "./"
 copy /y "%XEngine_LibArm64%\XEngine_Core\XEngine_Cryption.dll" "./"
 
 copy /y "%XEngine_LibArm64%\XEngine_Client\XClient_APIHelp.dll" "./"
-copy /y "%XEngine_LibArm64%\XEngine_Client\XClient_Stream.dll" "./"
 copy /y "%XEngine_LibArm64%\XEngine_Client\XClient_Socket.dll" "./"
 
 copy /y "%XEngine_LibArm64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"

XEngine_Source/VSCopy_Debug.bat

@@ -6,7 +6,6 @@ copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_ManagePool.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_Cryption.dll" "./"
 
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XClient_APIHelp.dll" "./"
-copy /y "D:\XEngine\XEngine_SourceCode\Debug\XClient_Stream.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XClient_Socket.dll" "./"
 
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_XSocket.dll" "./"

XEngine_Source/VSCopy_x64.bat

@@ -6,7 +6,6 @@ copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_ManagePool.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_Cryption.dll" "./"
 
 copy /y "%XEngine_Lib64%\XEngine_Client\XClient_APIHelp.dll" "./"
-copy /y "%XEngine_Lib64%\XEngine_Client\XClient_Stream.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_Client\XClient_Socket.dll" "./"
 
 copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"

XEngine_Source/VSCopy_x86.bat

@@ -6,7 +6,6 @@ copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_ManagePool.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_Cryption.dll" "./"
 
 copy /y "%XEngine_Lib32%\XEngine_Client\XClient_APIHelp.dll" "./"
-copy /y "%XEngine_Lib32%\XEngine_Client\XClient_Stream.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Client\XClient_Socket.dll" "./"
 
 copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile

@@ -6,7 +6,7 @@ LOADHDR = -I ./
 LOADSO = -L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleDatabase -L ../../XEngine_ModuleProtocol -L ../../XEngine_ModuleSystem -L ../../XEngine_ModuleHelp -L ../../XEngine_ModulePlugin   \
 		 -L ../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp -L ../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/XEngine_InfoReport -L ../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/XEngine_Verification  \
 		 -L ../../XEngine_DependLibrary/XEngine_IPMacData/XEngine_Source/XEngine_APIModuleIPMac -L ../../XEngine_DependLibrary/XEngine_PhoneData/XEngine_Source/XEngine_APIModulePhone
-LIB = -lXEngine_BaseSafe -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_Cryption -lXClient_Stream -lXClient_APIHelp -lXClient_Socket -lNetHelp_APIAddr -lNetHelp_XSocket -lHelpComponents_XLog -lRfcComponents_HttpProtocol -lRfcComponents_NatProtocol -lRfcComponents_NTPProtocol -lRfcComponents_DNSProtocol -lXEngine_ProcFile -lXEngine_SystemApi -lXEngine_AVHelp -lXEngine_VideoCodec -lXEngine_AudioCodec -lXEngine_AVCollect \
+LIB = -lXEngine_BaseSafe -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_Cryption -lXClient_APIHelp -lXClient_Socket -lNetHelp_APIAddr -lNetHelp_XSocket -lHelpComponents_XLog -lRfcComponents_HttpProtocol -lRfcComponents_NatProtocol -lRfcComponents_NTPProtocol -lRfcComponents_DNSProtocol -lXEngine_ProcFile -lXEngine_SystemApi -lXEngine_AVHelp -lXEngine_VideoCodec -lXEngine_AudioCodec -lXEngine_AVCollect -lXEngine_AVFormat \
 	  -lXEngine_ModuleConfigure -lXEngine_ModuleDatabase -lXEngine_ModuleProtocol -lXEngine_ModuleSystem -lXEngine_ModuleHelp -lXEngine_ModulePlugin                          \
 	  -ljsoncpp -lXEngine_InfoReport -lXEngine_Verification  \
 	  -lXEngine_APIModuleIPMac -lXEngine_APIModulePhone

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Hdr.h

@@ -39,8 +39,6 @@ using namespace std;
 #include <XEngine_Include/XEngine_Client/XClient_Error.h>
 #include <XEngine_Include/XEngine_Client/APIClient_Define.h>
 #include <XEngine_Include/XEngine_Client/APIClient_Error.h>
-#include <XEngine_Include/XEngine_Client/StreamClient_Define.h>
-#include <XEngine_Include/XEngine_Client/StreamClient_Error.h>
 #include <XEngine_Include/XEngine_NetHelp/APIAddr_Define.h>
 #include <XEngine_Include/XEngine_NetHelp/APIAddr_Error.h>
 #include <XEngine_Include/XEngine_HelpComponents/XLog_Define.h>
@@ -65,6 +63,8 @@ using namespace std;
 #include <XEngine_Include/XEngine_AVCodec/AudioCodec_Error.h>
 #include <XEngine_Include/XEngine_AVCodec/AVHelp_Define.h>
 #include <XEngine_Include/XEngine_AVCodec/AVHelp_Error.h>
+#include <XEngine_Include/XEngine_AVCodec/AVFormat_Define.h>
+#include <XEngine_Include/XEngine_AVCodec/AVFormat_Error.h>
 #include "../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/XEngine_InfoReport/InfoReport_Define.h"
 #include "../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/XEngine_InfoReport/InfoReport_Error.h"
 #include "../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/XEngine_Verification/Verification_Define.h"
@@ -162,7 +162,6 @@ extern XENGINE_DEAMONAPPLIST st_DeamonAppConfig;
 #pragma comment(lib,"XEngine_Core/XEngine_ManagePool.lib")
 #pragma comment(lib,"XEngine_Core/XEngine_Cryption.lib")
 #pragma comment(lib,"XEngine_Client/XClient_Socket.lib")
-#pragma comment(lib,"XEngine_Client/XClient_Stream.lib")
 #pragma comment(lib,"XEngine_Client/XClient_APIHelp.lib")
 #pragma comment(lib,"XEngine_NetHelp/NetHelp_APIAddr")
 #pragma comment(lib,"XEngine_HelpComponents/HelpComponents_XLog.lib")
@@ -175,6 +174,7 @@ extern XENGINE_DEAMONAPPLIST st_DeamonAppConfig;
 #pragma comment(lib,"XEngine_AVCodec/XEngine_VideoCodec.lib")
 #pragma comment(lib,"XEngine_AVCodec/XEngine_AudioCodec.lib")
 #pragma comment(lib,"XEngine_AVCodec/XEngine_AVHelp.lib")
+#pragma comment(lib,"XEngine_AVCodec/XEngine_AVFormat.lib")
 #pragma comment(lib,"Ws2_32.lib")
 #pragma comment(lib,"Dbghelp.lib")
 #ifdef _DEBUG

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_TaskPost/TaskPost_BackService.cpp

@@ -3,15 +3,11 @@
 static bool bRecord = false;
 static XHANDLE xhSound = NULL;
 static XHANDLE xhScreen = NULL;
-static XHANDLE xhStream = NULL;
+static XHANDLE xhPacket = NULL;
 static XHANDLE xhAudioFifo = NULL;
 
 void XCALLBACK HTTPTask_TaskPost_CBVideo(uint8_t* ptszAVBuffer, int nAVLen, AVCOLLECT_TIMEINFO* pSt_TimeInfo, XPVOID lParam)
 {
-	if (!XClient_StreamPush_LiveVideo(xhStream, ptszAVBuffer, nAVLen))
-	{
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("屏幕采集器,推流编码失败,需要关闭推流服务,错误码:%lX"), StreamClient_GetLastError());
-	}
 }
 void XCALLBACK HTTPTask_TaskPost_CBAudio(uint8_t* ptszAVBuffer, int nAVLen, AVCOLLECT_TIMEINFO* pSt_TimeInfo, XPVOID lParam)
 {
@@ -24,10 +20,6 @@ void XCALLBACK HTTPTask_TaskPost_CBAudio(uint8_t* ptszAVBuffer, int nAVLen, AVCO
 			{
 				break;
 			}
-			if (!XClient_StreamPush_LiveAudio(xhStream, tszAVBuffer, nAVLen))
-			{
-				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("音频采集器,推流编码失败,需要关闭推流服务,错误码:%lX"), StreamClient_GetLastError());
-			}
 		}
 	}
 }
@@ -298,8 +290,45 @@ bool HTTPTask_TaskPost_BackService(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求屏幕录制失败,因为已经在录制中了"), lpszClientAddr);
 			return false;
 		}
-		XENGINE_PROTOCOL_AVINFO st_AVInfo;
-		memset(&st_AVInfo, '\0', sizeof(XENGINE_PROTOCOL_AVINFO));
+		AVCODEC_TIMEBASE st_VideoTime = {};
+		AVCODEC_TIMEBASE st_AudioTime = {};
+		xhPacket = AVFormat_Packet_Init();
+		if (!AVFormat_Packet_Output(xhPacket, tszAPIBuffer, _X("flv")))
+		{
+			st_HDRParam.nHttpCode = 400;
+			HttpProtocol_Server_SendMsgEx(xhHTTPPacket, m_MemorySend.get(), &nSDLen, &st_HDRParam);
+			XEngine_Network_Send(lpszClientAddr, m_MemorySend.get(), nSDLen);
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求屏幕录制失败,推流服务端:%s 连接失败,错误码:%lX"), lpszClientAddr, tszAPIBuffer, AVFormat_GetLastError());
+			return false;
+		}
+		//屏幕采集
+		AVCOLLECT_SCREENINFO st_AVScreen;
+		memset(&st_AVScreen, '\0', sizeof(AVCOLLECT_SCREENINFO));
+
+		st_AVScreen.nFrameRate = 24;
+		st_AVScreen.nPosX = 0;
+		st_AVScreen.nPosY = 0;
+		_xstprintf(st_AVScreen.tszVideoSize, _X("%s"), _X("1920x1080"));
+#ifdef _MSC_BUILD
+		xhScreen = AVCollect_Video_Init("gdigrab", tszDstBuffer, &st_AVScreen, HTTPTask_TaskPost_CBVideo);
+#elif __linux__
+		xhScreen = AVCollect_Video_Init("x11grab", tszDstBuffer, &st_AVScreen, HTTPTask_TaskPost_CBVideo);
+#else
+		xhScreen = AVCollect_Video_Init("avfoundation", tszDstBuffer, &st_AVScreen, HTTPTask_TaskPost_CBVideo);
+#endif
+		if (NULL == xhScreen)
+		{
+			st_HDRParam.nHttpCode = 400;
+			HttpProtocol_Server_SendMsgEx(xhHTTPPacket, m_MemorySend.get(), &nSDLen, &st_HDRParam);
+			XEngine_Network_Send(lpszClientAddr, m_MemorySend.get(), nSDLen);
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,屏幕采集器请求失败,错误码:%lX"), lpszClientAddr, AVCollect_GetLastError());
+			return false;
+		}
+		XHANDLE xhVideoCodec = NULL;
+		AVCollect_Video_GetAVCodec(xhScreen, &xhVideoCodec);
+		AVCollect_Video_GetTimeBase(xhScreen, &st_VideoTime);
+		AVFormat_Packet_StreamCreate(xhPacket, xhVideoCodec);
+		AVFormat_Packet_TimeBase(xhPacket, 0, &st_VideoTime);
 		//启用音频
 		if (1 == nBSType)
 		{
@@ -318,7 +347,11 @@ bool HTTPTask_TaskPost_BackService(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer
 				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,初始化音频采集器请求失败,错误码:%lX"), lpszClientAddr, AVCollect_GetLastError());
 				return false;
 			}
+#ifdef _MSC_BUILD
 			xhAudioFifo = AudioCodec_Help_FifoInit(ENUM_AVCODEC_AUDIO_SAMPLEFMT_S16, 2);
+#else
+			xhAudioFifo = AudioCodec_Help_FifoInit(ENUM_AVCODEC_AUDIO_SAMPLEFMT_S16, 2);
+#endif
 			if (NULL == xhAudioFifo)
 			{
 				st_HDRParam.nHttpCode = 400;
@@ -327,59 +360,17 @@ bool HTTPTask_TaskPost_BackService(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer
 				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,初始化音频采集器请求失败,错误码:%lX"), lpszClientAddr, AudioCodec_GetLastError());
 				return false;
 			}
-			st_AVInfo.st_AudioInfo.bEnable = true;
-			AVCollect_Audio_GetInfo(xhSound, &st_AVInfo);
-			//音频编码参数
-			st_AVInfo.st_AudioInfo.enAVCodec = ENUM_XENGINE_AVCODEC_AUDIO_TYPE_AAC;
-			st_AVInfo.st_AudioInfo.nSampleFmt = ENUM_AVCODEC_AUDIO_SAMPLEFMT_S16;
-		}
-		//屏幕采集
-		AVCOLLECT_SCREENINFO st_AVScreen;
-		memset(&st_AVScreen, '\0', sizeof(AVCOLLECT_SCREENINFO));
-
-		st_AVScreen.nFrameRate = 24;
-		st_AVScreen.nPosX = 0;
-		st_AVScreen.nPosY = 0;
-		_xstprintf(st_AVScreen.tszVideoSize, _X("%s"), _X("1920x1080"));
-#ifdef _MSC_BUILD
-		xhScreen = AVCollect_Video_Init("gdigrab", tszDstBuffer, &st_AVScreen, HTTPTask_TaskPost_CBVideo);
-#elif __linux__
-		xhScreen = AVCollect_Video_Init("x11grab", tszDstBuffer, &st_AVScreen, HTTPTask_TaskPost_CBVideo);
-#else
-		xhScreen = AVCollect_Video_Init("avfoundation", tszDstBuffer, &st_AVScreen, HTTPTask_TaskPost_CBVideo);
-#endif
-		if (NULL == xhScreen)
-		{
-			st_HDRParam.nHttpCode = 400;
-			HttpProtocol_Server_SendMsgEx(xhHTTPPacket, m_MemorySend.get(), &nSDLen, &st_HDRParam);
-			XEngine_Network_Send(lpszClientAddr, m_MemorySend.get(), nSDLen);
-			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,屏幕采集器请求失败,错误码:%lX"), lpszClientAddr, AVCollect_GetLastError());
-			return false;
-		}
-		AVCollect_Video_GetInfo(xhScreen, &st_AVInfo);
-		st_AVInfo.st_VideoInfo.enAVCodec = ENUM_XENGINE_AVCODEC_VIDEO_TYPE_H264;
-		xhStream = XClient_StreamPush_LiveInit();
-		if (NULL == xhStream)
-		{
-			st_HDRParam.nHttpCode = 400;
-			HttpProtocol_Server_SendMsgEx(xhHTTPPacket, m_MemorySend.get(), &nSDLen, &st_HDRParam);
-			XEngine_Network_Send(lpszClientAddr, m_MemorySend.get(), nSDLen);
-			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,推流:%s 请求失败,错误码:%lX"), lpszClientAddr, tszDstBuffer, StreamClient_GetLastError());
-			return false;
+			XHANDLE xhAudioCodec = NULL;
+			AVCollect_Audio_GetAVCodec(xhSound, &xhAudioCodec);
+			AVCollect_Audio_GetTimeBase(xhSound, &st_AudioTime);
+			AVFormat_Packet_StreamCreate(xhPacket, xhAudioCodec);
+			AVFormat_Packet_TimeBase(xhPacket, 1, &st_AudioTime);
 		}
 		bRecord = true;
-		XClient_StreamPush_LiveOutput(xhStream, tszAPIBuffer, _X("flv"));
-		XClient_StreamPush_LiveCreate(xhStream, &st_AVInfo);
-
-		AVCODEC_TIMEBASE st_VideoTime = {};
-		AVCODEC_TIMEBASE st_AudioTime = {};
-		AVCollect_Audio_GetTimeBase(xhSound, &st_AudioTime);
-		AVCollect_Video_GetTimeBase(xhScreen, &st_VideoTime);
-		XClient_StreamPush_LiveTime(xhStream, &st_VideoTime, &st_AudioTime);
 
+		AVFormat_Packet_Start(xhPacket);
 		AVCollect_Audio_Start(xhSound);
 		AVCollect_Video_Start(xhScreen);
-		XClient_StreamPush_LiveWriteHdr(xhStream);
 		HttpProtocol_Server_SendMsgEx(xhHTTPPacket, m_MemorySend.get(), &nSDLen, &st_HDRParam);
 		XEngine_Network_Send(lpszClientAddr, m_MemorySend.get(), nSDLen);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,开始屏幕录制,音频:%s,视频:%s 推流:%s 请求成功"), lpszClientAddr, tszSrcBuffer, tszDstBuffer, tszAPIBuffer);
@@ -391,10 +382,10 @@ bool HTTPTask_TaskPost_BackService(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer
 		{
 			AVCollect_Video_Destory(xhScreen);
 			AVCollect_Audio_Destory(xhSound);
-			XClient_StreamPush_LiveClose(xhStream);
+			AVFormat_Packet_Stop(xhPacket);
 			xhScreen = NULL;
 			xhSound = NULL;
-			xhStream = NULL;
+			xhPacket = NULL;
 			bRecord = false;
 		}
 		HttpProtocol_Server_SendMsgEx(xhHTTPPacket, m_MemorySend.get(), &nSDLen, &st_HDRParam);