Skip to content

Commit fe3e6b1

Browse files
xengine-qytxengine-qyt
committed
fixed:build failure
1 parent 60808df commit fe3e6b1

File tree

10 files changed

+114
-26
lines changed

10 files changed

+114
-26
lines changed

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
build=$(echo $latest_tag | cut -d '.' -f 4)
8686
8787
new_minor=$((minor + 1))
88-
new_version="$major.$new_minor.0.$build"
88+
new_version="$major.$new_minor.$patch.$build"
8989
echo "New version: $new_version"
9090
echo "new_tag=$new_version" >> $GITHUB_OUTPUT
9191
echo "prev_tag=$latest_tag" >> $GITHUB_OUTPUT

‎XEngine_Source/XEngine_ModuleSession/ModuleSession_Define.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ extern "C" bool ModuleSession_PushStream_HLSTimeGet(LPCXSTR lpszClientAddr, __in
818818
意思：是否成功
819819
备注：
820820
*********************************************************************/
821-
extern "C" bool ModuleSession_PushStream_AudioCodecSet(LPCXSTR lpszClientAddr, XNETHANDLE xhAudioDecodec, XNETHANDLE xhAudioEncodec);
821+
extern "C" bool ModuleSession_PushStream_AudioCodecSet(LPCXSTR lpszClientAddr, XHANDLE xhAudioDecodec, XHANDLE xhAudioEncodec);
822822
/********************************************************************
823823
函数名称：ModuleSession_PushStream_AudioCodecGet
824824
函数功能：获取解码器句柄
@@ -842,7 +842,7 @@ extern "C" bool ModuleSession_PushStream_AudioCodecSet(LPCXSTR lpszClientAddr, X
842842
意思：是否成功
843843
备注：
844844
*********************************************************************/
845-
extern "C" bool ModuleSession_PushStream_AudioCodecGet(LPCXSTR lpszClientAddr, XNETHANDLE* pxhAudioDecodec, XNETHANDLE* pxhAudioEncodec);
845+
extern "C" bool ModuleSession_PushStream_AudioCodecGet(LPCXSTR lpszClientAddr, XHANDLE* pxhAudioDecodec, XHANDLE* pxhAudioEncodec);
846846
/********************************************************************
847847
函数名称：ModuleSession_PushStream_RTCConnSet
848848
函数功能：设置RTC连接状态

‎XEngine_Source/XEngine_ModuleSession/ModuleSession_PushStream/ModuleSession_PushStream.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ bool CModuleSession_PushStream::ModuleSession_PushStream_HLSTimeGet(LPCXSTR lpsz
817817
意思：是否成功
818818
备注：
819819
*********************************************************************/
820-
bool CModuleSession_PushStream::ModuleSession_PushStream_AudioCodecSet(LPCXSTR lpszClientAddr, XNETHANDLE xhAudioDecodec, XNETHANDLE xhAudioEncodec)
820+
bool CModuleSession_PushStream::ModuleSession_PushStream_AudioCodecSet(LPCXSTR lpszClientAddr, XHANDLE xhAudioDecodec, XHANDLE xhAudioEncodec)
821821
{
822822
Session_IsErrorOccur = false;
823823

@@ -866,7 +866,7 @@ bool CModuleSession_PushStream::ModuleSession_PushStream_AudioCodecSet(LPCXSTR l
866866
意思：是否成功
867867
备注：
868868
*********************************************************************/
869-
bool CModuleSession_PushStream::ModuleSession_PushStream_AudioCodecGet(LPCXSTR lpszClientAddr, XNETHANDLE* pxhAudioDecodec, XNETHANDLE* pxhAudioEncodec)
869+
bool CModuleSession_PushStream::ModuleSession_PushStream_AudioCodecGet(LPCXSTR lpszClientAddr, XHANDLE* pxhAudioDecodec, XHANDLE* pxhAudioEncodec)
870870
{
871871
Session_IsErrorOccur = false;
872872

‎XEngine_Source/XEngine_ModuleSession/ModuleSession_PushStream/ModuleSession_PushStream.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ typedef struct
2929
}st_RTCInfo;
3030
struct
3131
{
32-
XNETHANDLE xhAudioDecodec;
33-
XNETHANDLE xhAudioEncodec;
32+
XHANDLE xhAudioDecodec;
33+
XHANDLE xhAudioEncodec;
3434
}st_AVCodec;
3535
XENGINE_PROTOCOL_AVINFO st_AVInfo;
3636
XCHAR tszSMSAddr[XPATH_MAX];
@@ -65,8 +65,8 @@ class CModuleSession_PushStream
6565
bool ModuleSession_PushStream_HLSTimeSet(LPCXSTR lpszClientAddr, __int64u nTime);
6666
bool ModuleSession_PushStream_HLSTimeGet(LPCXSTR lpszClientAddr, __int64u *pInt_Time);
6767
public:
68-
bool ModuleSession_PushStream_AudioCodecSet(LPCXSTR lpszClientAddr, XNETHANDLE xhAudioDecodec, XNETHANDLE xhAudioEncodec);
69-
bool ModuleSession_PushStream_AudioCodecGet(LPCXSTR lpszClientAddr, XNETHANDLE* pxhAudioDecodec, XNETHANDLE* pxhAudioEncodec);
68+
bool ModuleSession_PushStream_AudioCodecSet(LPCXSTR lpszClientAddr, XHANDLE xhAudioDecodec, XHANDLE xhAudioEncodec);
69+
bool ModuleSession_PushStream_AudioCodecGet(LPCXSTR lpszClientAddr, XHANDLE* pxhAudioDecodec, XHANDLE* pxhAudioEncodec);
7070
public:
7171
bool ModuleSession_PushStream_RTCAddrSet(LPCXSTR lpszClientUser, LPCXSTR lpszClientAddr);
7272
bool ModuleSession_PushStream_RTCAddrGet(LPCXSTR lpszClientAddr, XCHAR* ptszClientUser);

‎XEngine_Source/XEngine_ModuleSession/pch.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,11 @@ extern "C" bool ModuleSession_PushStream_HLSTimeGet(LPCXSTR lpszClientAddr, __in
176176
{
177177
return m_PushStream.ModuleSession_PushStream_HLSTimeGet(lpszClientAddr, pInt_Time);
178178
}
179-
extern "C" bool ModuleSession_PushStream_AudioCodecSet(LPCXSTR lpszClientAddr, XNETHANDLE xhAudioDecodec, XNETHANDLE xhAudioEncodec)
179+
extern "C" bool ModuleSession_PushStream_AudioCodecSet(LPCXSTR lpszClientAddr, XHANDLE xhAudioDecodec, XHANDLE xhAudioEncodec)
180180
{
181181
return m_PushStream.ModuleSession_PushStream_AudioCodecSet(lpszClientAddr, xhAudioDecodec, xhAudioEncodec);
182182
}
183-
extern "C" bool ModuleSession_PushStream_AudioCodecGet(LPCXSTR lpszClientAddr, XNETHANDLE* pxhAudioDecodec, XNETHANDLE* pxhAudioEncodec)
183+
extern "C" bool ModuleSession_PushStream_AudioCodecGet(LPCXSTR lpszClientAddr, XHANDLE* pxhAudioDecodec, XHANDLE* pxhAudioEncodec)
184184
{
185185
return m_PushStream.ModuleSession_PushStream_AudioCodecGet(lpszClientAddr, pxhAudioDecodec, pxhAudioEncodec);
186186
}

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PushStream/PushStream_ClientWebRtc.cpp‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@ bool PushStream_ClientProtocol_Thread()
182182
{
183183
int nVideoIndex = 0;
184184
int nAudioIndex = 0;
185+
int nRVLen = 0;
186+
int nSDLen = 0;
187+
XCHAR* ptszRVBuffer = (XCHAR*)ManagePool_Memory_Alloc(xhMemoryPool, XENGINE_MEMORY_SIZE_MAX);
188+
XCHAR* ptszSDBuffer = (XCHAR*)ManagePool_Memory_Alloc(xhMemoryPool, XENGINE_MEMORY_SIZE_MAX);
189+
185190
ModuleSession_PushStream_RTCIndexGet(ppSt_ListAddr[i]->tszClientAddr, &nVideoIndex, &nAudioIndex);
186191
while (true)
187192
{
@@ -193,6 +198,28 @@ bool PushStream_ClientProtocol_Thread()
193198
{
194199
break;
195200
}
201+
202+
int nPos = 0;
203+
int nNALLen = 0;
204+
int nFIXLen = 0;
205+
XENGINE_AVCODEC_VIDEOFRAMETYPE enFrameType;
206+
207+
AVHelp_Parse_NaluHdr(ptszMSGBuffer, nMSGLen, &nNALLen, &nFIXLen);
208+
AVHelp_Parse_NaluType(ptszMSGBuffer + nPos, ENUM_XENGINE_AVCODEC_VIDEO_TYPE_H264, &enFrameType);
209+
//如果是AUD单元,跳过AUD
210+
if (ENUM_XENGINE_AVCODEC_VIDEO_FRAMETYPE_AUD == enFrameType)
211+
{
212+
nPos = nNALLen;
213+
//重新获取
214+
AVHelp_Parse_NaluType(ptszMSGBuffer + nPos, ENUM_XENGINE_AVCODEC_VIDEO_TYPE_H264, &enFrameType);
215+
}
216+
//如果是关键帧
217+
if (ENUM_XENGINE_AVCODEC_VIDEO_FRAMETYPE_SPS == enFrameType || ENUM_XENGINE_AVCODEC_VIDEO_FRAMETYPE_PPS == enFrameType || ENUM_XENGINE_AVCODEC_VIDEO_FRAMETYPE_SEI == enFrameType)
218+
{
219+
XEngine_AVPacket_AVHdr(ppSt_ListAddr[i]->tszClientAddr, ptszMSGBuffer + nPos, nMSGLen - nPos, 0, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PUSH_SRT);
220+
}
221+
XEngine_AVPacket_AVFrame(ptszSDBuffer, &nSDLen, ptszRVBuffer, &nRVLen, ppSt_ListAddr[i]->tszClientAddr, ptszMSGBuffer + nPos, nMSGLen - nPos, 0);
222+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("SRT推流端：%s,接受视频推流数据,数据大小:%d,帧类型:%d,跳过AUD:%d"), ppSt_ListAddr[i]->tszClientAddr, nMSGLen, enFrameType, nPos);
196223
//fwrite(ptszMSGBuffer, 1, nMSGLen, pSt_VFile);
197224
BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMSGBuffer);
198225
}
@@ -206,7 +233,11 @@ bool PushStream_ClientProtocol_Thread()
206233
{
207234
break;
208235
}
209-
//fwrite(ptszMSGBuffer, 1, nRVLen, pSt_AFile);
236+
//OPUS
237+
//XEngine_AVPacket_AVHdr(ppSt_ListAddr[i]->tszClientAddr, ptszMSGBuffer, nMSGLen, 1, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PUSH_SRT);
238+
//XEngine_AVPacket_AVFrame(ptszSDBuffer, &nSDLen, ptszRVBuffer, &nRVLen, ppSt_ListAddr[i]->tszClientAddr, ptszMSGBuffer + 7, nMSGLen - 7, 1);
239+
//XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("SRT推流端：%s,接受音频推流数据,数据大小:%d"), ppSt_ListAddr[i]->tszClientAddr, nMSGLen);
240+
fwrite(ptszMSGBuffer, 1, nRVLen, pSt_AFile);
210241
BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMSGBuffer);
211242
}
212243
}
@@ -412,9 +443,11 @@ bool PushStream_ClientWhip_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LP
412443
SDPProtocol_Packet_GetPacket(xhPacket, tszRVBuffer, &nRVLen);
413444
SDPProtocol_Packet_Destory(xhPacket);
414445

415-
ModuleSession_PushStream_Create(tszUserStr, tszSMSAddr, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PULL_RTC);
446+
ModuleSession_PushStream_Create(tszUserStr, tszSMSAddr, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PUSH_RTC);
416447
ModuleSession_PushStream_RTCIndexSet(tszUserStr, nVideoIndex, nAudioIndex);
417448
ModuleSession_PushStream_SetAVInfo(tszUserStr, &st_AVInfo);
449+
450+
XEngine_AVPacket_AVCreate(tszUserStr);
418451
SocketOpt_HeartBeat_InsertAddrEx(xhRTCWhipHeart, tszUserStr); //需要加入心跳,不然没法知道超时
419452

420453
st_HDRParam.nHttpCode = 201;

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_AVPacket.cpp‎

Lines changed: 64 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ bool XEngine_AVPacket_AVCreate(LPCXSTR lpszClientAddr)
2323
if (st_ServiceConfig.st_XPull.st_PullHls.bEnable || st_ServiceConfig.st_XPull.st_PullSrt.bEnable || st_ServiceConfig.st_XPull.st_PullTs.bEnable)
2424
{
2525
HLSProtocol_TSPacket_Insert(lpszClientAddr, 100);
26-
2726
if (st_ServiceConfig.st_XPull.st_PullHls.bEnable)
2827
{
2928
XCHAR tszSMSAddr[XPATH_MAX] = {};
@@ -314,19 +313,75 @@ bool XEngine_AVPacket_AVHdr(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int n
314313
}
315314
}
316315
}
316+
else if (ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PUSH_RTC == enClientType)
317+
{
318+
//SRT推流
319+
ModuleSession_PushStream_GetAVInfo(lpszClientAddr, &st_AVInfo);
320+
if (0 == byAVType)
321+
{
322+
int nPos = 0;
323+
int nSPSLen = 0;
324+
int nPPSLen = 0;
325+
XBYTE uszSPSBuffer[1024];
326+
XBYTE uszPPSBuffer[1024];
327+
328+
memset(uszSPSBuffer, '\0', sizeof(uszSPSBuffer));
329+
memset(uszPPSBuffer, '\0', sizeof(uszPPSBuffer));
330+
if (!AVHelp_Parse_VideoHdr(lpszMsgBuffer, nMsgLen, ENUM_XENGINE_AVCODEC_VIDEO_TYPE_H264, NULL, uszSPSBuffer, uszPPSBuffer, NULL, NULL, &nSPSLen, &nPPSLen, NULL, &nPos))
331+
{
332+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("SRT推流端:%s,解析SPS,PPS,VPS失败,错误:%lX"), lpszClientAddr, AVHelp_GetLastError());
333+
return false;
334+
}
335+
AFHELP_FRAMESPS st_SPSFrame;
336+
memset(&st_SPSFrame, '\0', sizeof(AFHELP_FRAMESPS));
337+
338+
AVHelp_Parse_SPSInfo((LPCXSTR)uszSPSBuffer + 1, nSPSLen - 1, &st_SPSFrame);
339+
_tcsxcpy(st_AVInfo.tszPktName, "Lavf59.27.100");
340+
st_AVInfo.st_VideoInfo.bEnable = true;
341+
st_AVInfo.st_VideoInfo.enAVCodec = 7;
342+
st_AVInfo.st_VideoInfo.nWidth = st_SPSFrame.nFrameWidth;
343+
st_AVInfo.st_VideoInfo.nHeight = st_SPSFrame.nFrameHeigth;
344+
st_AVInfo.st_VideoInfo.nFrameRate = st_SPSFrame.nFrameFPS;
345+
st_AVInfo.st_VideoInfo.nVLen = nPos;
346+
memset(st_AVInfo.st_VideoInfo.tszVInfo, '\0', sizeof(st_AVInfo.st_VideoInfo.tszVInfo));
347+
memcpy(st_AVInfo.st_VideoInfo.tszVInfo, lpszMsgBuffer, nPos);
348+
XEngine_AVPacket_AVSetTime(lpszClientAddr, st_AVInfo.st_VideoInfo.nFrameRate, st_AVInfo.st_AudioInfo.nSampleRate);
349+
ModuleSession_PushStream_SetAVInfo(lpszClientAddr, &st_AVInfo);
350+
}
351+
else
352+
{
353+
//音频参数信息是否存在
354+
if (0 == st_AVInfo.st_AudioInfo.nALen)
355+
{
356+
int nProfile = 0;
357+
int nConfig = 0;
358+
if (AVHelp_Parse_AACInfo((const XBYTE*)lpszMsgBuffer, nMsgLen, &st_AVInfo.st_AudioInfo.nChannel, &st_AVInfo.st_AudioInfo.nSampleRate, &nProfile, &nConfig))
359+
{
360+
st_AVInfo.st_AudioInfo.bEnable = true;
361+
st_AVInfo.st_AudioInfo.nALen = 7;
362+
st_AVInfo.st_AudioInfo.enAVCodec = 10;
363+
st_AVInfo.st_AudioInfo.nSampleFmt = 16;
364+
st_AVInfo.st_AudioInfo.nChannel = 1;
365+
XEngine_AVPacket_AVSetTime(lpszClientAddr, st_AVInfo.st_VideoInfo.nFrameRate, st_AVInfo.st_AudioInfo.nSampleRate);
366+
AVHelp_Packet_AACHdr((XBYTE*)st_AVInfo.st_AudioInfo.tszAInfo, st_AVInfo.st_AudioInfo.nSampleRate, st_AVInfo.st_AudioInfo.nChannel, 0);
367+
ModuleSession_PushStream_SetAVInfo(lpszClientAddr, &st_AVInfo);
368+
}
369+
}
370+
}
371+
}
317372

318373
if (st_ServiceConfig.st_XPull.st_PullWebRtc.bEnable && 0 != byAVType)
319374
{
320-
XNETHANDLE xhDecodec = 0;
321-
XNETHANDLE xhEncodec = 0;
322-
if (!AudioCodec_Stream_DeInit(&xhDecodec, ENUM_XENGINE_AVCODEC_AUDIO_TYPE_AAC))
375+
XHANDLE xhDecodec = AudioCodec_Stream_DeInit(ENUM_XENGINE_AVCODEC_AUDIO_TYPE_AAC);
376+
if (NULL == xhDecodec)
323377
{
324378
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("推流端:%s,初始化音频解码器失败,错误:%lX"), lpszClientAddr, AudioCodec_GetLastError());
325379
return false;
326380
}
327381

328382
st_AVInfo.st_AudioInfo.enAVCodec = ENUM_XENGINE_AVCODEC_AUDIO_TYPE_AAC;
329-
if (!AudioCodec_Stream_EnInit(&xhEncodec, &st_AVInfo.st_AudioInfo))
383+
XHANDLE xhEncodec = AudioCodec_Stream_EnInit(&st_AVInfo.st_AudioInfo);
384+
if (NULL == xhEncodec)
330385
{
331386
AudioCodec_Stream_Destroy(xhDecodec);
332387
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("推流端:%s,初始化音频编码器失败,错误:%lX"), lpszClientAddr, AudioCodec_GetLastError());
@@ -573,7 +628,7 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR
573628
//发送数据,RTSP使用UDP发送
574629
for (int i = 0; i < nPacketCount; i++)
575630
{
576-
NetCore_UDPXCore_SendEx(xhVRTPSocket, tszADDRStr, ppSt_RTPPacket[i]->unData.tszMSGBuffer, ppSt_RTPPacket[i]->nMSGLen);
631+
NetCore_UDPXCore_SendEx(xhVRTPSocket, tszADDRStr, (LPCXSTR)ppSt_RTPPacket[i]->unData.tszMSGBuffer, ppSt_RTPPacket[i]->nMSGLen[0]);
577632
}
578633
}
579634
else
@@ -584,7 +639,7 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR
584639
//发送数据,RTSP使用UDP发送
585640
for (int i = 0; i < nPacketCount; i++)
586641
{
587-
NetCore_UDPXCore_SendEx(xhARTPSocket, tszADDRStr, ppSt_RTPPacket[i]->unData.tszMSGBuffer, ppSt_RTPPacket[i]->nMSGLen);
642+
NetCore_UDPXCore_SendEx(xhARTPSocket, tszADDRStr, (LPCXSTR)ppSt_RTPPacket[i]->unData.tszMSGBuffer, ppSt_RTPPacket[i]->nMSGLen[0]);
588643
}
589644
}
590645
BaseLib_Memory_Free((XPPPMEM)&ppSt_RTPPacket, nPacketCount);
@@ -611,8 +666,8 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR
611666
//发送数据,RTSP使用UDP发送
612667
for (int i = 0; i < nPacketCount; i++)
613668
{
614-
ModuleHelp_SRTPCore_RTPINProtect(ppSt_RTPPacket[i]->unData.tszMSGBuffer, &ppSt_RTPPacket[i]->nMSGLen);
615-
XEngine_Network_Send(stl_ListIteratorClient->tszClientID, ppSt_RTPPacket[i]->unData.tszMSGBuffer, ppSt_RTPPacket[i]->nMSGLen, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PUSH_RTC);
669+
ModuleHelp_SRTPCore_RTPINProtect((XCHAR *)ppSt_RTPPacket[i]->unData.tszMSGBuffer, &ppSt_RTPPacket[i]->nMSGLen[0]);
670+
XEngine_Network_Send(stl_ListIteratorClient->tszClientID, (LPCXSTR)ppSt_RTPPacket[i]->unData.tszMSGBuffer, ppSt_RTPPacket[i]->nMSGLen[0], ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PUSH_RTC);
616671
}
617672
}
618673
else

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_Hdr.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ using namespace std;
5959
#include <XEngine_Include/XEngine_StreamMedia/RTPProtocol_Error.h>
6060
#include <XEngine_Include/XEngine_StreamMedia/RTCPProtocol_Define.h>
6161
#include <XEngine_Include/XEngine_StreamMedia/RTCPProtocol_Error.h>
62-
#include <XEngine_Include/XEngine_AVCodec/AVCollect_Define.h>
6362
#include <XEngine_Include/XEngine_AVCodec/VideoCodec_Define.h>
6463
#include <XEngine_Include/XEngine_AVCodec/AudioCodec_Define.h>
64+
#include <XEngine_Include/XEngine_AVCodec/AVCollect_Define.h>
6565
#include <XEngine_Include/XEngine_AVCodec/AVHelp_Define.h>
6666
#include <XEngine_Include/XEngine_AVCodec/AVHelp_Error.h>
6767
#include <XEngine_Include/XEngine_SystemSdk/SystemApi_Define.h>

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_Network.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ void XEngine_Network_Close(LPCXSTR lpszClientAddr, XSOCKET hSocket, bool bHeart,
271271
{
272272
HLSProtocol_M3u8Packet_Delete(xhHLSFile, xhHLSToken, st_ServiceConfig.st_XPull.st_PullHls.bClear);
273273
}
274-
XNETHANDLE xhDecodec = 0;
275-
XNETHANDLE xhEncodec = 0;
274+
XHANDLE xhDecodec = 0;
275+
XHANDLE xhEncodec = 0;
276276
if (ModuleSession_PushStream_AudioCodecGet(lpszClientAddr, &xhDecodec, &xhEncodec))
277277
{
278278
AudioCodec_Stream_Destroy(xhDecodec);

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_StreamMediaApp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ int main(int argc, char** argv)
217217
memset(&st_ServiceConfig, '\0', sizeof(XENGINE_SERVICECONFIG));
218218

219219
//pSt_VFile = _xtfopen("./1.h264", "wb");
220-
//pSt_AFile = _xtfopen("./1.opus", "wb");
220+
pSt_AFile = _xtfopen("./1.opus", "wb");
221221
//初始化参数
222222
if (!XEngine_Configure_Parament(argc, argv))
223223
{

0 commit comments

Comments
 (0)