Initial setup for Mac Installer (Video Steaming)

.gitignore

@@ -1,3 +1,4 @@
+libs/lib/Frameworks/GStreamer.framework
 *.swp
 *.nfs
 CMakeFiles

QGCApplication.pro

@@ -122,18 +122,6 @@ include(libs/qextserialport/src/qextserialport.pri)
 
 include(QGCExternalLibs.pri)
 
-#
-# Post link configuration
-#
-
-include(QGCSetup.pri)
-
-#
-# Installer targets
-#
-
-include(QGCInstaller.pri)
-
 #
 # Main QGroundControl portion of project file
 #
@@ -702,3 +690,16 @@ AndroidBuild {
         $$PWD/android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java \
         $$PWD/android/src/org/qgroundcontrol/qgchelper/UsbIoManager.java
 }
+
+#-------------------------------------------------------------------------------------
+#
+# Post link configuration
+#
+
+include(QGCSetup.pri)
+
+#
+# Installer targets
+#
+
+include(QGCInstaller.pri)

QGCInstaller.pri

@@ -19,6 +19,19 @@
 
 installer {
     MacBuild {
+        VideoEnabled {
+            # Install the gstreamer framework
+            # This will:
+            # Copy from the original distibution into libs/lib/Framworks (if not already there)
+            # Prune the framework, removing stuff we don't need
+            # Relocate all dylibs so they can work under @executable_path/...
+            # Copy the result into the app bundle
+            # Make sure qgroundcontrol can find them
+            message("Preparing GStreamer Framework")
+            QMAKE_POST_LINK += && $$BASEDIR/tools/prepare_gstreamer_framework.sh $$BASEDIR/libs/lib/Frameworks/ $$DESTDIR/$${TARGET}.app $${TARGET}
+        } else {
+            message("Skipping GStreamer Framework")
+        }
         # We cd to release directory so we can run macdeployqt without a path to the
         # qgroundcontrol.app file. If you specify a path to the .app file the symbolic
         # links to plugins will not be created correctly.
@@ -27,7 +40,6 @@ installer {
         QMAKE_POST_LINK += && cd ..
         QMAKE_POST_LINK += && hdiutil create -layout SPUD -srcfolder $${DESTDIR}/qgroundcontrol.app -volname QGroundControl $${DESTDIR}/qgroundcontrol.dmg
     }
-
     WindowsBuild {
 		# The pdb moving command are commented out for now since we are including the .pdb in the installer. This makes it much
 		# easier to debug user crashes.

QGCSetup.pri

@@ -55,9 +55,10 @@ WindowsBuild {
 #
 
 MacBuild {
+
 	# Copy non-standard libraries and frameworks into app package
     QMAKE_POST_LINK += && $$QMAKE_COPY_DIR $$BASEDIR/libs/lib/mac64/lib $$DESTDIR/$${TARGET}.app/Contents/libs
-    QMAKE_POST_LINK += && $$QMAKE_COPY_DIR -L $$BASEDIR/libs/lib/Frameworks $$DESTDIR/$${TARGET}.app/Contents
+    QMAKE_POST_LINK += && rsync -a --delete $$BASEDIR/libs/lib/Frameworks $$DESTDIR/$${TARGET}.app/Contents/
 
 	# Fix library paths inside executable
 

src/QGCApplication.cc

@@ -141,6 +141,11 @@ static QObject* mavManagerSingletonFactory(QQmlEngine*, QJSEngine*)
  * @param argv The string array of parameters
  **/
 
+static void qgcputenv(const QString& key, const QString& root, const QString& path)
+{
+    QString value = root + path;
+    qputenv(key.toStdString().c_str(), QByteArray(value.toStdString().c_str()));
+}
 
 QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
     : QApplication(argc, argv)
@@ -266,8 +271,28 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
 
     //----------------------------------------------------------------
     //-- Video Streaming
+#if defined(QGC_GST_STREAMING)
+#ifdef Q_OS_MAC
+#ifndef __ios__
+    QString currentDir = QCoreApplication::applicationDirPath();
+    qgcputenv("GST_PLUGIN_SCANNER",           currentDir, "/gst-plugin-scanner");
+    qgcputenv("GTK_PATH",                     currentDir, "/../Frameworks/GStreamer.framework/Versions/Current");
+    qgcputenv("GIO_EXTRA_MODULES",            currentDir, "/../Frameworks/GStreamer.framework/Versions/Current/lib/gio/modules");
+    qgcputenv("GST_PLUGIN_SYSTEM_PATH_1_0",   currentDir, "/../Frameworks/GStreamer.framework/Versions/Current/lib/gstreamer-1.0");
+    qgcputenv("GST_PLUGIN_SYSTEM_PATH",       currentDir, "/../Frameworks/GStreamer.framework/Versions/Current/lib/gstreamer-1.0");
+    qgcputenv("GST_PLUGIN_PATH_1_0",          currentDir, "/../Frameworks/GStreamer.framework/Versions/Current/lib/gstreamer-1.0");
+    qgcputenv("GST_PLUGIN_PATH",              currentDir, "/../Frameworks/GStreamer.framework/Versions/Current/lib/gstreamer-1.0");
+//    QStringList env = QProcessEnvironment::systemEnvironment().keys();
+//    foreach(QString key, env) {
+//        qDebug() << key << QProcessEnvironment::systemEnvironment().value(key);
+//    }
+#endif
+#endif
+#endif
+
     qmlRegisterType<VideoItem>("QGroundControl.QgcQtGStreamer", 1, 0, "VideoItem");
     qmlRegisterUncreatableType<VideoSurface>("QGroundControl.QgcQtGStreamer", 1, 0, "VideoSurface", QLatin1String("VideoSurface from QML is not supported"));
+
 #if defined(QGC_GST_STREAMING)
     GError* error = NULL;
     if (!gst_init_check(&argc, &argv, &error)) {

src/VideoStreaming/VideoReceiver.cc

@@ -87,34 +87,41 @@ void VideoReceiver::start()
 
     do {
         if ((_pipeline = gst_pipeline_new("receiver")) == NULL) {
+            qCritical() << "VideoReceiver::start() failed. Error with gst_pipeline_new()";
             break;
         }
 
         if ((dataSource = gst_element_factory_make("udpsrc", "udp-source")) == NULL) {
+            qCritical() << "VideoReceiver::start() failed. Error with gst_element_factory_make('udpsrc')";
             break;
         }
 
         if ((caps = gst_caps_from_string("application/x-rtp, media=(string)video, clock-rate=(int)90000, encoding-name=(string)H264")) == NULL) {
+            qCritical() << "VideoReceiver::start() failed. Error with gst_caps_from_string()";
             break;
         }
 
         g_object_set(G_OBJECT(dataSource), "uri", qPrintable(_uri), "caps", caps, NULL);
 
         if ((demux = gst_element_factory_make("rtph264depay", "rtp-h264-depacketizer")) == NULL) {
+            qCritical() << "VideoReceiver::start() failed. Error with gst_element_factory_make('rtph264depay')";
             break;
         }
 
         if ((parser = gst_element_factory_make("h264parse", "h264-parser")) == NULL) {
+            qCritical() << "VideoReceiver::start() failed. Error with gst_element_factory_make('h264parse')";
             break;
         }
 
         if ((decoder = gst_element_factory_make("avdec_h264", "h264-decoder")) == NULL) {
+            qCritical() << "VideoReceiver::start() failed. Error with gst_element_factory_make('avdec_h264')";
             break;
         }
 
         gst_bin_add_many(GST_BIN(_pipeline), dataSource, demux, parser, decoder, _videoSink, NULL);
 
         if (gst_element_link_many(dataSource, demux, parser, decoder, _videoSink, NULL) != (gboolean)TRUE) {
+            qCritical() << "VideoReceiver::start() failed. Error with gst_element_link_many()";
             break;
         }
 

src/VideoStreaming/VideoStreaming.pri

@@ -27,15 +27,13 @@
 LinuxBuild {
     CONFIG += link_pkgconfig
     packagesExist(gstreamer-1.0) {
-        message("Including support for video streaming")
         PKGCONFIG   += gstreamer-1.0  gstreamer-video-1.0
         CONFIG      += VideoEnabled
     }
 } else:MacBuild {
     #- gstreamer framework installed by the gstreamer devel installer
     GST_ROOT = /Library/Frameworks/GStreamer.framework
     exists($$GST_ROOT) {
-        message("Including support for video streaming")
         CONFIG      += VideoEnabled
         INCLUDEPATH += $$GST_ROOT/Headers
         LIBS        += -F/Library/Frameworks -framework GStreamer
@@ -44,7 +42,6 @@ LinuxBuild {
     #- gstreamer framework installed by the gstreamer iOS SDK installer (default to home directory)
     GST_ROOT = $$(HOME)/Library/Developer/GStreamer/iPhone.sdk/GStreamer.framework
     exists($$GST_ROOT) {
-        message("Including support for video streaming")
         CONFIG      += VideoEnabled
         INCLUDEPATH += $$GST_ROOT/Headers
         LIBS        += -F$$(HOME)/Library/Developer/GStreamer/iPhone.sdk -framework GStreamer
@@ -53,7 +50,6 @@ LinuxBuild {
     #- gstreamer installed by default under c:/gstreamer
     GST_ROOT = c:/gstreamer/1.0/x86
     exists($$GST_ROOT) {
-        message("Including support for video streaming")
         CONFIG      += VideoEnabled
         LIBS        += -L$$GST_ROOT/lib/gstreamer-1.0/static -lgstreamer-1.0 -lgstvideo-1.0 -lgstbase-1.0
         LIBS        += -L$$GST_ROOT/lib -lglib-2.0 -lintl -lgobject-2.0
@@ -67,6 +63,8 @@ LinuxBuild {
 
 VideoEnabled {
 
+    message("Including support for video streaming")
+
     DEFINES += \
         QGC_GST_STREAMING \
         GST_PLUGIN_BUILD_STATIC \
@@ -123,6 +121,25 @@ VideoEnabled {
         $$PWD/gstqtvideosink/utils/utils.cpp \
 
 } else {
-    message("Skipping support for video streaming (Unsupported platform)")
+    LinuxBuild|MacBuild|iOSBuild|WindowsBuild {
+        message("Skipping support for video streaming (GStreamer libraries not installed)")
+        MacBuild {
+            message("  You can download it from http://gstreamer.freedesktop.org/data/pkg/osx/")
+            message("  Select the devel package and install it (gstreamer-1.0-devel-1.x.x-x86_64.pkg)")
+            message("  It will be installed in /Libraries/Frameworks")
+        }
+        LinuxBuild {
+            message("  You can install it using apt-get")
+            message("  sudo apt-get install gstreamer1.0*")
+            message("  sudo apt-get install libgstreamer1.0*")
+        }
+        WindowsBuild {
+            message("  You can download it from http://gstreamer.freedesktop.org/data/pkg/windows/")
+            message("  Select the devel AND runtime packages and install them (x86, not the 64-Bit)")
+            message("  It will be installed in C:/gstreamer. You need to update you PATH to point to the bin directory.")
+        }
+    } else {
+        message("Skipping support for video streaming (Unsupported platform)")
+    }
 }
 

src/main.cc

@@ -28,12 +28,13 @@ This file is part of the QGROUNDCONTROL project
  *
  */
 
+#include <QtGlobal>
 #include <QApplication>
 #include <QSslSocket>
 #ifndef __mobile__
 #include <QSerialPortInfo>
 #endif
-
+#include <QProcessEnvironment>
 #include "QGCApplication.h"
 #include "MainWindow.h"
 #include "configuration.h"