public
/
rtphone
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- avoid extra dependency on boost

This commit is contained in:
Dmytro Bogovych 2019-03-25 21:02:59 +02:00
parent 14b034e94c
commit 2f3fa06654
3 changed files with 562 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/audio/Audio_Mixer.cpp
View File

@ -22,7 +22,7 @@ Mixer::Stream::Stream()
mResampler32.start(AUDIO_CHANNELS, 32000, AUDIO_SAMPLERATE); mResampler32.start(AUDIO_CHANNELS, 32000, AUDIO_SAMPLERATE);
mResampler48.start(AUDIO_CHANNELS, 48000, AUDIO_SAMPLERATE); mResampler48.start(AUDIO_CHANNELS, 48000, AUDIO_SAMPLERATE);
mActive = false; mActive = false;
mContext = NULL; mContext = nullptr;
mSSRC = 0; mSSRC = 0;
mFadeOutCounter = 0; mFadeOutCounter = 0;
mData.setCapacity(AUDIO_SPK_BUFFER_SIZE * AUDIO_SPK_BUFFER_COUNT); mData.setCapacity(AUDIO_SPK_BUFFER_SIZE * AUDIO_SPK_BUFFER_COUNT);

2
src/engine/media/MT_Dtmf.cpp
View File

@ -53,7 +53,7 @@ void DtmfBuilder::buildRfc2833(int tone, int duration, int volume, bool endOfEve
#ifndef TARGET_WIN #ifndef TARGET_WIN
# include <ctype.h> # include <ctype.h>
# if !defined(TARGET_ANDROID) && !defined(TARGET_WIN) # if !defined(TARGET_ANDROID) && !defined(TARGET_WIN)
# include <xlocale.h> //# include <xlocale.h>
# endif # endif
#endif #endif

12
src/engine/media/MT_SevanaMos.cpp
View File

@ -6,9 +6,7 @@
#if defined(USE_PVQA_LIBRARY) #if defined(USE_PVQA_LIBRARY)
#if defined(TARGET_SERVER) #if defined(TARGET_SERVER)
# include <boost/filesystem.hpp> # include <filesystem>
# include <boost/algorithm/string.hpp>
using namespace boost::filesystem;
#endif #endif
#include "../engine/helper/HL_Log.h" #include "../engine/helper/HL_Log.h"
@ -67,6 +65,7 @@ static std::string execCommand(const std::string& cmd)
void SevanaMosUtility::run(const std::string& pcmPath, const std::string& intervalPath, void SevanaMosUtility::run(const std::string& pcmPath, const std::string& intervalPath,
std::string& estimation, std::string& intervals) std::string& estimation, std::string& intervals)
{ {
/*
#if defined(TARGET_SERVER) #if defined(TARGET_SERVER)
path sevana = current_path() / "sevana"; path sevana = current_path() / "sevana";
#if defined(TARGET_LINUX) || defined(TARGET_OSX) #if defined(TARGET_LINUX) || defined(TARGET_OSX)
@ -113,11 +112,16 @@ void SevanaMosUtility::run(const std::string& pcmPath, const std::string& interv
intervals = str; intervals = str;
} }
#endif #endif
*/
} }
float getSevanaMos(const std::string& audioPath, const std::string& intervalReportPath, float getSevanaMos(const std::string& audioPath, const std::string& intervalReportPath,
std::string& intervalReport) std::string& intervalReport)
{ {
return 0.0f;
/*
// Find Sevana MOS estimation // Find Sevana MOS estimation
ICELogDebug( << "Running MOS utitlity on resulted PCM file " << audioPath ); ICELogDebug( << "Running MOS utitlity on resulted PCM file " << audioPath );
try try
@ -131,7 +135,7 @@ float getSevanaMos(const std::string& audioPath, const std::string& intervalRepo
{ {
ICELogError( << "MOS utility failed on PCM file " << audioPath << ". Error msg: " << e.what() ); ICELogError( << "MOS utility failed on PCM file " << audioPath << ". Error msg: " << e.what() );
return 0.0; return 0.0;
} }*/
} }
// ------------------- SevanaPVQA ------------------- // ------------------- SevanaPVQA -------------------