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
6e980ad9
Commit
6e980ad9
authored
Jun 05, 2017
by
Gus Grubba
Committed by
GitHub
Jun 05, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5255 from dogmaphobic/videoStreaming
Exclude method when not building with video streaming support.
parents
fb5e524c
e0b57ec9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
0 deletions
+7
-0
VideoReceiver.cc
src/VideoStreaming/VideoReceiver.cc
+7
-0
No files found.
src/VideoStreaming/VideoReceiver.cc
View file @
6e980ad9
...
...
@@ -27,6 +27,8 @@
QGC_LOGGING_CATEGORY
(
VideoReceiverLog
,
"VideoReceiverLog"
)
#if defined(QGC_GST_STREAMING)
static
const
char
*
kVideoExtensions
[]
=
{
"mkv"
,
...
...
@@ -43,6 +45,9 @@ static const char* kVideoMuxes[] =
#define NUM_MUXES (sizeof(kVideoMuxes) / sizeof(char*))
#endif
VideoReceiver
::
VideoReceiver
(
QObject
*
parent
)
:
QObject
(
parent
)
#if defined(QGC_GST_STREAMING)
...
...
@@ -461,6 +466,7 @@ gboolean VideoReceiver::_onBusMessage(GstBus* bus, GstMessage* msg, gpointer dat
}
#endif
#if defined(QGC_GST_STREAMING)
void
VideoReceiver
::
_cleanupOldVideos
()
{
QString
savePath
=
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
videoSettings
()
->
videoSavePath
()
->
rawValue
().
toString
();
...
...
@@ -493,6 +499,7 @@ void VideoReceiver::_cleanupOldVideos()
}
}
}
#endif
// When we finish our pipeline will look like this:
//
...
...
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