VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-05 14:47:50 -04:00
Code Issues Projects Releases Wiki Activity

Windows MSVC2017: include DATV Demod

Browse Source
This commit is contained in:
f4exb 2018-11-28 10:57:03 +01:00
parent 788ffa7c86
commit 6f4969f417
5 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/channelrx/demoddatv/demoddatv.pro
View File

@ -7,7 +7,7 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG += plugin CONFIG += plugin
QT += core gui multimedia multimediawidgets widgets opengl QT += core gui multimedia multimediawidgets widgets opengl qml
TARGET = demoddatv TARGET = demoddatv
@ -18,25 +18,26 @@ QMAKE_CXXFLAGS += -msse4.1
QMAKE_CXXFLAGS += -std=c++11 QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../exports
INCLUDEPATH += ../../../sdrbase INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug CONFIG(Debug):build_subdir = debug
CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0" CONFIG(MSVC):INCLUDEPATH += "C:\softs\ffmpeg-20181127-1035206-win64-dev\include"
CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0"
SOURCES += datvdemod.cpp\ SOURCES += datvdemod.cpp\
datvdemodgui.cpp\ datvdemodgui.cpp\
datvdemodplugin.cpp\ datvdemodplugin.cpp\
datvideostream.cpp \ datvideostream.cpp \
datvideorender.cpp datvideorender.cpp
HEADERS += datvdemod.h\ HEADERS += datvdemod.h\
datvdemodgui.h\ datvdemodgui.h\
datvdemodplugin.h\ datvdemodplugin.h\
leansdr/convolutional.h \ leansdr/convolutional.h \
leansdr/dsp.h \ leansdr/dsp.h \
leansdr/dvb.h \ leansdr/dvb.h \
@ -58,6 +59,7 @@ FORMS += datvdemodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -lavutil -lswscale -lavdevice -lavformat -lavcodec -lswresample #LIBS += -lavutil -lswscale -lavdevice -lavformat -lavcodec -lswresample
LIBS += -L"C:\softs\ffmpeg-20181127-1035206-win64-dev\lib" -lavutil -lswscale -lavdevice -lavformat -lavcodec -lswresample
RESOURCES = ../../../sdrbase/resources/res.qrc RESOURCES = ../../../sdrbase/resources/res.qrc

14
plugins/channelrx/demoddatv/leansdr/dvb.h
View File

@ -671,13 +671,13 @@ static struct fec_spec
} }
fec_specs[FEC_MAX] = { fec_specs[FEC_MAX] = {
[FEC12] = { 1, 2, polys_fec12 }, { 1, 2, polys_fec12 },
[FEC23] = { 2, 3, polys_fec23 }, { 2, 3, polys_fec23 },
[FEC46] = { 4, 6, polys_fec46 }, { 4, 6, polys_fec46 },
[FEC34] = { 3, 4, polys_fec34 }, { 3, 4, polys_fec34 },
[FEC56] = { 5, 6, polys_fec56 }, { 5, 6, polys_fec56 },
[FEC78] = { 7, 8, polys_fec78 }, { 7, 8, polys_fec78 },
[FEC45] = { 4, 5, polys_fec45 }, // Non-standard { 4, 5, polys_fec45 }, // Non-standard
}; };
struct dvb_convol: runnable struct dvb_convol: runnable

1
plugins/channelrx/demoddatv/leansdr/math.h
View File

@ -1,6 +1,7 @@
#ifndef LEANSDR_MATH_H #ifndef LEANSDR_MATH_H
#define LEANSDR_MATH_H #define LEANSDR_MATH_H
#define _USE_MATH_DEFINES
#include <math.h> #include <math.h>
#include <stdint.h> #include <stdint.h>

1
sdrangel.windows.pro
View File

@ -53,6 +53,7 @@ SUBDIRS += plugins/channelrx/chanalyzer
SUBDIRS += plugins/channelrx/demodam SUBDIRS += plugins/channelrx/demodam
SUBDIRS += plugins/channelrx/demodatv SUBDIRS += plugins/channelrx/demodatv
SUBDIRS += plugins/channelrx/demodbfm SUBDIRS += plugins/channelrx/demodbfm
CONFIG(!MSVC):SUBDIRS += plugins/channelrx/demoddatv
CONFIG(!MSVC):SUBDIRS += plugins/channelrx/demoddsd CONFIG(!MSVC):SUBDIRS += plugins/channelrx/demoddsd
CONFIG(!MSVC):SUBDIRS += plugins/channelrx/demodlora CONFIG(!MSVC):SUBDIRS += plugins/channelrx/demodlora
SUBDIRS += plugins/channelrx/demodnfm SUBDIRS += plugins/channelrx/demodnfm

5
windowsms.install.bat
View File

@ -5,6 +5,8 @@ SET libiconvdir="C:\softs\iconv-1.9.2.win32"
SET libzlib1dir="C:\softs\zlib-1.2.5" SET libzlib1dir="C:\softs\zlib-1.2.5"
SET pothosdir="C:\Program Files\PothosSDR" SET pothosdir="C:\Program Files\PothosSDR"
SET pthreadsdir="C:\softs\pthreads-w32" SET pthreadsdir="C:\softs\pthreads-w32"
SET ffmpegdir="C:\softs\ffmpeg-20181127-1035206-win64-shared\bin"
SET qt5dir="C:\Qt\5.11.1\msvc2017_64\bin"
copy app\%1\sdrangel.exe %2 copy app\%1\sdrangel.exe %2
copy sdrbase\%1\sdrbase.dll %2 copy sdrbase\%1\sdrbase.dll %2
@ -39,6 +41,8 @@ REM copy %opencvdir%\opencv_ffmpeg2413.dll %2
REM copy %opencvdir%\libopencv_imgproc2413.dll %2 REM copy %opencvdir%\libopencv_imgproc2413.dll %2
REM copy %opencvdir%\libopencv_highgui2413.dll %2 REM copy %opencvdir%\libopencv_highgui2413.dll %2
REM copy %opencvdir%\libopencv_core2413.dll %2 REM copy %opencvdir%\libopencv_core2413.dll %2
copy %ffmpegdir%\*.dll %2
copy %qt5dir%\Qt5Qml.dll %2
mkdir %2\plugins mkdir %2\plugins
mkdir %2\plugins\channelrx mkdir %2\plugins\channelrx
@ -50,6 +54,7 @@ copy plugins\channelrx\chanalyzer\%1\chanalyzer.dll %2\plugins\channelrx
copy plugins\channelrx\demodam\%1\demodam.dll %2\plugins\channelrx copy plugins\channelrx\demodam\%1\demodam.dll %2\plugins\channelrx
copy plugins\channelrx\demodatv\%1\demodatv.dll %2\plugins\channelrx copy plugins\channelrx\demodatv\%1\demodatv.dll %2\plugins\channelrx
copy plugins\channelrx\demodbfm\%1\demodbfm.dll %2\plugins\channelrx copy plugins\channelrx\demodbfm\%1\demodbfm.dll %2\plugins\channelrx
copy plugins\channelrx\demoddatv\%1\demoddatv.dll %2\plugins\channelrx
REM copy plugins\channelrx\demoddsd\%1\demoddsd.dll %2\plugins\channelrx REM copy plugins\channelrx\demoddsd\%1\demoddsd.dll %2\plugins\channelrx
REM copy plugins\channelrx\demodlora\%1\demodlora.dll %2\plugins\channelrx REM copy plugins\channelrx\demodlora\%1\demodlora.dll %2\plugins\channelrx
copy plugins\channelrx\demodnfm\%1\demodnfm.dll %2\plugins\channelrx copy plugins\channelrx\demodnfm\%1\demodnfm.dll %2\plugins\channelrx