Skip to content

Commit

Permalink
VideoReceiver: bump gstreamer version
Browse files Browse the repository at this point in the history
Otherwise it is not found for Android.
  • Loading branch information
julianoes committed May 22, 2024
1 parent 76cf180 commit a753a86
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions src/VideoReceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ The installer places them under ~/Library/Developer/GStreamer/iPhone.sdk/GStream

### Android

Download the gstreamer from here: [gstreamer-1.0-android-universal-1.18.5.tar.xz](https://gstreamer.freedesktop.org/data/pkg/android/1.18.5/gstreamer-1.0-android-universal-1.18.5.tar.xz)
Download the gstreamer from here: [gstreamer-1.0-android-universal-1.18.6.tar.xz](https://gstreamer.freedesktop.org/data/pkg/android/1.18.6/gstreamer-1.0-android-universal-1.18.6.tar.xz)

Create a directory named "gstreamer-1.0-android-universal-1.18.5" under the root qgroundcontrol directory (the same directory qgroundcontrol.pro is located). Extract the downloaded archive under this directory. That's where the build system will look for it. Make sure your archive tool doesn't create any additional top level directories. The structure after extracting the archive should look like this:
Create a directory named "gstreamer-1.0-android-universal-1.18.6" under the root qgroundcontrol directory (the same directory qgroundcontrol.pro is located). Extract the downloaded archive under this directory. That's where the build system will look for it. Make sure your archive tool doesn't create any additional top level directories. The structure after extracting the archive should look like this:
```
qgroundcontrol
├── gstreamer-1.0-android-universal-1.18.5
├── gstreamer-1.0-android-universal-1.18.6
│ │
│   ├──armv7
│   │   ├── bin
Expand Down
10 changes: 5 additions & 5 deletions src/VideoReceiver/VideoReceiver.pri
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,16 @@ LinuxBuild {
QMAKE_POST_LINK += $$escape_expand(\\n) xcopy \"$$GST_ROOT_WIN\\lib\\gstreamer-1.0\\*.dll\" \"$$DESTDIR_WIN\\gstreamer-plugins\\\" /Y $$escape_expand(\\n)
}
} else:AndroidBuild {
#- gstreamer assumed to be installed in $$PWD/../../gstreamer-1.0-android-universal-1.18.5/***
#- gstreamer assumed to be installed in $$PWD/../../gstreamer-1.0-android-universal-1.18.6/***
contains(ANDROID_TARGET_ARCH, armeabi-v7a) {
GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.5/armv7
GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.6/armv7
} else:contains(ANDROID_TARGET_ARCH, arm64-v8a) {
GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.5/arm64
GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.6/arm64
} else:contains(ANDROID_TARGET_ARCH, x86_64) {
GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.5/x86_64
GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.6/x86_64
} else {
message(Unknown ANDROID_TARGET_ARCH $$ANDROID_TARGET_ARCH)
GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.5/x86
GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.6/x86
}
exists($$GST_ROOT) {
QMAKE_CXXFLAGS += -pthread
Expand Down

0 comments on commit a753a86

Please sign in to comment.