Browse Source

Merge pull request #8269 from tcanabrava/remove_unused_gstreamer_code

Remove unused function
QGC4.4
Gus Grubba 5 years ago committed by GitHub
parent
commit
76b6b9dee8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/QGCApplication.cc
  2. 16
      src/VideoStreaming/VideoStreaming.cc
  3. 2
      src/VideoStreaming/VideoStreaming.h

1
src/QGCApplication.cc

@ -455,7 +455,6 @@ void QGCApplication::_shutdown() @@ -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;
}

16
src/VideoStreaming/VideoStreaming.cc

@ -173,19 +173,3 @@ void initializeVideoStreaming(int &argc, char* argv[], char* logpath, char* debu @@ -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
*/
}

2
src/VideoStreaming/VideoStreaming.h

@ -17,5 +17,5 @@ @@ -17,5 +17,5 @@
#pragma once
extern void initializeVideoStreaming (int &argc, char *argv[], char* filename, char* debuglevel);
extern void shutdownVideoStreaming ();

Loading…
Cancel
Save