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

- RPi related changes (to build pvqa_pcap for RPi)

This commit is contained in:
Dmytro Bogovych 2019-04-18 12:09:24 +03:00
parent 999c4c4110
commit e9799dae0b
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/helper/HL_Rtp.h
View File

@ -11,8 +11,6 @@
#endif #endif
#include "HL_Uuid.h" #include "HL_Uuid.h"
#include "HL_InternetAddress.h" #include "HL_InternetAddress.h"
#include <vector> #include <vector>

3
src/engine/helper/HL_Uuid.h
View File

@ -3,7 +3,8 @@
#include <string> #include <string>
#if defined(TARGET_LINUX) || defined(TARGET_OSX)
#if (defined(TARGET_LINUX) || defined(TARGET_OSX)) && !defined(USE_NULL_UUID)
# include <uuid/uuid.h> # include <uuid/uuid.h>
#endif #endif
#if defined(TARGET_WIN) #if defined(TARGET_WIN)

2
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) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) #if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) && !defined(TARGET_RPI)
#include "MT_AmrCodec.h" #include "MT_AmrCodec.h"
#include "../helper/HL_ByteBuffer.h" #include "../helper/HL_ByteBuffer.h"

4
src/engine/media/MT_AudioCodec.h
View File

@ -51,7 +51,7 @@ namespace MT
PCodec create() override; PCodec create() override;
}; };
G729Codec(); G729Codec();
~G729Codec(); ~G729Codec() override;
const char* name() override; const char* name() override;
int pcmLength() override; int pcmLength() override;
@ -399,7 +399,7 @@ namespace MT
}; };
GsmHrCodec(); GsmHrCodec();
virtual ~GsmHrCodec(); ~GsmHrCodec() override;
const char* name() override; const char* name() override;
int pcmLength() override; int pcmLength() override;

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) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) #if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) && !defined(TARGET_RPI)
# include "MT_AmrCodec.h" # include "MT_AmrCodec.h"
#endif #endif
@ -705,7 +705,7 @@ float AudioReceiver::calculatePvqaMos(int rate, std::string& report)
void AudioReceiver::processStatisticsWithAmrCodec(Codec* c) void AudioReceiver::processStatisticsWithAmrCodec(Codec* c)
{ {
#if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) #if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) && !defined(TARGET_RPI)
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) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) #if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) && !defined(TARGET_RPI)
# include "MT_AmrCodec.h" # include "MT_AmrCodec.h"
#endif #endif
@ -35,7 +35,7 @@ CodecList::CodecList(const Settings& settings)
} }
#endif #endif
#if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) #if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) && !defined(TARGET_RPI)
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)