From 44e5dcabefcfb1db0e63e3a2519b3fb8166aa87d Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tcanabrava@kde.org>
Date: Mon, 3 Feb 2020 16:43:15 +0000
Subject: [PATCH] Record video with name

---
 src/FlightMap/Widgets/VideoPageWidget.qml | 11 ++++++++++-
 src/VideoStreaming/VideoReceiver.cc       | 17 +++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/FlightMap/Widgets/VideoPageWidget.qml b/src/FlightMap/Widgets/VideoPageWidget.qml
index 47bd8dc447..f835e896c1 100644
--- a/src/FlightMap/Widgets/VideoPageWidget.qml
+++ b/src/FlightMap/Widgets/VideoPageWidget.qml
@@ -108,6 +108,15 @@ Item {
             indexModel:         false
             Layout.alignment:   Qt.AlignHCenter
         }
+        QGCLabel {
+            text: qsTr("File Name");
+            visible: QGroundControl.videoManager.isGStreamer
+        }
+        TextField {
+            id: videoFileName
+            visible: QGroundControl.videoManager.isGStreamer
+            width: 100
+        }
         //-- Video Recording
         QGCLabel {
            text:            _recordingVideo ? qsTr("Stop Recording") : qsTr("Record Stream")
@@ -155,7 +164,7 @@ Item {
                         // reset blinking animation
                         recordBtnBackground.opacity = 1
                     } else {
-                        _videoReceiver.startRecording()
+                        _videoReceiver.startRecording(videoFileName.text)
                     }
                 }
             }
diff --git a/src/VideoStreaming/VideoReceiver.cc b/src/VideoStreaming/VideoReceiver.cc
index c1ee096ec0..2117ae5c48 100644
--- a/src/VideoStreaming/VideoReceiver.cc
+++ b/src/VideoStreaming/VideoReceiver.cc
@@ -1010,17 +1010,14 @@ VideoReceiver::startRecording(const QString &videoFile)
     //-- Disk usage maintenance
     _cleanupOldVideos();
 
-    if(videoFile.isEmpty()) {
-        QString savePath = qgcApp()->toolbox()->settingsManager()->appSettings()->videoSavePath();
-        if(savePath.isEmpty()) {
-            qgcApp()->showMessage(tr("Unabled to record video. Video save path must be specified in Settings."));
-            return;
-        }
-        _videoFile = savePath + "/" + QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss") + "." + kVideoExtensions[muxIdx];
-    } else {
-        _videoFile = videoFile;
+    QString savePath = qgcApp()->toolbox()->settingsManager()->appSettings()->videoSavePath();
+    if(savePath.isEmpty()) {
+        qgcApp()->showMessage(tr("Unabled to record video. Video save path must be specified in Settings."));
+        return;
     }
-
+    _videoFile = savePath + "/"
+                + (videoFile.isEmpty() ? QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss") : videoFile)
+                + "." + kVideoExtensions[muxIdx];
     qDebug() << "New video file:" << _videoFile;
 
     emit videoFileChanged();
-- 
GitLab