modify:system sound capture support for back service

Author: xengine-qyt

XEngine_Source/XEngine_ModuleProtocol/pch.h

@@ -30,7 +30,6 @@
 #include <XEngine_Include/XEngine_NetHelp/APIAddr_Define.h>
 #include <XEngine_Include/XEngine_NetHelp/APIAddr_Error.h>
 #include <XEngine_Include/XEngine_SystemSdk/ProcFile_Define.h>
-#include <XEngine_Include/XEngine_AVCodec/AVCollect_Define.h>
 #include <XEngine_Include/XEngine_AVCodec/VideoCodec_Define.h>
 #include <XEngine_Include/XEngine_AVCodec/AVHelp_Define.h>
 #include "../XEngine_DependLibrary/XEngine_IPMacData/XEngine_Source/XIPMac_CommHdr.h"

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Hdr.h

@@ -55,16 +55,18 @@ using namespace std;
 #include <XEngine_Include/XEngine_RfcComponents/DNSProtocol_Error.h>
 #include <XEngine_Include/XEngine_SystemSdk/SystemApi_Define.h>
 #include <XEngine_Include/XEngine_SystemSdk/SystemApi_Error.h>
-#include <XEngine_Include/XEngine_AVCodec/AVCollect_Define.h>
-#include <XEngine_Include/XEngine_AVCodec/AVCollect_Error.h>
 #include <XEngine_Include/XEngine_AVCodec/VideoCodec_Define.h>
 #include <XEngine_Include/XEngine_AVCodec/VideoCodec_Error.h>
 #include <XEngine_Include/XEngine_AVCodec/AudioCodec_Define.h>
 #include <XEngine_Include/XEngine_AVCodec/AudioCodec_Error.h>
+#include <XEngine_Include/XEngine_AVCodec/AVCollect_Define.h>
+#include <XEngine_Include/XEngine_AVCodec/AVCollect_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_Include/XEngine_AVCodec/AVFilter_Define.h>
+#include <XEngine_Include/XEngine_AVCodec/AVFilter_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"
@@ -175,6 +177,7 @@ extern XENGINE_DEAMONAPPLIST st_DeamonAppConfig;
 #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,"XEngine_AVCodec/XEngine_AVFilter.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

@@ -1,11 +1,13 @@
 #include "../XEngine_Hdr.h"
 
 static bool bRecord = false;
-static XHANDLE xhVideo = 0;
+static XHANDLE xhVideo = NULL;
+static XHANDLE xhAudio = NULL;
 static XHANDLE xhSound = NULL;
 static XHANDLE xhScreen = NULL;
 static XHANDLE xhPacket = NULL;
 static XHANDLE xhAudioFifo = NULL;
+static XNETHANDLE xhFilter = 0;
 
 void XCALLBACK HTTPTask_TaskPost_CBVideo(uint8_t* ptszAVBuffer, int nAVLen, AVCODEC_TIMESTAMP* pSt_TimeInfo, XPVOID lParam)
 {
@@ -19,19 +21,34 @@ void XCALLBACK HTTPTask_TaskPost_CBVideo(uint8_t* ptszAVBuffer, int nAVLen, AVCO
 	}
 	BaseLib_Memory_Free((XPPPMEM)&ppSt_MSGBuffer, nListCount);
 }
-void XCALLBACK HTTPTask_TaskPost_CBAudio(uint8_t* ptszAVBuffer, int nAVLen, AVCODEC_TIMESTAMP* pSt_TimeInfo, XPVOID lParam)
+void XCALLBACK HTTPTask_TaskPost_CBAudio(AVCODEC_AUDIO_MSGBUFFER* pSt_MSGBuffer, XPVOID lParam)
 {
-	if (AudioCodec_Help_FifoSend(xhAudioFifo, (LPCXSTR)ptszAVBuffer, nAVLen))
+	int nListCount = 0;
+	AVCODEC_AUDIO_MSGBUFFER** ppSt_MSGBuffer;
+	AVFilter_Audio_Cvt(xhFilter, pSt_MSGBuffer, &ppSt_MSGBuffer, &nListCount);
+	for (int i = 0; i < nListCount; i++)
 	{
+		AudioCodec_Help_FifoSend(xhAudioFifo, ppSt_MSGBuffer[i]);
 		while (true)
 		{
-			XBYTE tszAVBuffer[8192] = {};
-			if (!AudioCodec_Help_FifoRecv(xhAudioFifo, tszAVBuffer, &nAVLen))
+			AVCODEC_AUDIO_MSGBUFFER st_MSGBuffer = {};
+			if (!AudioCodec_Help_FifoRecv(xhAudioFifo, &st_MSGBuffer))
 			{
 				break;
 			}
+			int nAudioCount = 0;
+			AVCODEC_AUDIO_MSGBUFFER** ppSt_AudioBuffer;
+			AudioCodec_Stream_EnCodec(xhAudio, &st_MSGBuffer, &ppSt_AudioBuffer, &nAudioCount);
+			for (int j = 0; j < nAudioCount; j++)
+			{
+				AVFormat_Packet_StreamWrite(xhPacket, 1, ppSt_AudioBuffer[j]->ptszMSGBuffer[0], ppSt_AudioBuffer[j]->nMSGLen[0], &ppSt_AudioBuffer[j]->st_TimeStamp);
+			}
+			AudioCodec_Stream_Free(&ppSt_AudioBuffer, nAudioCount);
+			AudioCodec_Stream_FreeBuffer(&st_MSGBuffer);
 		}
 	}
+	AudioCodec_Stream_Free(&ppSt_MSGBuffer, nListCount);
+	AudioCodec_Stream_FreeBuffer(pSt_MSGBuffer);
 }
 
 bool HTTPTask_TaskPost_BackService(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, int nType)
@@ -367,11 +384,32 @@ 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
+			AVCollect_Audio_GetInfo(xhSound, &st_AVInfo);
+			AVFILTER_AUDIO_INFO st_AudioFilter = {};
+			st_AudioFilter.nIndex = 0;
+			st_AudioFilter.st_AudioInfo = st_AVInfo.st_AudioInfo;
+			AVCollect_Audio_GetTimeBase(xhSound, &st_AudioFilter.st_AudioTime);
+			if (!AVFilter_Audio_Init(&xhFilter, _X("aresample=44100,aformat=sample_fmts=fltp:channel_layouts=stereo"), &st_AudioFilter))
+			{
+				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, AVFilter_GetLastError());
+				return false;
+			}
+			st_AVInfo.st_AudioInfo.nSampleRate = 44100;
+			st_AVInfo.st_AudioInfo.nSampleFmt = ENUM_AVCODEC_AUDIO_SAMPLEFMT_FLTP;
+			st_AVInfo.st_AudioInfo.enAVCodec = ENUM_XENGINE_AVCODEC_AUDIO_TYPE_AAC;
+			xhAudio = AudioCodec_Stream_EnInit(&st_AVInfo.st_AudioInfo);
+			if (NULL == xhAudio)
+			{
+				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, AudioCodec_GetLastError());
+				return false;
+			}
 			xhAudioFifo = AudioCodec_Help_FifoInit(ENUM_AVCODEC_AUDIO_SAMPLEFMT_FLTP, 2);
-#endif
 			if (NULL == xhAudioFifo)
 			{
 				st_HDRParam.nHttpCode = 400;
@@ -381,8 +419,13 @@ bool HTTPTask_TaskPost_BackService(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer
 				return false;
 			}
 			XHANDLE xhAudioCodec = NULL;
-			AVCollect_Audio_GetAVCodec(xhSound, &xhAudioCodec);
+			AudioCodec_Stream_GetAVCodec(xhAudio, &xhAudioCodec);
 			AVFormat_Packet_StreamCreate(xhPacket, xhAudioCodec);
+			//使用了滤镜,需要单独设置
+			AVCODEC_TIMEBASE st_TimeBase = {};
+			st_TimeBase.nDen = 44100;
+			st_TimeBase.nNum = 1;
+			AVFormat_Packet_TimeBase(xhPacket, 1, &st_TimeBase);
 			BaseLib_Memory_FreeCStyle((XPPMEM)&xhAudioCodec);
 		}
 		bRecord = true;
@@ -396,21 +439,24 @@ bool HTTPTask_TaskPost_BackService(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer
 	break;
 	case XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_BS_RECORDSTOP:
 	{
-		if (bRecord)
-		{
-			AVCollect_Video_Destory(xhScreen);
-			AVCollect_Audio_Destory(xhSound);
+		bRecord = false;
 
-			VideoCodec_Stream_Destroy(xhVideo);
-			AudioCodec_Help_FifoClose(xhAudioFifo);
+		AVCollect_Video_Destory(xhScreen);
+		AVCollect_Audio_Destory(xhSound);
 
-			AVFormat_Packet_Stop(xhPacket);
-			xhScreen = NULL;
-			xhSound = NULL;
-			xhVideo = NULL;
-			xhPacket = NULL;
-			bRecord = false;
-		}
+		VideoCodec_Stream_Destroy(xhVideo);
+		AudioCodec_Stream_Destroy(xhAudio);
+		AudioCodec_Help_FifoClose(xhAudioFifo);
+
+		AVFilter_Audio_Destroy(xhFilter);
+
+		AVFormat_Packet_Stop(xhPacket);
+		xhScreen = NULL;
+		xhSound = NULL;
+		xhVideo = NULL;
+		xhAudio = NULL;
+		xhPacket = NULL;
+		
 		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,停止屏幕录制推流请求成功"), lpszClientAddr);

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_TaskPost/TaskPost_BackService.h

@@ -1,5 +1,5 @@
 #pragma once
 void XCALLBACK HTTPTask_TaskPost_CBVideo(uint8_t* ptszAVBuffer, int nAVLen, AVCODEC_TIMESTAMP* pSt_TimeInfo, XPVOID lParam);
-void XCALLBACK HTTPTask_TaskPost_CBAudio(uint8_t* ptszAVBuffer, int nAVLen, AVCODEC_TIMESTAMP* pSt_TimeInfo, XPVOID lParam);
+void XCALLBACK HTTPTask_TaskPost_CBAudio(AVCODEC_AUDIO_MSGBUFFER* pSt_MSGBuffer, XPVOID lParam);
 
 bool HTTPTask_TaskPost_BackService(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, int nType);