Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
812dea30
Commit
812dea30
authored
Feb 09, 2020
by
Daniel Agar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake add qmlglsink support (gst-plugins_good)
parent
0aafacfe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
78 additions
and
4 deletions
+78
-4
CMakeLists.txt
CMakeLists.txt
+3
-0
qmlglsink.cmake
qmlglsink.cmake
+65
-0
CMakeLists.txt
src/VideoStreaming/CMakeLists.txt
+10
-4
No files found.
CMakeLists.txt
View file @
812dea30
...
...
@@ -87,6 +87,7 @@ find_package(PkgConfig)
pkg_check_modules
(
GST
gstreamer-1.0>=1.14
gstreamer-video-1.0>=1.14
gstreamer-gl-1.0>=1.14
)
if
(
GST_FOUND
)
...
...
@@ -100,6 +101,8 @@ if (GST_FOUND)
-DQGC_GST_TAISYNC_ENABLED
-DQGC_GST_MICROHARD_ENABLED
)
include
(
qmlglsink.cmake
)
endif
()
#=============================================================================
# Qt5
...
...
qmlglsink.cmake
0 → 100644
View file @
812dea30
find_package
(
Qt5Gui
${
QT_VERSION
}
CONFIG REQUIRED Private
)
add_library
(
gst_plugins_good
libs/gst-plugins-good/ext/qt/gstplugin.cc
libs/gst-plugins-good/ext/qt/gstqtglutility.cc
libs/gst-plugins-good/ext/qt/gstqsgtexture.cc
libs/gst-plugins-good/ext/qt/gstqtsink.cc
libs/gst-plugins-good/ext/qt/gstqtsrc.cc
libs/gst-plugins-good/ext/qt/qtwindow.cc
libs/gst-plugins-good/ext/qt/qtitem.cc
libs/gst-plugins-good/ext/qt/gstqsgtexture.h
libs/gst-plugins-good/ext/qt/gstqtgl.h
libs/gst-plugins-good/ext/qt/gstqtglutility.h
libs/gst-plugins-good/ext/qt/gstqtsink.h
libs/gst-plugins-good/ext/qt/gstqtsrc.h
libs/gst-plugins-good/ext/qt/qtwindow.h
libs/gst-plugins-good/ext/qt/qtitem.h
)
if
(
LINUX
)
target_compile_definitions
(
gst_plugins_good PUBLIC HAVE_QT_X11 HAVE_QT_EGLFS HAVE_QT_WAYLAND
)
find_package
(
Qt5
${
QT_VERSION
}
COMPONENTS
X11Extras
REQUIRED
HINTS
${
QT_LIBRARY_HINTS
}
)
target_link_libraries
(
gst_plugins_good
PUBLIC
Qt5::X11Extras
)
elseif
(
APPLE
)
target_compile_definitions
(
gst_plugins_good PUBLIC HAVE_QT_MAC
)
elseif
(
IOS
)
target_compile_definitions
(
gst_plugins_good PUBLIC HAVE_QT_MAC
)
elseif
(
WIN32
)
target_compile_definitions
(
gst_plugins_good PUBLIC HAVE_QT_WIN32
)
# TODO: use FindOpenGL?
target_link_libraries
(
gst_plugins_good PUBLIC opengl32.lib user32.lib
)
# LIBS += opengl32.lib user32.lib
elseif
(
ANDROID
)
target_compile_definitions
(
gst_plugins_good PUBLIC HAVE_QT_ANDROID
)
endif
()
target_link_libraries
(
gst_plugins_good
PUBLIC
Qt5::Core
Qt5::OpenGL
Qt5::GuiPrivate
)
target_compile_options
(
gst_plugins_good
PRIVATE
-Wno-unused-parameter
-Wno-implicit-fallthrough
)
src/VideoStreaming/CMakeLists.txt
View file @
812dea30
...
...
@@ -5,13 +5,19 @@ if (GST_FOUND)
endif
()
add_library
(
VideoStreaming
VideoReceiver.cc
VideoStreaming.cc
SubtitleWriter.cc
GLVideoItemStub.cc
GLVideoItemStub.cc
GLVideoItemStub.h
SubtitleWriter.cc
SubtitleWriter.h
VideoReceiver.cc
VideoReceiver.h
VideoStreaming.cc
VideoStreaming.h
)
target_link_libraries
(
VideoStreaming
PRIVATE
gst_plugins_good
PUBLIC
qgc
Qt5::Multimedia
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment