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

- disable AMR codec for OpenWRT for now

This commit is contained in:
Dmytro Bogovych 2019-03-15 17:52:48 +02:00
parent 522608319e
commit 528a66d901
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/media/MT_AmrCodec.cpp
View File

@ -1,5 +1,5 @@
// Avoid linking issues on Android systems // Avoid linking issues on Android systems
#if !defined(TARGET_ANDROID) #if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT)
#include "MT_AmrCodec.h" #include "MT_AmrCodec.h"
#include "../helper/HL_ByteBuffer.h" #include "../helper/HL_ByteBuffer.h"
@ -976,4 +976,4 @@ int GsmEfrCodec::plc(int lostFrames, void* output, int outputCapacity)
return lostFrames * pcmLength(); return lostFrames * pcmLength();
} }
#endif #endif

4
src/engine/media/MT_AudioReceiver.cpp
View File

@ -13,7 +13,7 @@
#include "../audio/Audio_Interface.h" #include "../audio/Audio_Interface.h"
#include "../audio/Audio_Resampler.h" #include "../audio/Audio_Resampler.h"
#if !defined(TARGET_ANDROID) #if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT)
# include "MT_AmrCodec.h" # include "MT_AmrCodec.h"
#endif #endif
@ -692,7 +692,7 @@ float AudioReceiver::calculatePvqaMos(int rate, std::string& report)
void AudioReceiver::processStatisticsWithAmrCodec(Codec* c) void AudioReceiver::processStatisticsWithAmrCodec(Codec* c)
{ {
#if !defined(TARGET_ANDROID) #if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT)
AmrNbCodec* nb = dynamic_cast<AmrNbCodec*>(c); AmrNbCodec* nb = dynamic_cast<AmrNbCodec*>(c);
AmrWbCodec* wb = dynamic_cast<AmrWbCodec*>(c); AmrWbCodec* wb = dynamic_cast<AmrWbCodec*>(c);

4
src/engine/media/MT_CodecList.cpp
View File

@ -7,7 +7,7 @@
#include "MT_CodecList.h" #include "MT_CodecList.h"
#include "MT_AudioCodec.h" #include "MT_AudioCodec.h"
#if !defined(TARGET_ANDROID) #if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT)
# include "MT_AmrCodec.h" # include "MT_AmrCodec.h"
#endif #endif
@ -33,7 +33,7 @@ CodecList::CodecList(const Settings& settings)
} }
} }
#if !defined(TARGET_ANDROID) #if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT)
for (int pt: mSettings.mAmrWbPayloadType) for (int pt: mSettings.mAmrWbPayloadType)
mFactoryList.push_back(new AmrWbCodec::CodecFactory({mSettings.mWrapIuUP, false, pt})); mFactoryList.push_back(new AmrWbCodec::CodecFactory({mSettings.mWrapIuUP, false, pt}));
for (int pt: mSettings.mAmrWbOctetPayloadType) for (int pt: mSettings.mAmrWbOctetPayloadType)