Skip to content

Commit

Permalink
update:xengine v9.14 supported
Browse files Browse the repository at this point in the history
  • Loading branch information
@xengine-qyt
xengine-qyt committed Mar 10, 2025
1 parent cbb20f7 commit 712c1e4
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
17 changes: 9 additions & 8 deletions XEngine_Source/VSCopy_Debug.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_XSocket.dll" "./"
copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIHelp.dll" "./"
copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIAddr.dll" "./"
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_SystemApi.dll" "./"
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_SystemConfig.dll" "./"

copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_Packets.dll" "./"
copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_XLog.dll" "./"
Expand All @@ -29,11 +30,11 @@ copy /y "D:\XEngine\XEngine_SourceCode\Debug\StreamMedia_HLSProtocol.dll" "./"
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_AVHelp.dll" "./"
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_AudioCodec.dll" "./"

copy /y "%XEngine_Lib32%\XEngine_AVCodec\avcodec-60.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avdevice-60.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avfilter-9.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avformat-60.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avutil-58.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\postproc-57.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swresample-4.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swscale-7.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avcodec-61.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avdevice-61.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avfilter-10.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avformat-61.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avutil-59.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\postproc-58.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swresample-5.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swscale-8.dll" "./"
17 changes: 9 additions & 8 deletions XEngine_Source/VSCopy_x64.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIAddr.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_SystemSdk\XEngine_SystemConfig.dll" "./"

copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"
Expand All @@ -29,11 +30,11 @@ copy /y "%XEngine_Lib64%\XEngine_StreamMedia\StreamMedia_HLSProtocol.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\XEngine_AVHelp.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\XEngine_AudioCodec.dll" "./"

copy /y "%XEngine_Lib64%\XEngine_AVCodec\avcodec-60.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avdevice-60.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avfilter-9.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avformat-60.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avutil-58.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\postproc-57.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\swresample-4.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\swscale-7.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avcodec-61.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avdevice-61.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avfilter-10.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avformat-61.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\avutil-59.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\postproc-58.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\swresample-5.dll" "./"
copy /y "%XEngine_Lib64%\XEngine_AVCodec\swscale-8.dll" "./"
17 changes: 9 additions & 8 deletions XEngine_Source/VSCopy_x86.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIAddr.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemConfig.dll" "./"

copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"
Expand All @@ -29,11 +30,11 @@ copy /y "%XEngine_Lib32%\XEngine_StreamMedia\StreamMedia_HLSProtocol.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\XEngine_AVHelp.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\XEngine_AudioCodec.dll" "./"

copy /y "%XEngine_Lib32%\XEngine_AVCodec\avcodec-60.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avdevice-60.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avfilter-9.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avformat-60.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avutil-58.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\postproc-57.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swresample-4.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swscale-7.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avcodec-61.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avdevice-61.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avfilter-10.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avformat-61.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\avutil-59.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\postproc-58.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swresample-5.dll" "./"
copy /y "%XEngine_Lib32%\XEngine_AVCodec\swscale-8.dll" "./"
3 changes: 0 additions & 3 deletions XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_AVPacket.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,6 @@ bool XEngine_AVPacket_AVHdr(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int n
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("推流端:%s,初始化音频解码器失败,错误:%lX"), lpszClientAddr, AudioCodec_GetLastError());
return false;
}
int nTmp = 0;
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);

st_AVInfo.st_AudioInfo.enAVCodec = ENUM_XENGINE_AVCODEC_AUDIO_TYPE_AAC;
if (!AudioCodec_Stream_EnInit(&xhEncodec, &st_AVInfo.st_AudioInfo))
Expand All @@ -289,7 +287,6 @@ bool XEngine_AVPacket_AVHdr(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int n
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("推流端:%s,初始化音频编码器失败,错误:%lX"), lpszClientAddr, AudioCodec_GetLastError());
return false;
}
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);

if (!ModuleSession_PushStream_AudioCodecSet(lpszClientAddr, xhDecodec, xhEncodec))
{
Expand Down

0 comments on commit 712c1e4

Please sign in to comment.