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
b5cf395c
Unverified
Commit
b5cf395c
authored
Dec 27, 2018
by
Gus Grubba
Committed by
GitHub
Dec 27, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7102 from mavlink/androidGStreamer
Moving Android to GStreamer 1.14.4
parents
4515b8d4
c2a37f81
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
15 deletions
+12
-15
.travis.yml
.travis.yml
+2
-4
QGCCommon.pri
QGCCommon.pri
+5
-5
VideoStreaming.pri
src/VideoStreaming/VideoStreaming.pri
+5
-6
No files found.
.travis.yml
View file @
b5cf395c
...
@@ -82,11 +82,9 @@ install:
...
@@ -82,11 +82,9 @@ install:
fi
fi
# android dependencies: qt, gstreamer, android-ndk
# android dependencies: qt, gstreamer, android-ndk
# gstreamer support temporarily disable until we figure the crash/build problems
#wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-android-armv7-1.5.2.tar.bz2 &&
#mkdir -p ${TRAVIS_BUILD_DIR}/gstreamer-1.0-android-armv7-1.5.2 &&
#tar jxf gstreamer-1.0-android-armv7-1.5.2.tar.bz2 -C ${TRAVIS_BUILD_DIR}/gstreamer-1.0-android-armv7-1.5.2 &&
-
if [ "${SPEC}" = "android-g++" ]; then
-
if [ "${SPEC}" = "android-g++" ]; then
wget --quiet http://www.grubba.com/gstreamer-1.0-android-universal-1.14.4.tar.bz2 &&
tar jxf gstreamer-1.0-android-universal-1.14.4.tar.bz2 -C ${TRAVIS_BUILD_DIR} &&
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.11.0-android_armv7-min.tar.bz2 &&
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.11.0-android_armv7-min.tar.bz2 &&
tar jxf Qt5.11.0-android_armv7-min.tar.bz2 -C /tmp &&
tar jxf Qt5.11.0-android_armv7-min.tar.bz2 -C /tmp &&
wget --quiet https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip &&
wget --quiet https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip &&
...
...
QGCCommon.pri
View file @
b5cf395c
...
@@ -29,7 +29,7 @@ linux {
...
@@ -29,7 +29,7 @@ linux {
message("Linux R-Pi2 build")
message("Linux R-Pi2 build")
CONFIG += LinuxBuild
CONFIG += LinuxBuild
DEFINES += __STDC_LIMIT_MACROS __rasp_pi2__
DEFINES += __STDC_LIMIT_MACROS __rasp_pi2__
} else : android-g++ {
} else : android-g++
| android-clang
{
CONFIG += AndroidBuild MobileBuild
CONFIG += AndroidBuild MobileBuild
DEFINES += __android__
DEFINES += __android__
DEFINES += __STDC_LIMIT_MACROS
DEFINES += __STDC_LIMIT_MACROS
...
...
src/VideoStreaming/VideoStreaming.pri
View file @
b5cf395c
...
@@ -73,18 +73,18 @@ LinuxBuild {
...
@@ -73,18 +73,18 @@ LinuxBuild {
QMAKE_POST_LINK += $$escape_expand(\\n) xcopy \"$$GST_ROOT_WIN\\lib\\gstreamer-1.0\\validate\\*.dll\" \"$$DESTDIR_WIN\\gstreamer-plugins\\validate\\\" /Y $$escape_expand(\\n)
QMAKE_POST_LINK += $$escape_expand(\\n) xcopy \"$$GST_ROOT_WIN\\lib\\gstreamer-1.0\\validate\\*.dll\" \"$$DESTDIR_WIN\\gstreamer-plugins\\validate\\\" /Y $$escape_expand(\\n)
}
}
} else:AndroidBuild {
} else:AndroidBuild {
#- gstreamer assumed to be installed in $$PWD/../../
android/gstreamer-1.0-android-armv7-1.5.2
(or x86)
#- gstreamer assumed to be installed in $$PWD/../../
gstreamer-1.0-android-universal-1.14.4/armv7
(or x86)
Androidx86Build {
Androidx86Build {
GST_ROOT = $$PWD/../../gstreamer-1.0-android-
x86-1.5.2
GST_ROOT = $$PWD/../../gstreamer-1.0-android-
universal-1.14.4/x86
} else {
} else {
GST_ROOT = $$PWD/../../gstreamer-1.0-android-
armv7-1.5.2
GST_ROOT = $$PWD/../../gstreamer-1.0-android-
universal-1.14.4/armv7
}
}
exists($$GST_ROOT) {
exists($$GST_ROOT) {
QMAKE_CXXFLAGS += -pthread
QMAKE_CXXFLAGS += -pthread
CONFIG += VideoEnabled
CONFIG += VideoEnabled
# We want to link these plugins statically
# We want to link these plugins statically
LIBS += -L$$GST_ROOT/lib/gstreamer-1.0
/static
\
LIBS += -L$$GST_ROOT/lib/gstreamer-1.0 \
-lgstvideo-1.0 \
-lgstvideo-1.0 \
-lgstcoreelements \
-lgstcoreelements \
-lgstudp \
-lgstudp \
...
@@ -95,7 +95,6 @@ LinuxBuild {
...
@@ -95,7 +95,6 @@ LinuxBuild {
-lgstsdpelem \
-lgstsdpelem \
-lgstvideoparsersbad \
-lgstvideoparsersbad \
-lgstrtpmanager \
-lgstrtpmanager \
-lgstrmdemux \
-lgstisomp4 \
-lgstisomp4 \
-lgstmatroska \
-lgstmatroska \
...
@@ -105,7 +104,7 @@ LinuxBuild {
...
@@ -105,7 +104,7 @@ LinuxBuild {
-lgstnet-1.0 -lgio-2.0 \
-lgstnet-1.0 -lgio-2.0 \
-lgstaudio-1.0 -lgstcodecparsers-1.0 -lgstbase-1.0 \
-lgstaudio-1.0 -lgstcodecparsers-1.0 -lgstbase-1.0 \
-lgstreamer-1.0 -lgstrtp-1.0 -lgstpbutils-1.0 -lgstrtsp-1.0 -lgsttag-1.0 \
-lgstreamer-1.0 -lgstrtp-1.0 -lgstpbutils-1.0 -lgstrtsp-1.0 -lgsttag-1.0 \
-lgstvideo-1.0 -lavformat -lavcodec -lavutil -lx264 -lavresample \
-lgstvideo-1.0 -lavformat -lavcodec -lavutil -lx264 -lav
filter -lsw
resample \
-lgstriff-1.0 -lgstcontroller-1.0 -lgstapp-1.0 \
-lgstriff-1.0 -lgstcontroller-1.0 -lgstapp-1.0 \
-lgstsdp-1.0 -lbz2 -lgobject-2.0 \
-lgstsdp-1.0 -lbz2 -lgobject-2.0 \
-Wl,--export-dynamic -lgmodule-2.0 -pthread -lglib-2.0 -lorc-0.4 -liconv -lffi -lintl \
-Wl,--export-dynamic -lgmodule-2.0 -pthread -lglib-2.0 -lorc-0.4 -liconv -lffi -lintl \
...
...
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