diff options
| author | Alan Jeffrey <ajeffrey@mozilla.com> | 2019-08-06 17:59:22 -0500 |
|---|---|---|
| committer | Alan Jeffrey <ajeffrey@mozilla.com> | 2019-08-08 16:52:50 -0500 |
| commit | 11b3d78f403f901b1badd336c35d9d4fda804dab (patch) | |
| tree | fe61c459b8d72330781b60f9974de3fd89f21bee /support/magicleap/Servo2D | |
| parent | 555fa75b2c7f4faa0818e86296a4ea3d5b8e4d42 (diff) | |
| download | servo-11b3d78f403f901b1badd336c35d9d4fda804dab.tar.gz servo-11b3d78f403f901b1badd336c35d9d4fda804dab.zip | |
Added gstreamer support to the magicleap port
Diffstat (limited to 'support/magicleap/Servo2D')
| -rw-r--r-- | support/magicleap/Servo2D/Servo2D.mabu | 22 | ||||
| -rw-r--r-- | support/magicleap/Servo2D/code/src/Servo2D.cpp | 9 |
2 files changed, 30 insertions, 1 deletions
diff --git a/support/magicleap/Servo2D/Servo2D.mabu b/support/magicleap/Servo2D/Servo2D.mabu index 43d6fe26b3f..9bf43347d6e 100644 --- a/support/magicleap/Servo2D/Servo2D.mabu +++ b/support/magicleap/Servo2D/Servo2D.mabu @@ -2,25 +2,45 @@ KIND = program INCS = \ code/inc/ \ - code/inc.gen/ + code/inc.gen/ \ + $(GSTREAMER_DIR)/system/include/glib-2.0 \ + $(GSTREAMER_DIR)/system/lib64/glib-2.0/include/ \ + $(GSTREAMER_DIR)/system/include/gstreamer-1.0 SRCS = \ code/src/main.cpp \ code/src/Servo2D.cpp LIBPATHS.debug = \ + $(GSTREAMER_DIR)/system/lib64/ \ ../../../target/magicleap/aarch64-linux-android/debug LIBPATHS.release = \ + $(GSTREAMER_DIR)/system/lib64/ \ ../../../target/magicleap/aarch64-linux-android/release LDFLAGS.device = \ -L$(MLSDK)/lumin/stl/libc++/lib +DATAS = \ + $(GSTREAMER_DIR)/system/lib64/*.so : bin/ \ + $(GSTREAMER_DIR)/system/lib64/gstreamer-1.0/*.so : bin/ + STLIBS = \ mlservo SHLIBS = \ + glib-2.0 \ + gobject-2.0 \ + gstreamer-1.0 \ + gstapp-1.0 \ + gstaudio-1.0 \ + gstbase-1.0 \ + gstgl-1.0 \ + gstplayer-1.0 \ + gstsdp-1.0 \ + gstvideo-1.0 \ + gstwebrtc-1.0 \ c++abi \ log \ z diff --git a/support/magicleap/Servo2D/code/src/Servo2D.cpp b/support/magicleap/Servo2D/code/src/Servo2D.cpp index 2ba1d3a17cb..768abbcae21 100644 --- a/support/magicleap/Servo2D/code/src/Servo2D.cpp +++ b/support/magicleap/Servo2D/code/src/Servo2D.cpp @@ -173,6 +173,15 @@ int Servo2D::init() { EGLSurface surf = plane_->getEGLSurface(); EGLDisplay dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY); + // Set up gstreamer + auto tmpdir = getTempPath(); + auto bindir = getPackagePath() + "bin"; + auto registry = getWritablePath() + "gstreamer-registry.bin"; + setenv("GIO_MODULE_DIR", bindir.c_str(), 1); + setenv("GST_PLUGIN_SYSTEM_PATH", bindir.c_str(), 1); + setenv("GST_REGISTRY", registry.c_str(), 1); + setenv("XDG_CACHE_HOME", tmpdir.c_str(), 1); + // Hook into servo servo_ = init_servo(ctx, surf, dpy, true, this, logger, history, url, keyboard, uri_, args_, |