Browse Source

Video: added preset for Yuneec Mantis G

QGC4.4
AndKe 4 years ago committed by Lorenz Meier
parent
commit
45d35b02fc
  1. 2
      src/Settings/VideoSettings.cc
  2. 1
      src/Settings/VideoSettings.h
  3. 3
      src/VideoManager/VideoManager.cc

2
src/Settings/VideoSettings.cc

@ -28,6 +28,7 @@ const char* VideoSettings::videoSourceTCP = "TCP-MPEG2 Video Strea @@ -28,6 +28,7 @@ const char* VideoSettings::videoSourceTCP = "TCP-MPEG2 Video Strea
const char* VideoSettings::videoSourceMPEGTS = "MPEG-TS (h.264) Video Stream";
const char* VideoSettings::videoSource3DRSolo = "3DR Solo (requires restart)";
const char* VideoSettings::videoSourceParrotDiscovery = "Parrot Discovery";
const char* VideoSettings::videoSourceYuneecMantisG = "Yuneec Mantis G";
DECLARE_SETTINGGROUP(Video, "Video")
{
@ -45,6 +46,7 @@ DECLARE_SETTINGGROUP(Video, "Video") @@ -45,6 +46,7 @@ DECLARE_SETTINGGROUP(Video, "Video")
videoSourceList.append(videoSourceMPEGTS);
videoSourceList.append(videoSource3DRSolo);
videoSourceList.append(videoSourceParrotDiscovery);
videoSourceList.append(videoSourceYuneecMantisG);
#endif
#ifndef QGC_DISABLE_UVC
QList<QCameraInfo> cameras = QCameraInfo::availableCameras();

1
src/Settings/VideoSettings.h

@ -72,6 +72,7 @@ public: @@ -72,6 +72,7 @@ public:
static const char* videoSourceMPEGTS;
static const char* videoSource3DRSolo;
static const char* videoSourceParrotDiscovery;
static const char* videoSourceYuneecMantisG;
signals:
void streamConfiguredChanged (bool configured);

3
src/VideoManager/VideoManager.cc

@ -534,6 +534,7 @@ VideoManager::isGStreamer() @@ -534,6 +534,7 @@ VideoManager::isGStreamer()
videoSource == VideoSettings::videoSourceMPEGTS ||
videoSource == VideoSettings::videoSource3DRSolo ||
videoSource == VideoSettings::videoSourceParrotDiscovery ||
videoSource == VideoSettings::videoSourceYuneecMantisG ||
autoStreamConfigured();
#else
return false;
@ -692,6 +693,8 @@ VideoManager::_updateSettings(unsigned id) @@ -692,6 +693,8 @@ VideoManager::_updateSettings(unsigned id)
settingsChanged |= _updateVideoUri(0, QStringLiteral("udp://0.0.0.0:5600"));
else if (source == VideoSettings::videoSourceParrotDiscovery)
settingsChanged |= _updateVideoUri(0, QStringLiteral("udp://0.0.0.0:8888"));
else if (source == VideoSettings::videoSourceYuneecMantisG)
settingsChanged |= _updateVideoUri(0, QStringLiteral("rtsp://192.168.42.1:554/live"));
return settingsChanged;
}

Loading…
Cancel
Save