From e9799dae0b08c4289174f69daca42e469bd5824e Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Thu, 18 Apr 2019 12:09:24 +0300 Subject: [PATCH] - RPi related changes (to build pvqa_pcap for RPi) --- src/engine/helper/HL_Rtp.h | 2 -- src/engine/helper/HL_Uuid.h | 3 ++- src/engine/media/MT_AmrCodec.cpp | 2 +- src/engine/media/MT_AudioCodec.h | 4 ++-- src/engine/media/MT_AudioReceiver.cpp | 4 ++-- src/engine/media/MT_CodecList.cpp | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/engine/helper/HL_Rtp.h b/src/engine/helper/HL_Rtp.h index a2600b81..0e34b42c 100644 --- a/src/engine/helper/HL_Rtp.h +++ b/src/engine/helper/HL_Rtp.h @@ -11,8 +11,6 @@ #endif #include "HL_Uuid.h" - - #include "HL_InternetAddress.h" #include diff --git a/src/engine/helper/HL_Uuid.h b/src/engine/helper/HL_Uuid.h index 19abcb46..3607af80 100644 --- a/src/engine/helper/HL_Uuid.h +++ b/src/engine/helper/HL_Uuid.h @@ -3,7 +3,8 @@ #include -#if defined(TARGET_LINUX) || defined(TARGET_OSX) + +#if (defined(TARGET_LINUX) || defined(TARGET_OSX)) && !defined(USE_NULL_UUID) # include #endif #if defined(TARGET_WIN) diff --git a/src/engine/media/MT_AmrCodec.cpp b/src/engine/media/MT_AmrCodec.cpp index 185fe5ed..0c071927 100644 --- a/src/engine/media/MT_AmrCodec.cpp +++ b/src/engine/media/MT_AmrCodec.cpp @@ -1,5 +1,5 @@ // 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 "../helper/HL_ByteBuffer.h" diff --git a/src/engine/media/MT_AudioCodec.h b/src/engine/media/MT_AudioCodec.h index 966db600..d23f8aaf 100644 --- a/src/engine/media/MT_AudioCodec.h +++ b/src/engine/media/MT_AudioCodec.h @@ -51,7 +51,7 @@ namespace MT PCodec create() override; }; G729Codec(); - ~G729Codec(); + ~G729Codec() override; const char* name() override; int pcmLength() override; @@ -399,7 +399,7 @@ namespace MT }; GsmHrCodec(); - virtual ~GsmHrCodec(); + ~GsmHrCodec() override; const char* name() override; int pcmLength() override; diff --git a/src/engine/media/MT_AudioReceiver.cpp b/src/engine/media/MT_AudioReceiver.cpp index fd1449f2..43f53aa8 100644 --- a/src/engine/media/MT_AudioReceiver.cpp +++ b/src/engine/media/MT_AudioReceiver.cpp @@ -13,7 +13,7 @@ #include "../audio/Audio_Interface.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" #endif @@ -705,7 +705,7 @@ float AudioReceiver::calculatePvqaMos(int rate, std::string& report) 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(c); AmrWbCodec* wb = dynamic_cast(c); diff --git a/src/engine/media/MT_CodecList.cpp b/src/engine/media/MT_CodecList.cpp index 662b1497..34a36180 100644 --- a/src/engine/media/MT_CodecList.cpp +++ b/src/engine/media/MT_CodecList.cpp @@ -7,7 +7,7 @@ #include "MT_CodecList.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" #endif @@ -35,7 +35,7 @@ CodecList::CodecList(const Settings& settings) } #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) mFactoryList.push_back(new AmrWbCodec::CodecFactory({mSettings.mWrapIuUP, false, pt})); for (int pt: mSettings.mAmrWbOctetPayloadType)