Skip to content

Commit 6572662

Browse files
xengine-qytxengine-qyt
committed
update:depend library
update:match xengine v9.20
1 parent 72577a9 commit 6572662

27 files changed

+152
-152
lines changed

‎XEngine_Source/XEngine_Depend‎

Submodule XEngine_Depend updated 52 files

‎XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//////////////////////////////////////////////////////////////////////////
1616
typedef struct tag_XEngine_ServiceConfig
1717
{
18-
XCHAR tszSMSUrl[MAX_PATH]; //流媒体服务器地址
18+
XCHAR tszSMSUrl[XPATH_MAX]; //流媒体服务器地址
1919
XCHAR tszIPAddr[128]; //本机IP地址,根据需要配置
2020
bool bDeamon; //是否以守护进程启动,LINUX有效
2121
bool bDebug; //是否使用DEBUG
@@ -47,7 +47,7 @@ typedef struct tag_XEngine_ServiceConfig
4747
}st_XTime; //次数*时间=超时
4848
struct
4949
{
50-
XCHAR tszLogFile[MAX_PATH];
50+
XCHAR tszLogFile[XPATH_MAX];
5151
int nMaxSize; //最大日志大小
5252
int nMaxCount; //最大日志个数
5353
int nLogLeave; //日志等级
@@ -73,7 +73,7 @@ typedef struct tag_XEngine_ServiceConfig
7373
}st_PullFlv;
7474
struct
7575
{
76-
XCHAR tszHLSPath[MAX_PATH];
76+
XCHAR tszHLSPath[XPATH_MAX];
7777
int nTime;
7878
bool bEnable;
7979
bool bPrePull;
@@ -100,18 +100,18 @@ typedef struct tag_XEngine_ServiceConfig
100100
}st_PullRtsp;
101101
struct
102102
{
103-
XCHAR tszICEUser[MAX_PATH];
104-
XCHAR tszICEPass[MAX_PATH];
105-
XCHAR tszCertStr[MAX_PATH];
106-
XCHAR tszKeyStr[MAX_PATH];
107-
XCHAR tszDerStr[MAX_PATH];
103+
XCHAR tszICEUser[XPATH_MAX];
104+
XCHAR tszICEPass[XPATH_MAX];
105+
XCHAR tszCertStr[XPATH_MAX];
106+
XCHAR tszKeyStr[XPATH_MAX];
107+
XCHAR tszDerStr[XPATH_MAX];
108108
bool bEnable;
109109
bool bPrePull;
110110
}st_PullWebRtc;
111111
}st_XPull;
112112
struct
113113
{
114-
XCHAR tszAPIUrl[MAX_PATH];
114+
XCHAR tszAPIUrl[XPATH_MAX];
115115
XCHAR tszServiceName[128];
116116
bool bEnable;
117117
}st_XReport;

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Rtmp/ModuleHelp_Rtmp.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
typedef struct
1515
{
16-
XCHAR tszLiveName[MAX_PATH];
17-
XCHAR tszURLStr[MAX_PATH];
16+
XCHAR tszLiveName[XPATH_MAX];
17+
XCHAR tszURLStr[XPATH_MAX];
1818
}RTMPPROTOCOL_CLIENTINFO;
1919

2020
class CModuleHelp_Rtmp

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Srt/ModuleHelp_SrtCore.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,9 @@ bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_GetStreamID(XSOCKET hSocket, XCHAR*
288288
return false;
289289
}
290290
//#!::h=live/livestream,m=publish
291-
XCHAR tszTmpStr[MAX_PATH];
292-
XCHAR tszSMSAddr[MAX_PATH];
293-
XCHAR tszSMSMode[MAX_PATH];
291+
XCHAR tszTmpStr[XPATH_MAX];
292+
XCHAR tszSMSAddr[XPATH_MAX];
293+
XCHAR tszSMSMode[XPATH_MAX];
294294

295295
memset(tszSMSAddr, '\0', sizeof(tszSMSAddr));
296296
memset(tszSMSMode, '\0', sizeof(tszSMSMode));
@@ -488,7 +488,7 @@ bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Leave(XSOCKET hSocket)
488488
//////////////////////////////////////////////////////////////////////////
489489
// 线程函数
490490
//////////////////////////////////////////////////////////////////////////
491-
XHTHREAD CALLBACK CModuleHelp_SrtCore::ModuleHelp_SrtCore_Thread(XPVOID lParam)
491+
XHTHREAD XCALLBACK CModuleHelp_SrtCore::ModuleHelp_SrtCore_Thread(XPVOID lParam)
492492
{
493493
#if 1 == _XENGINE_STREAMMEDIA_BUILDSWITCH_SRT
494494
CModuleHelp_SrtCore* pClass_This = (CModuleHelp_SrtCore*)lParam;

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Srt/ModuleHelp_SrtCore.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
typedef struct
1414
{
1515
XCHAR tszStreamBuffer[512];
16-
XCHAR tszClientAddr[MAX_PATH];
16+
XCHAR tszClientAddr[XPATH_MAX];
1717

1818
int nIDLen;
1919
XSOCKET hSocket;
@@ -38,7 +38,7 @@ class CModuleHelp_SrtCore
3838
bool ModuleHelp_SrtCore_Recv(XSOCKET hSocket);
3939
bool ModuleHelp_SrtCore_Leave(XSOCKET hSocket);
4040
protected:
41-
static XHTHREAD CALLBACK ModuleHelp_SrtCore_Thread(XPVOID lParam);
41+
static XHTHREAD XCALLBACK ModuleHelp_SrtCore_Thread(XPVOID lParam);
4242
private:
4343
bool bRun = false;
4444
int hSRTEPoll = 0;

‎XEngine_Source/XEngine_ModuleSession/ModuleSession_Define.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,32 @@ typedef struct
1818
typedef struct
1919
{
2020
XENGINE_PROTOCOL_AVINFO st_AVInfo;
21-
XCHAR tszSMSAddr[MAX_PATH];
21+
XCHAR tszSMSAddr[XPATH_MAX];
2222
ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE enStreamType;
2323
int nClientCount;
2424
}STREAMMEDIA_PUBLISHINFO;
2525
typedef struct
2626
{
2727
struct
2828
{
29-
XCHAR tszTokenStr[MAX_PATH];
30-
XCHAR tszICEUser[MAX_PATH];
31-
XCHAR tszICEPass[MAX_PATH];
32-
XCHAR tszHMacStr[MAX_PATH];
29+
XCHAR tszTokenStr[XPATH_MAX];
30+
XCHAR tszICEUser[XPATH_MAX];
31+
XCHAR tszICEPass[XPATH_MAX];
32+
XCHAR tszHMacStr[XPATH_MAX];
3333
XCHAR tszClientAddr[128];
3434
bool bConnect;
3535

3636
XCHAR tszVSSrcStr[128];
37-
XCHAR tszVideoCName[MAX_PATH];
38-
XCHAR tszVideoLabel[MAX_PATH];
37+
XCHAR tszVideoCName[XPATH_MAX];
38+
XCHAR tszVideoLabel[XPATH_MAX];
3939

4040
XCHAR tszASSrcStr[128];
41-
XCHAR tszAudioCName[MAX_PATH];
42-
XCHAR tszAudioLabel[MAX_PATH];
41+
XCHAR tszAudioCName[XPATH_MAX];
42+
XCHAR tszAudioLabel[XPATH_MAX];
4343
}st_WEBRtc;
44-
XCHAR tszClientAddr[MAX_PATH];
45-
XCHAR tszSMSAddr[MAX_PATH];
46-
XCHAR tszPushAddr[MAX_PATH];
44+
XCHAR tszClientAddr[XPATH_MAX];
45+
XCHAR tszSMSAddr[XPATH_MAX];
46+
XCHAR tszPushAddr[XPATH_MAX];
4747
int nFLVTag;
4848

4949
ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE enStreamType;

‎XEngine_Source/XEngine_ModuleSession/ModuleSession_PushStream/ModuleSession_PushStream.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,8 +547,8 @@ bool CModuleSession_PushStream::ModuleSession_PushStream_HLSInsert(LPCXSTR lpszC
547547
st_Locker.unlock_shared();
548548
return false;
549549
}
550-
XCHAR tszFilePath[MAX_PATH] = {};
551-
XCHAR tszFileName[MAX_PATH] = {};
550+
XCHAR tszFilePath[XPATH_MAX] = {};
551+
XCHAR tszFileName[XPATH_MAX] = {};
552552
//获得文件名和路径
553553
BaseLib_String_GetFileAndPath(lpszTSFile, tszFilePath, tszFileName);
554554
SystemApi_File_CreateMutilFolder(tszFilePath);
@@ -704,7 +704,7 @@ bool CModuleSession_PushStream::ModuleSession_PushStream_HLSClose(LPCXSTR lpszCl
704704
{
705705
fclose(stl_MapIterator->second->st_HLSFile.pSt_File);
706706
}
707-
memset(stl_MapIterator->second->st_HLSFile.tszFileName, '\0', MAX_PATH);
707+
memset(stl_MapIterator->second->st_HLSFile.tszFileName, '\0', XPATH_MAX);
708708
st_Locker.unlock_shared();
709709
return true;
710710
}

‎XEngine_Source/XEngine_ModuleSession/ModuleSession_PushStream/ModuleSession_PushStream.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ typedef struct
1414
{
1515
struct
1616
{
17-
XCHAR tszFileName[MAX_PATH];
17+
XCHAR tszFileName[XPATH_MAX];
1818
XNETHANDLE xhToken;
1919
__int64u nTime;
2020
FILE* pSt_File;
@@ -25,7 +25,7 @@ typedef struct
2525
XNETHANDLE xhAudioEncodec;
2626
}st_AVCodec;
2727
XENGINE_PROTOCOL_AVINFO st_AVInfo;
28-
XCHAR tszSMSAddr[MAX_PATH];
28+
XCHAR tszSMSAddr[XPATH_MAX];
2929
ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE enStreamType;
3030

3131
unique_ptr<mutex> st_ClientLocker;

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_HTTPApi/StreamMedia_HTTPApi.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ bool HTTPApi_Management_Task(LPCXSTR lpszClientAddr, XCHAR*** ppptszListHdr, int
1616
int nSDLen = 0;
1717
XCHAR tszRVBuffer[4096];
1818
XCHAR tszSDBuffer[4096];
19-
XCHAR tszKeyBuffer[MAX_PATH];
20-
XCHAR tszVluBuffer[MAX_PATH];
19+
XCHAR tszKeyBuffer[XPATH_MAX];
20+
XCHAR tszVluBuffer[XPATH_MAX];
2121
LPCXSTR lpszAPIPublish = _X("publish");
2222
LPCXSTR lpszAPIPull = _X("pull");
2323
LPCXSTR lpszAPIGet = _X("get");

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PullStream/PullStream_ClientGet.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ bool PullStream_ClientGet_Handle(LPCXSTR lpszClientAddr, XCHAR*** ppptszListHdr,
8282
int nSDLen = 0;
8383
XCHAR tszRVBuffer[4096];
8484
XCHAR tszSDBuffer[4096];
85-
XCHAR tszKeyBuffer[MAX_PATH];
86-
XCHAR tszVluBuffer[MAX_PATH];
85+
XCHAR tszKeyBuffer[XPATH_MAX];
86+
XCHAR tszVluBuffer[XPATH_MAX];
8787
LPCXSTR lpszStreamPlay = _X("play");
8888
LPCXSTR lpszStreamStop = _X("stop");
8989
RFCCOMPONENTS_HTTP_HDRPARAM st_HDRParam;
@@ -102,8 +102,8 @@ bool PullStream_ClientGet_Handle(LPCXSTR lpszClientAddr, XCHAR*** ppptszListHdr,
102102
if (0 == _tcsxnicmp(lpszStreamPlay, tszVluBuffer, _tcsxlen(lpszStreamPlay)))
103103
{
104104
//播放流:http://127.0.0.1:5600/api?stream=play&sms=live/qyt&type=flv
105-
XCHAR tszPushAddr[MAX_PATH];
106-
XCHAR tszSMSAddr[MAX_PATH];
105+
XCHAR tszPushAddr[XPATH_MAX];
106+
XCHAR tszSMSAddr[XPATH_MAX];
107107

108108
memset(tszPushAddr, '\0', sizeof(tszPushAddr));
109109
memset(tszSMSAddr, '\0', sizeof(tszSMSAddr));
@@ -241,8 +241,8 @@ bool PullStream_ClientGet_Handle(LPCXSTR lpszClientAddr, XCHAR*** ppptszListHdr,
241241
else if (0 == _tcsxnicmp(lpszStreamStop, tszVluBuffer, _tcsxlen(lpszStreamStop)))
242242
{
243243
//停止拉流,:http://127.0.0.1:5600/api?stream=stop
244-
XCHAR tszSMSAddr[MAX_PATH];
245-
XCHAR tszPushAddr[MAX_PATH];
244+
XCHAR tszSMSAddr[XPATH_MAX];
245+
XCHAR tszPushAddr[XPATH_MAX];
246246

247247
memset(tszSMSAddr, '\0', sizeof(tszSMSAddr));
248248
memset(tszPushAddr, '\0', sizeof(tszPushAddr));

0 commit comments

Comments
 (0)