zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #5386 from mavlink/defaultVideo 

Set default video streaming to Disabled.
QGC4.4
Gus Grubba 8 years ago committed by GitHub
parent
851aeb314d 9b74e3df5b
commit
ebda2a1215
5 changed files with 23 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/FlightDisplay/VideoManager.cc
  2. 15
      src/Settings/VideoSettings.cc
  3. 1
      src/Settings/VideoSettings.h
  4. 7
      src/VideoStreaming/VideoReceiver.cc
  5. 12
      src/ui/preferences/GeneralSettings.qml

7
src/FlightDisplay/VideoManager.cc
Unescape View File

@ -114,11 +114,8 @@ VideoManager::_rtspUrlChanged() @@ -114,11 +114,8 @@ VideoManager::_rtspUrlChanged()
bool
VideoManager::hasVideo()
{
#if defined(QGC_GST_STREAMING)
return true;
#endif
QString videoSource = _videoSettings->videoSource()->rawValue().toString();
return !videoSource.isEmpty() && videoSource != VideoSettings::videoSourceNoVideo;
return !videoSource.isEmpty() && videoSource != VideoSettings::videoSourceNoVideo && videoSource != VideoSettings::videoDisabled;
}
//-----------------------------------------------------------------------------
@ -150,7 +147,7 @@ VideoManager::_updateSettings() @@ -150,7 +147,7 @@ VideoManager::_updateSettings()
return;
if (_videoSettings->videoSource()->rawValue().toString() == VideoSettings::videoSourceUDP)
_videoReceiver->setUri(QStringLiteral("udp://0.0.0.0:%1").arg(_videoSettings->udpPort()->rawValue().toInt()));
else
else if (_videoSettings->videoSource()->rawValue().toString() == VideoSettings::videoSourceRTSP)
_videoReceiver->setUri(_videoSettings->rtspUrl()->rawValue().toString());
}

15
src/Settings/VideoSettings.cc
Unescape View File

@ -29,6 +29,7 @@ const char* VideoSettings::recordingFormatName = "RecordingFormat"; @@ -29,6 +29,7 @@ const char* VideoSettings::recordingFormatName = "RecordingFormat";
const char* VideoSettings::maxVideoSizeName = "MaxVideoSize";
const char* VideoSettings::videoSourceNoVideo = "No Video Available";
const char* VideoSettings::videoDisabled = "Video Stream Disabled";
const char* VideoSettings::videoSourceUDP = "UDP Video Stream";
const char* VideoSettings::videoSourceRTSP = "RTSP Video Stream";
@ -47,6 +48,7 @@ VideoSettings::VideoSettings(QObject* parent) @@ -47,6 +48,7 @@ VideoSettings::VideoSettings(QObject* parent)
qmlRegisterUncreatableType<VideoSettings>("QGroundControl.SettingsManager", 1, 0, "VideoSettings", "Reference only");
// Setup enum values for videoSource settings into meta data
bool noVideo = false;
QStringList videoSourceList;
#ifdef QGC_GST_STREAMING
#ifndef NO_UDP_VIDEO
@ -61,7 +63,10 @@ VideoSettings::VideoSettings(QObject* parent) @@ -61,7 +63,10 @@ VideoSettings::VideoSettings(QObject* parent)
}
#endif
if (videoSourceList.count() == 0) {
noVideo = true;
videoSourceList.append(videoSourceNoVideo);
} else {
videoSourceList.insert(0, videoDisabled);
}
QVariantList videoSourceVarList;
foreach (const QString& videoSource, videoSourceList) {
@ -70,11 +75,11 @@ VideoSettings::VideoSettings(QObject* parent) @@ -70,11 +75,11 @@ VideoSettings::VideoSettings(QObject* parent)
_nameToMetaDataMap[videoSourceName]->setEnumInfo(videoSourceList, videoSourceVarList);
// Set default value for videoSource
#if defined(NO_UDP_VIDEO)
_nameToMetaDataMap[videoSourceName]->setRawDefaultValue(videoSourceRTSP);
#else
_nameToMetaDataMap[videoSourceName]->setRawDefaultValue(videoSourceUDP);
#endif
if (noVideo) {
_nameToMetaDataMap[videoSourceName]->setRawDefaultValue(videoSourceNoVideo);
} else {
_nameToMetaDataMap[videoSourceName]->setRawDefaultValue(videoDisabled);
}
}
Fact* VideoSettings::videoSource(void)

1
src/Settings/VideoSettings.h
Unescape View File

@ -49,6 +49,7 @@ public: @@ -49,6 +49,7 @@ public:
static const char* maxVideoSizeName;
static const char* videoSourceNoVideo;
static const char* videoDisabled;
static const char* videoSourceUDP;
static const char* videoSourceRTSP;

7
src/VideoStreaming/VideoReceiver.cc
Unescape View File

@ -220,10 +220,11 @@ VideoReceiver::start() @@ -220,10 +220,11 @@ VideoReceiver::start()
_starting = true;
bool isUdp = _uri.contains("udp://");
bool isUdp = _uri.contains("udp://");
bool isRtsp = _uri.contains("rtsp://");
//-- For RTSP, check to see if server is there first
if(!_serverPresent && !isUdp) {
if(!_serverPresent && isRtsp) {
_timer.start(100);
return;
}
@ -776,7 +777,7 @@ VideoReceiver::_updateTimer() @@ -776,7 +777,7 @@ VideoReceiver::_updateTimer()
stop();
}
} else {
if(!running()) {
if(!running() && !_uri.isEmpty()) {
start();
}
}

12
src/ui/preferences/GeneralSettings.qml
Unescape View File

@ -529,7 +529,7 @@ QGCView { @@ -529,7 +529,7 @@ QGCView {
}
Row {
spacing: ScreenTools.defaultFontPixelWidth
visible: QGroundControl.settingsManager.videoSettings.udpPort.visible && QGroundControl.videoManager.isGStreamer && videoSource.currentIndex === 0
visible: QGroundControl.settingsManager.videoSettings.udpPort.visible && QGroundControl.videoManager.isGStreamer && videoSource.currentIndex === 1
QGCLabel {
text: qsTr("UDP Port:")
width: _labelWidth
@ -543,7 +543,7 @@ QGCView { @@ -543,7 +543,7 @@ QGCView {
}
Row {
spacing: ScreenTools.defaultFontPixelWidth
visible: QGroundControl.settingsManager.videoSettings.rtspUrl.visible && QGroundControl.videoManager.isGStreamer && videoSource.currentIndex === 1
visible: QGroundControl.settingsManager.videoSettings.rtspUrl.visible && QGroundControl.videoManager.isGStreamer && videoSource.currentIndex === 2
QGCLabel {
anchors.verticalCenter: parent.verticalCenter
text: qsTr("RTSP URL:")
@ -557,7 +557,7 @@ QGCView { @@ -557,7 +557,7 @@ QGCView {
}
Row {
spacing: ScreenTools.defaultFontPixelWidth
visible: QGroundControl.videoManager.isGStreamer && videoSource.currentIndex < 2 && QGroundControl.settingsManager.videoSettings.aspectRatio.visible
visible: QGroundControl.videoManager.isGStreamer && videoSource.currentIndex && videoSource.currentIndex < 3 && QGroundControl.settingsManager.videoSettings.aspectRatio.visible
QGCLabel {
text: qsTr("Aspect Ratio:")
width: _labelWidth
@ -571,7 +571,7 @@ QGCView { @@ -571,7 +571,7 @@ QGCView {
}
Row {
spacing: ScreenTools.defaultFontPixelWidth
visible: QGroundControl.videoManager.isGStreamer && videoSource.currentIndex < 2 && QGroundControl.settingsManager.videoSettings.gridLines.visible
visible: QGroundControl.videoManager.isGStreamer && videoSource.currentIndex && videoSource.currentIndex < 3 && QGroundControl.settingsManager.videoSettings.gridLines.visible
QGCLabel {
text: qsTr("Grid Lines:")
width: _labelWidth
@ -613,7 +613,7 @@ QGCView { @@ -613,7 +613,7 @@ QGCView {
anchors.centerIn: parent
Row {
spacing: ScreenTools.defaultFontPixelWidth
visible: QGroundControl.videoManager.isGStreamer && videoSource.currentIndex < 2 && QGroundControl.settingsManager.videoSettings.maxVideoSize.visible
visible: QGroundControl.videoManager.isGStreamer && videoSource.currentIndex && videoSource.currentIndex < 3 && QGroundControl.settingsManager.videoSettings.maxVideoSize.visible
QGCLabel {
text: qsTr("Max Storage Usage:")
width: _labelWidth
@ -627,7 +627,7 @@ QGCView { @@ -627,7 +627,7 @@ QGCView {
}
Row {
spacing: ScreenTools.defaultFontPixelWidth
visible: QGroundControl.videoManager.isGStreamer && videoSource.currentIndex < 2 && QGroundControl.settingsManager.videoSettings.recordingFormat.visible
visible: QGroundControl.videoManager.isGStreamer && videoSource.currentIndex && videoSource.currentIndex < 3 && QGroundControl.settingsManager.videoSettings.recordingFormat.visible
QGCLabel {
text: qsTr("Video File Format:")
width: _labelWidth

Write Preview
Loading…
Cancel
Save