Simple boot test now verifies gstreamer

Author: DonLakeFlyer

src/QGCApplication.cc

@@ -102,9 +102,10 @@ static QObject *mavlinkSingletonFactory(QQmlEngine*, QJSEngine*)
     return new QGCMAVLink();
 }
 
-QGCApplication::QGCApplication(int &argc, char *argv[], bool unitTesting)
+QGCApplication::QGCApplication(int &argc, char *argv[], bool unitTesting, bool simpleBootTest)
     : QApplication(argc, argv)
     , _runningUnitTests(unitTesting)
+    , _simpleBootTest(simpleBootTest)
 {
     _msecsElapsedTime.start();
 
@@ -135,7 +136,7 @@ QGCApplication::QGCApplication(int &argc, char *argv[], bool unitTesting)
 
     // Set application information
     QString applicationName;
-    if (_runningUnitTests) {
+    if (_runningUnitTests || simpleBootTest) {
         // We don't want unit tests to use the same QSettings space as the normal app. So we tweak the app
         // name. Also we want to run unit tests with clean settings every time.
         applicationName = QStringLiteral("%1_unittest").arg(QGC_APP_NAME);
@@ -168,7 +169,7 @@ QGCApplication::QGCApplication(int &argc, char *argv[], bool unitTesting)
     // The setting will delete all settings on this boot
     fClearSettingsOptions |= settings.contains(_deleteAllSettingsKey);
 
-    if (_runningUnitTests) {
+    if (_runningUnitTests || simpleBootTest) {
         // Unit tests run with clean settings
         fClearSettingsOptions = true;
     }
@@ -324,20 +325,30 @@ void QGCApplication::init()
         qCWarning(QGCApplicationLog) << "Could not load /fonts/opensans-demibold font";
     }
 
-    if (!_runningUnitTests) {
+    if (_simpleBootTest) {
+        // Since GStream builds are so problematic we initialize video during the simple boot test
+        // to make sure it works and verfies plugin availability.
+        _initVideo();
+    } else if (!_runningUnitTests) {
         _initForNormalAppBoot();
     }
 }
 
-void QGCApplication::_initForNormalAppBoot()
+void QGCApplication::_initVideo()
 {
 #ifdef QGC_GST_STREAMING
     // Gstreamer video playback requires OpenGL
     QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
 #endif
 
-    QGCCorePlugin::instance(); // CorePlugin must be initialized before VideoManager for Video Cleanup
-    VideoManager::instance(); // GStreamer must be initialized before QmlEngine
+    QGCCorePlugin::instance();  // CorePlugin must be initialized before VideoManager for Video Cleanup
+    VideoManager::instance(); 
+    _videoManagerInitialized = true;
+}
+
+void QGCApplication::_initForNormalAppBoot()
+{
+    _initVideo(); // GStreamer must be initialized before QmlEngine
 
     QQuickStyle::setStyle("Basic");
     QGCCorePlugin::instance()->init();
@@ -747,7 +758,9 @@ void QGCApplication::shutdown()
 {
     qCDebug(QGCApplicationLog) << "Exit";
 
-    VideoManager::instance()->cleanup();
+    if (_videoManagerInitialized) {
+        VideoManager::instance()->cleanup();
+    }
 
     // This is bad, but currently qobject inheritances are incorrect and cause crashes on exit without
     delete _qmlAppEngine;

src/QGCApplication.h

@@ -48,7 +48,7 @@ class QGCApplication : public QApplication
     /// Unit Test have access to creating and destroying singletons
     friend class UnitTest;
 public:
-    QGCApplication(int &argc, char *argv[], bool unitTesting);
+    QGCApplication(int &argc, char *argv[], bool unitTesting, bool simpleBootTest);
     ~QGCApplication();
 
     /// Sets the persistent flag to delete all settings the next time QGroundControl is started.
@@ -57,8 +57,8 @@ class QGCApplication : public QApplication
     /// Clears the persistent flag to delete all settings the next time QGroundControl is started.
     void clearDeleteAllSettingsNextBoot();
 
-    /// Returns true if unit tests are being run
     bool runningUnitTests() const { return _runningUnitTests; }
+    bool simpleBootTest() const { return _simpleBootTest; }
 
     /// Returns true if Qt debug output should be logged to a file
     bool logOutput() const { return _logOutput; }
@@ -128,13 +128,16 @@ private slots:
 private:
     bool compressEvent(QEvent *event, QObject *receiver, QPostEventList *postedEvents) final;
 
+    void _initVideo();
+    
     /// Initialize the application for normal application boot. Or in other words we are not going to run unit tests.
     void _initForNormalAppBoot();
 
     QObject *_rootQmlObject();
     void _checkForNewVersion();
 
-    bool _runningUnitTests = false;                                         ///< true: running unit tests, false: normal app
+    bool _runningUnitTests = false;
+    bool _simpleBootTest = false; 
     static constexpr int _missingParamsDelayedDisplayTimerTimeout = 1000;   ///< Timeout to wait for next missing fact to come in before display
     QTimer _missingParamsDelayedDisplayTimer;                               ///< Timer use to delay missing fact display
     QList<QPair<int,QString>> _missingParams;                               ///< List of missing parameter component id:name
@@ -153,6 +156,7 @@ private slots:
     bool _error = false;
     bool _showErrorsInToolbar = false;
     QElapsedTimer _msecsElapsedTime;
+    bool _videoManagerInitialized = false;
 
     QList<QPair<QString /* title */, QString /* message */>> _delayedAppMessages;
 

src/VideoManager/VideoReceiver/GStreamer/GStreamer.cc

@@ -13,6 +13,7 @@
 #include "QGCLoggingCategory.h"
 #include "SettingsManager.h"
 #include "VideoSettings.h"
+#include "QGCApplication.h"
 #ifdef Q_OS_IOS
 #include "gst_ios_init.h"
 #endif
@@ -313,6 +314,10 @@ bool initialize()
 
     if (!_verifyPlugins()) {
         qCCritical(GStreamerLog) << "Failed to Init GStreamer Plugins";
+        if (qgcApp()->simpleBootTest()) {
+            qCCritical(GStreamerLog) << "Exiting out of simple boot test due to failed plugin verification";
+            exit(1);
+        }
         return false;
     }
 

src/main.cc

@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
 #endif
 
     bool runUnitTests = false;
-    bool simpleBootTest = false;
+    bool simpleBootTest = true;
 
 #ifdef QT_DEBUG
     // We parse a small set of command line options here prior to QGCApplication in order to handle the ones
@@ -174,7 +174,7 @@ int main(int argc, char *argv[])
     ParseCmdLineOptions(argc, argv, rgCmdLineOptions, std::size(rgCmdLineOptions), false);
 #endif // QT_DEBUG
 
-    QGCApplication app(argc, argv, runUnitTests || simpleBootTest);
+    QGCApplication app(argc, argv, runUnitTests, simpleBootTest);
 
 #ifdef Q_OS_LINUX
 #ifndef Q_OS_ANDROID