Skip to content

Commit 712c1e4

Browse files
xengine-qytxengine-qyt
committed
update:xengine v9.14 supported
1 parent cbb20f7 commit 712c1e4

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

‎XEngine_Source/VSCopy_Debug.bat‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_XSocket.dll" "./"
1212
copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIHelp.dll" "./"
1313
copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIAddr.dll" "./"
1414
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_SystemApi.dll" "./"
15+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_SystemConfig.dll" "./"
1516

1617
copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_Packets.dll" "./"
1718
copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_XLog.dll" "./"
@@ -29,11 +30,11 @@ copy /y "D:\XEngine\XEngine_SourceCode\Debug\StreamMedia_HLSProtocol.dll" "./"
2930
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_AVHelp.dll" "./"
3031
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_AudioCodec.dll" "./"
3132

32-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avcodec-60.dll" "./"
33-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avdevice-60.dll" "./"
34-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avfilter-9.dll" "./"
35-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avformat-60.dll" "./"
36-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avutil-58.dll" "./"
37-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\postproc-57.dll" "./"
38-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swresample-4.dll" "./"
39-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swscale-7.dll" "./"
33+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avcodec-61.dll" "./"
34+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avdevice-61.dll" "./"
35+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avfilter-10.dll" "./"
36+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avformat-61.dll" "./"
37+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avutil-59.dll" "./"
38+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\postproc-58.dll" "./"
39+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swresample-5.dll" "./"
40+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swscale-8.dll" "./"

‎XEngine_Source/VSCopy_x64.bat‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
1212
copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
1313
copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIAddr.dll" "./"
1414
copy /y "%XEngine_Lib64%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
15+
copy /y "%XEngine_Lib64%\XEngine_SystemSdk\XEngine_SystemConfig.dll" "./"
1516

1617
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"
1718
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"
@@ -29,11 +30,11 @@ copy /y "%XEngine_Lib64%\XEngine_StreamMedia\StreamMedia_HLSProtocol.dll" "./"
2930
copy /y "%XEngine_Lib64%\XEngine_AVCodec\XEngine_AVHelp.dll" "./"
3031
copy /y "%XEngine_Lib64%\XEngine_AVCodec\XEngine_AudioCodec.dll" "./"
3132

32-
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avcodec-60.dll" "./"
33-
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avdevice-60.dll" "./"
34-
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avfilter-9.dll" "./"
35-
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avformat-60.dll" "./"
36-
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avutil-58.dll" "./"
37-
copy /y "%XEngine_Lib64%\XEngine_AVCodec\postproc-57.dll" "./"
38-
copy /y "%XEngine_Lib64%\XEngine_AVCodec\swresample-4.dll" "./"
39-
copy /y "%XEngine_Lib64%\XEngine_AVCodec\swscale-7.dll" "./"
33+
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avcodec-61.dll" "./"
34+
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avdevice-61.dll" "./"
35+
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avfilter-10.dll" "./"
36+
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avformat-61.dll" "./"
37+
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avutil-59.dll" "./"
38+
copy /y "%XEngine_Lib64%\XEngine_AVCodec\postproc-58.dll" "./"
39+
copy /y "%XEngine_Lib64%\XEngine_AVCodec\swresample-5.dll" "./"
40+
copy /y "%XEngine_Lib64%\XEngine_AVCodec\swscale-8.dll" "./"

‎XEngine_Source/VSCopy_x86.bat‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
1212
copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
1313
copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIAddr.dll" "./"
1414
copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
15+
copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemConfig.dll" "./"
1516

1617
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"
1718
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"
@@ -29,11 +30,11 @@ copy /y "%XEngine_Lib32%\XEngine_StreamMedia\StreamMedia_HLSProtocol.dll" "./"
2930
copy /y "%XEngine_Lib32%\XEngine_AVCodec\XEngine_AVHelp.dll" "./"
3031
copy /y "%XEngine_Lib32%\XEngine_AVCodec\XEngine_AudioCodec.dll" "./"
3132

32-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avcodec-60.dll" "./"
33-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avdevice-60.dll" "./"
34-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avfilter-9.dll" "./"
35-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avformat-60.dll" "./"
36-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avutil-58.dll" "./"
37-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\postproc-57.dll" "./"
38-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swresample-4.dll" "./"
39-
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swscale-7.dll" "./"
33+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avcodec-61.dll" "./"
34+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avdevice-61.dll" "./"
35+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avfilter-10.dll" "./"
36+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avformat-61.dll" "./"
37+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avutil-59.dll" "./"
38+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\postproc-58.dll" "./"
39+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swresample-5.dll" "./"
40+
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swscale-8.dll" "./"

‎XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_AVPacket.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,6 @@ bool XEngine_AVPacket_AVHdr(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int n
279279
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("推流端:%s,初始化音频解码器失败,错误:%lX"), lpszClientAddr, AudioCodec_GetLastError());
280280
return false;
281281
}
282-
int nTmp = 0;
283-
AudioCodec_Stream_SetResample(xhDecodec, &nTmp, st_AVInfo.st_AudioInfo.nSampleRate, st_AVInfo.st_AudioInfo.nSampleRate, ENUM_AVCODEC_AUDIO_SAMPLEFMT_FLTP, ENUM_AVCODEC_AUDIO_SAMPLEFMT_S16, st_AVInfo.st_AudioInfo.nChannel, st_AVInfo.st_AudioInfo.nChannel);
284282

285283
st_AVInfo.st_AudioInfo.enAVCodec = ENUM_XENGINE_AVCODEC_AUDIO_TYPE_AAC;
286284
if (!AudioCodec_Stream_EnInit(&xhEncodec, &st_AVInfo.st_AudioInfo))
@@ -289,7 +287,6 @@ bool XEngine_AVPacket_AVHdr(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int n
289287
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("推流端:%s,初始化音频编码器失败,错误:%lX"), lpszClientAddr, AudioCodec_GetLastError());
290288
return false;
291289
}
292-
AudioCodec_Stream_SetResample(xhEncodec, &nTmp, st_AVInfo.st_AudioInfo.nSampleRate, st_AVInfo.st_AudioInfo.nSampleRate, ENUM_AVCODEC_AUDIO_SAMPLEFMT_S16, ENUM_AVCODEC_AUDIO_SAMPLEFMT_FLTP, st_AVInfo.st_AudioInfo.nChannel, st_AVInfo.st_AudioInfo.nChannel);
293290

294291
if (!ModuleSession_PushStream_AudioCodecSet(lpszClientAddr, xhDecodec, xhEncodec))
295292
{

0 commit comments

Comments
 (0)