From 09b86a778e6edd6152499f1aadde50c5b1e99192 Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tcanabraba@kde.org>
Date: Sat, 7 Dec 2019 15:50:44 +0000
Subject: [PATCH] Remove unused function
Every single line of this function is commented out, and the
documentation of GStreamer says that it's uneeded.
---
src/QGCApplication.cc | 1 -
src/VideoStreaming/VideoStreaming.cc | 16 ----------------
src/VideoStreaming/VideoStreaming.h | 2 +-
3 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 789b21b952..1cc523026b 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -455,7 +455,6 @@ void QGCApplication::_shutdown()
// Close out all Qml before we delete toolbox. This way we don't get all sorts of null reference complaints from Qml.
delete _qmlAppEngine;
- shutdownVideoStreaming();
delete _toolbox;
}
diff --git a/src/VideoStreaming/VideoStreaming.cc b/src/VideoStreaming/VideoStreaming.cc
index 82f807b364..ac17423dd4 100644
--- a/src/VideoStreaming/VideoStreaming.cc
+++ b/src/VideoStreaming/VideoStreaming.cc
@@ -173,19 +173,3 @@ void initializeVideoStreaming(int &argc, char* argv[], char* logpath, char* debu
qmlRegisterType<VideoItem> ("QGroundControl.QgcQtGStreamer", 1, 0, "VideoItem");
qmlRegisterUncreatableType<VideoSurface>("QGroundControl.QgcQtGStreamer", 1, 0, "VideoSurface", QStringLiteral("VideoSurface from QML is not supported"));
}
-
-void shutdownVideoStreaming()
-{
- /* From: http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-Gst.html#gst-deinit
- *
- * "It is normally not needed to call this function in a normal application as the resources will automatically
- * be freed when the program terminates. This function is therefore mostly used by testsuites and other memory
- * profiling tools."
- *
- * It's causing a hang on exit. It hangs while deleting some thread.
- *
-#if defined(QGC_GST_STREAMING)
- gst_deinit();
-#endif
- */
-}
diff --git a/src/VideoStreaming/VideoStreaming.h b/src/VideoStreaming/VideoStreaming.h
index 129c4816b7..9b4f1b7cdd 100644
--- a/src/VideoStreaming/VideoStreaming.h
+++ b/src/VideoStreaming/VideoStreaming.h
@@ -17,5 +17,5 @@
#pragma once
extern void initializeVideoStreaming (int &argc, char *argv[], char* filename, char* debuglevel);
-extern void shutdownVideoStreaming ();
+
--
GitLab