- avoid OpenCore AMR codecs on Windows too (as there is no binary package yet)

This commit is contained in:
Dmytro Bogovych 2019-03-18 10:15:45 +02:00
parent 528a66d901
commit 762207c093
4 changed files with 11 additions and 5 deletions

View File

@ -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 <WinSock2.h>
# include <Windows.h>
#endif
#include "HL_Rtp.h"
#include "HL_Exception.h"
#include "HL_String.h"
@ -15,6 +20,7 @@
#if !defined(TARGET_WIN)
# include <alloca.h>
#endif
#include <sstream>
#include <tuple>

View File

@ -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"

View File

@ -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<AmrNbCodec*>(c);
AmrWbCodec* wb = dynamic_cast<AmrWbCodec*>(c);

View File

@ -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)