VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-16 13:21:50 -05:00
Code Issues Projects Releases Wiki Activity

Windows build fixes for G722 and Opus codecs

Browse Source
This commit is contained in:
f4exb 2019-02-18 13:19:47 +01:00
parent a269462b55
commit 44649fe486
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdrbase/audio/audiofilter.cpp
View File

@ -14,6 +14,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // // along with this program. If not, see <http://www.gnu.org/licenses/>. //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#define _USE_MATH_DEFINES
#include <math.h> #include <math.h>
#include <algorithm> #include <algorithm>
#include <QDebug> #include <QDebug>

2
sdrbase/audio/audiog722.h
View File

@ -71,7 +71,7 @@ private:
void init(int rate, int options); void init(int rate, int options);
}; };
__inline__ int16_t saturate(int32_t amp) int16_t saturate(int32_t amp)
{ {
int16_t amp16; int16_t amp16;

6
sdrbase/sdrbase.pro
View File

@ -37,6 +37,7 @@ CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0
CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0"
CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0"
CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
CONFIG(MSVC):INCLUDEPATH += "C:\softs\libopus_v1.3_msvc15\include"
CONFIG(MINGW32):INCLUDEPATH += "C:\softs\serialDV" CONFIG(MINGW32):INCLUDEPATH += "C:\softs\serialDV"
CONFIG(MINGW64):INCLUDEPATH += "C:\softs\serialDV" CONFIG(MINGW64):INCLUDEPATH += "C:\softs\serialDV"
@ -58,6 +59,7 @@ SOURCES += audio/audiodevicemanager.cpp\
audio/audiofifo.cpp\ audio/audiofifo.cpp\
audio/audiofilter.cpp\ audio/audiofilter.cpp\
audio/audiog722.cpp\ audio/audiog722.cpp\
audio/audioopus.cpp\
audio/audiooutput.cpp\ audio/audiooutput.cpp\
audio/audioinput.cpp\ audio/audioinput.cpp\
audio/audionetsink.cpp\ audio/audionetsink.cpp\
@ -138,6 +140,7 @@ HEADERS += audio/audiodevicemanager.h\
audio/audiofifo.h\ audio/audiofifo.h\
audio/audiofilter.h\ audio/audiofilter.h\
audio/audiog722.h\ audio/audiog722.h\
audio/audioopus.h\
audio/audiooutput.h\ audio/audiooutput.h\
audio/audioinput.h\ audio/audioinput.h\
audio/audionetsink.h\ audio/audionetsink.h\
@ -231,6 +234,9 @@ HEADERS += audio/audiodevicemanager.h\
webapi/webapiserver.h\ webapi/webapiserver.h\
mainparser.h mainparser.h
MSVC {
LIBS += -LC:\softs\libopus_v1.3_msvc15\lib\x64 -lopus
}
MINGW32 || MINGW64 || MSVC { MINGW32 || MINGW64 || MSVC {
LIBS += -L../serialdv/$${build_subdir} -lserialdv LIBS += -L../serialdv/$${build_subdir} -lserialdv
} }