From 762207c093e7ef500188c6d96f979e7a0871038f Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Mon, 18 Mar 2019 10:15:45 +0200 Subject: [PATCH] - avoid OpenCore AMR codecs on Windows too (as there is no binary package yet) --- src/engine/helper/HL_Rtp.cpp | 6 ++++++ src/engine/media/MT_AmrCodec.cpp | 2 +- src/engine/media/MT_AudioReceiver.cpp | 4 ++-- src/engine/media/MT_CodecList.cpp | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/engine/helper/HL_Rtp.cpp b/src/engine/helper/HL_Rtp.cpp index 27c39ed2..9f7fcae4 100644 --- a/src/engine/helper/HL_Rtp.cpp +++ b/src/engine/helper/HL_Rtp.cpp @@ -3,6 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#if defined(TARGET_WIN) +# include +# include +#endif + #include "HL_Rtp.h" #include "HL_Exception.h" #include "HL_String.h" @@ -15,6 +20,7 @@ #if !defined(TARGET_WIN) # include #endif + #include #include diff --git a/src/engine/media/MT_AmrCodec.cpp b/src/engine/media/MT_AmrCodec.cpp index 65d56399..e18d1bfc 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) +#if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) #include "MT_AmrCodec.h" #include "../helper/HL_ByteBuffer.h" diff --git a/src/engine/media/MT_AudioReceiver.cpp b/src/engine/media/MT_AudioReceiver.cpp index 8c5fbc24..9616392c 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) +#if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) # include "MT_AmrCodec.h" #endif @@ -692,7 +692,7 @@ float AudioReceiver::calculatePvqaMos(int rate, std::string& report) void AudioReceiver::processStatisticsWithAmrCodec(Codec* c) { -#if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) +#if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) 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 c3a5dd0a..31b59026 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) +#if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) # include "MT_AmrCodec.h" #endif @@ -33,7 +33,7 @@ CodecList::CodecList(const Settings& settings) } } -#if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) +#if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) for (int pt: mSettings.mAmrWbPayloadType) mFactoryList.push_back(new AmrWbCodec::CodecFactory({mSettings.mWrapIuUP, false, pt})); for (int pt: mSettings.mAmrWbOctetPayloadType)