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
343eecde
Commit
343eecde
authored
Jun 30, 2019
by
Tomaz Canabrava
Committed by
Daniel Agar
Jun 30, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correctly link against GStreamer
Video is still not being displayed, for some reason
parent
d4492ef5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
38 deletions
+54
-38
CMakeLists.txt
CMakeLists.txt
+12
-1
CMakeLists.txt
src/VideoStreaming/CMakeLists.txt
+42
-37
No files found.
CMakeLists.txt
View file @
343eecde
cmake_minimum_required
(
VERSION 3.2
)
project
(
QGroundControl LANGUAGES CXX
)
project
(
QGroundControl LANGUAGES C
C
XX
)
set_property
(
CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
"Debug;Release;RelWithDebInfo;MinSizeRel;Coverage"
)
...
...
@@ -58,6 +58,16 @@ if (CCACHE AND CCACHE_PROGRAM AND NOT DEFINED ENV{CCACHE_DISABLE})
set_property
(
GLOBAL PROPERTY RULE_LAUNCH_COMPILE
"
${
CCACHE_PROGRAM
}
"
)
endif
()
#=============================================================================
# GStreamer
#
find_package
(
PkgConfig
)
pkg_check_modules
(
GST
gstreamer-1.0>=1.14
gstreamer-video-1.0>=1.14
)
#=============================================================================
# Qt5
#
...
...
@@ -73,6 +83,7 @@ find_package(Qt5 ${QT_VERSION}
Positioning
Quick
QuickWidgets
OpenGL
Sql
Svg
Test
...
...
src/VideoStreaming/CMakeLists.txt
View file @
343eecde
if
(
GST_FOUND
)
include_directories
(
${
GST_INCLUDE_DIRS
}
gstqtvideosink/utils/
)
set
(
EXTRA_SRC
)
if
(
VIDEO
)
list
(
APPEND EXTRA_SRC
gstqtvideosink/delegates/basedelegate.cpp
gstqtvideosink/delegates/qtquick2videosinkdelegate.cpp
gstqtvideosink/delegates/qtvideosinkdelegate.cpp
gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp
gstqtvideosink/gstqtglvideosink.cpp
gstqtvideosink/gstqtglvideosinkbase.cpp
gstqtvideosink/gstqtquick2videosink.cpp
gstqtvideosink/gstqtvideosink.cpp
gstqtvideosink/gstqtvideosinkbase.cpp
gstqtvideosink/gstqtvideosinkplugin.cpp
gstqtvideosink/gstqwidgetvideosink.cpp
gstqtvideosink/painters/genericsurfacepainter.cpp
gstqtvideosink/painters/openglsurfacepainter.cpp
gstqtvideosink/painters/videomaterial.cpp
gstqtvideosink/painters/videonode.cpp
gstqtvideosink/utils/bufferformat.cpp
gstqtvideosink/utils/utils.cpp
)
endif
()
add_library
(
VideoStreaming
VideoItem.cc
VideoReceiver.cc
VideoStreaming.cc
VideoSurface.cc
SubtitleWriter.cc
${
EXTRA_SRC
}
)
set
(
EXTRA_SRC
gstqtvideosink/delegates/basedelegate.cpp
gstqtvideosink/delegates/qtquick2videosinkdelegate.cpp
gstqtvideosink/delegates/qtvideosinkdelegate.cpp
gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp
gstqtvideosink/gstqtglvideosink.cpp
gstqtvideosink/gstqtglvideosinkbase.cpp
gstqtvideosink/gstqtquick2videosink.cpp
gstqtvideosink/gstqtvideosink.cpp
gstqtvideosink/gstqtvideosinkbase.cpp
gstqtvideosink/gstqtvideosinkplugin.cpp
gstqtvideosink/gstqwidgetvideosink.cpp
gstqtvideosink/gstqtvideosinkmarshal.c
gstqtvideosink/painters/genericsurfacepainter.cpp
gstqtvideosink/painters/openglsurfacepainter.cpp
gstqtvideosink/painters/videomaterial.cpp
gstqtvideosink/painters/videonode.cpp
gstqtvideosink/utils/bufferformat.cpp
gstqtvideosink/utils/utils.cpp
)
target_link_libraries
(
VideoStreaming
PUBLIC
qgc
add_library
(
VideoStreaming
VideoItem.cc
VideoReceiver.cc
VideoStreaming.cc
VideoSurface.cc
SubtitleWriter.cc
${
EXTRA_SRC
}
)
Qt5::Multimedia
)
target_link_libraries
(
VideoStreaming
PUBLIC
qgc
Qt5::Multimedia
Qt5::OpenGL
${
GST_LIBRARIES
}
)
target_include_directories
(
VideoStreaming INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
target_include_directories
(
VideoStreaming INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
endif
()
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