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
e7381f6c
Commit
e7381f6c
authored
Apr 18, 2018
by
Patrick J.P
Committed by
Patrick José Pereira
May 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VideoReceiver: Correct start and stop video functions
Signed-off-by:
Patrick José Pereira
<
patrickelectric@gmail.com
>
parent
ab2c2726
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
VideoManager.h
src/FlightDisplay/VideoManager.h
+1
-1
VideoReceiver.cc
src/VideoStreaming/VideoReceiver.cc
+5
-1
VideoReceiver.h
src/VideoStreaming/VideoReceiver.h
+1
-0
No files found.
src/FlightDisplay/VideoManager.h
View file @
e7381f6c
...
...
@@ -56,7 +56,7 @@ public:
// Override from QGCTool
void
setToolbox
(
QGCToolbox
*
toolbox
);
Q_INVOKABLE
void
startVideo
()
{
_videoReceiver
->
st
op
();};
Q_INVOKABLE
void
startVideo
()
{
_videoReceiver
->
st
art
();};
Q_INVOKABLE
void
stopVideo
()
{
_videoReceiver
->
stop
();};
signals:
...
...
src/VideoStreaming/VideoReceiver.cc
View file @
e7381f6c
...
...
@@ -218,6 +218,7 @@ VideoReceiver::start()
return
;
}
#if defined(QGC_GST_STREAMING)
_stop
=
false
;
qCDebug
(
VideoReceiverLog
)
<<
"start()"
;
if
(
_uri
.
isEmpty
())
{
...
...
@@ -433,6 +434,7 @@ void
VideoReceiver
::
stop
()
{
#if defined(QGC_GST_STREAMING)
_stop
=
true
;
qCDebug
(
VideoReceiverLog
)
<<
"stop()"
;
if
(
!
_streaming
)
{
_shutdownPipeline
();
...
...
@@ -870,9 +872,11 @@ VideoReceiver::_updateTimer()
}
if
(
elapsed
>
(
time_t
)
timeout
&&
_videoSurface
)
{
stop
();
// We want to start it back again with _updateTimer
_stop
=
false
;
}
}
else
{
if
(
!
running
()
&&
!
_uri
.
isEmpty
()
&&
_videoSettings
->
streamEnabled
()
->
rawValue
().
toBool
())
{
if
(
!
_stop
&&
!
running
()
&&
!
_uri
.
isEmpty
()
&&
_videoSettings
->
streamEnabled
()
->
rawValue
().
toBool
())
{
start
();
}
}
...
...
src/VideoStreaming/VideoReceiver.h
View file @
e7381f6c
...
...
@@ -114,6 +114,7 @@ private:
bool
_streaming
;
bool
_starting
;
bool
_stopping
;
bool
_stop
;
Sink
*
_sink
;
GstElement
*
_tee
;
...
...
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