Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
76b6b9de
Unverified
Commit
76b6b9de
authored
Feb 04, 2020
by
Gus Grubba
Committed by
GitHub
Feb 04, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8269 from tcanabrava/remove_unused_gstreamer_code
Remove unused function
parents
036e7a96
09b86a77
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
18 deletions
+1
-18
QGCApplication.cc
src/QGCApplication.cc
+0
-1
VideoStreaming.cc
src/VideoStreaming/VideoStreaming.cc
+0
-16
VideoStreaming.h
src/VideoStreaming/VideoStreaming.h
+1
-1
No files found.
src/QGCApplication.cc
View file @
76b6b9de
...
...
@@ -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
;
}
...
...
src/VideoStreaming/VideoStreaming.cc
View file @
76b6b9de
...
...
@@ -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
*/
}
src/VideoStreaming/VideoStreaming.h
View file @
76b6b9de
...
...
@@ -17,5 +17,5 @@
#pragma once
extern
void
initializeVideoStreaming
(
int
&
argc
,
char
*
argv
[],
char
*
filename
,
char
*
debuglevel
);
extern
void
shutdownVideoStreaming
();
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment