Video: Add QtMultimedia Receiver

qgroundcontrol.pro

@@ -1222,19 +1222,19 @@ contains (CONFIG, DISABLE_VIDEOSTREAMING) {
  QT += \
  opengl \
  gui-private
- include(src/VideoReceiver/VideoReceiver.pri)
+ include(src/VideoManager/VideoReceiver/VideoReceiver.pri)
 }
 
 !VideoEnabled {
  INCLUDEPATH += \
- src/VideoReceiver
+ src/VideoManager/VideoReceiver
 
  HEADERS += \
- src/VideoManager/GLVideoItemStub.h \
- src/VideoReceiver/VideoReceiver.h
+ src/VideoManager/VideoReceiver/GStreamer/GLVideoItemStub.h \
+ src/VideoManager/VideoReceiver/VideoReceiver.h
 
  SOURCES += \
- src/VideoManager/GLVideoItemStub.cc
+ src/VideoManager/VideoReceiver/GStreamer/GLVideoItemStub.cc
 }
 
 #-------------------------------------------------------------------------------------

src/API/QGCCorePlugin.cc

@@ -19,8 +19,8 @@
 #include "JoystickManager.h"
 #if defined(QGC_GST_STREAMING)
 #include "GStreamer.h"
-#include "VideoReceiver.h"
 #endif
+#include "VideoReceiver.h"
 #include "HorizontalFactValueGrid.h"
 #include "InstrumentValueData.h"
 #include "QGCLoggingCategory.h"
@@ -333,8 +333,7 @@ VideoReceiver* QGCCorePlugin::createVideoReceiver(QObject* parent)
 #if defined(QGC_GST_STREAMING)
  return GStreamer::createVideoReceiver(parent);
 #else
- Q_UNUSED(parent)
- return nullptr;
+ return QtMultimediaReceiver::createVideoReceiver(parent);
 #endif
 }
 
@@ -343,9 +342,7 @@ void* QGCCorePlugin::createVideoSink(QObject* parent, QQuickItem* widget)
 #if defined(QGC_GST_STREAMING)
  return GStreamer::createVideoSink(parent, widget);
 #else
- Q_UNUSED(parent)
- Q_UNUSED(widget)
- return nullptr;
+ return QtMultimediaReceiver::createVideoSink(parent, widget);
 #endif
 }
 
@@ -354,7 +351,7 @@ void QGCCorePlugin::releaseVideoSink(void* sink)
 #if defined(QGC_GST_STREAMING)
  GStreamer::releaseVideoSink(sink);
 #else
- Q_UNUSED(sink)
+ QtMultimediaReceiver::releaseVideoSink(sink);
 #endif
 }
 

src/CMakeLists.txt

@@ -49,7 +49,6 @@ add_subdirectory(UTMSP)
 add_subdirectory(Vehicle)
 add_subdirectory(VehicleSetup)
 add_subdirectory(VideoManager)
-add_subdirectory(VideoReceiver)
 add_subdirectory(Viewer3D)
 
 #######################################################

src/QGCApplication.cc

@@ -28,10 +28,6 @@
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlApplicationEngine>
 
-#if defined(QGC_GST_STREAMING)
-#include "GStreamer.h"
-#endif
-
 #include "QGCConfig.h"
 #include "QGCApplication.h"
 #include "CmdLineOptParser.h"
@@ -242,16 +238,6 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
  // Set up our logging filters
  QGCLoggingCategoryRegister::instance()->setFilterRulesFromSettings(loggingOptions);
 
-#if defined(QGC_GST_STREAMING)
- // Gstreamer debug settings
- int gstDebugLevel = 0;
- if (settings.contains(AppSettings::gstDebugLevelName)) {
- gstDebugLevel = settings.value(AppSettings::gstDebugLevelName).toInt();
- }
- // Initialize Video Receiver
- GStreamer::initialize(argc, argv, gstDebugLevel);
-#endif
-
  // We need to set language as early as possible prior to loading on JSON files.
  setLanguage();
 

src/Settings/CMakeLists.txt

@@ -51,6 +51,7 @@ target_link_libraries(Settings
  API
  QmlControls
  Vehicle
+ VideoReceiver
  PUBLIC
  Qt6::Core
  Qt6::Qml

src/Vehicle/Vehicle.cc

@@ -48,7 +48,6 @@
 #include "VehicleBatteryFactGroup.h"
 #include "VehicleObjectAvoidance.h"
 #include "VideoManager.h"
-#include "VideoReceiver.h"
 #include "VideoSettings.h"
 
 #ifdef CONFIG_UTM_ADAPTER
@@ -1474,11 +1473,9 @@ void Vehicle::_updateArmed(bool armed)
  _trajectoryPoints->stop();
  _flightTimerStop();
  // Also handle Video Streaming
- if(qgcApp()->toolbox()->videoManager()->videoReceiver()) {
- if(_settingsManager->videoSettings()->disableWhenDisarmed()->rawValue().toBool()) {
- _settingsManager->videoSettings()->streamEnabled()->setRawValue(false);
- qgcApp()->toolbox()->videoManager()->videoReceiver()->stop();
- }
+ if(_settingsManager->videoSettings()->disableWhenDisarmed()->rawValue().toBool()) {
+ _settingsManager->videoSettings()->streamEnabled()->setRawValue(false);
+ qgcApp()->toolbox()->videoManager()->stopVideo();
  }
  }
  }

src/VideoManager/CMakeLists.txt

@@ -1,8 +1,8 @@
-find_package(Qt6 REQUIRED COMPONENTS Core Quick)
+add_subdirectory(VideoReceiver)
+
+find_package(Qt6 REQUIRED COMPONENTS Core)
 
 qt_add_library(VideoManager STATIC
- GLVideoItemStub.cc
- GLVideoItemStub.h
  SubtitleWriter.cc
  SubtitleWriter.h
  VideoManager.cc
@@ -14,23 +14,16 @@ target_link_libraries(VideoManager
  API
  Camera
  FactSystem
+ GStreamerReceiver
  QmlControls
+ QtMultimediaReceiver
  Settings
  Utilities
  Vehicle
+ VideoReceiver
  PUBLIC
  Qt6::Core
- Qt6::Quick
  QGC
- VideoReceiver
 )
 
-option(QGC_DISABLE_UVC "Disable UVC Devices" OFF)
-if(QGC_DISABLE_UVC)
- target_compile_definitions(VideoManager PUBLIC QGC_DISABLE_UVC)
-else()
- find_package(Qt6 REQUIRED COMPONENTS Multimedia)
- target_link_libraries(VideoManager PRIVATE Qt6::Multimedia)
-endif()
-
 target_include_directories(VideoManager PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

src/VideoManager/SubtitleWriter.cc

@@ -26,15 +26,17 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QString>
 #include <QtCore/QFileInfo>
+#include <QtCore/QTimer>
 
 QGC_LOGGING_CATEGORY(SubtitleWriterLog, "SubtitleWriterLog")
 
 const int SubtitleWriter::_sampleRate = 1; // Sample rate in Hz for getting telemetry data, most players do weird stuff when > 1Hz
 
 SubtitleWriter::SubtitleWriter(QObject* parent)
  : QObject(parent)
+ , _timer(new QTimer(this))
 {
- connect(&_timer, &QTimer::timeout, this, &SubtitleWriter::_captureTelemetry);
+ connect(_timer, &QTimer::timeout, this, &SubtitleWriter::_captureTelemetry);
 }
 
 void SubtitleWriter::startCapturingTelemetry(const QString& videoFile)
@@ -93,13 +95,13 @@ void SubtitleWriter::startCapturingTelemetry(const QString& videoFile)
  // TODO: Find a good way to input title
  //stream << QStringLiteral("Dialogue: 0,0:00:00.00,999:00:00.00,Default,,0,0,0,,{\\pos(5,35)}%1\n");
 
- _timer.start(1000/_sampleRate);
+ _timer->start(1000/_sampleRate);
 }
 
 void SubtitleWriter::stopCapturingTelemetry()
 {
  qCDebug(SubtitleWriterLog) << "Stopping writing";
- _timer.stop();
+ _timer->stop();
  _file.close();
 }
 

src/VideoManager/SubtitleWriter.h

@@ -17,12 +17,12 @@
 #pragma once
 
 #include <QtCore/QObject>
-#include <QtCore/QTimer>
 #include <QtCore/QTime>
 #include <QtCore/QFile>
 #include <QtCore/QLoggingCategory>
 
 class Fact;
+class QTimer;
 
 Q_DECLARE_LOGGING_CATEGORY(SubtitleWriterLog)
 
@@ -43,7 +43,7 @@ private slots:
  void _captureTelemetry();
 
 private:
- QTimer _timer;
+ QTimer* _timer = nullptr;
  QList<Fact*> _facts;
  QTime _lastEndTime;
  QFile _file;