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
d040b949
Unverified
Commit
d040b949
authored
Feb 19, 2020
by
Gus Grubba
Committed by
GitHub
Feb 19, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8336 from andrewvoznytsa/pr-filesink-fix
MKV file recording fix
parents
dac7429b
625d3f47
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
147 additions
and
82 deletions
+147
-82
VideoReceiver.cc
src/VideoStreaming/VideoReceiver.cc
+145
-79
VideoReceiver.h
src/VideoStreaming/VideoReceiver.h
+2
-3
No files found.
src/VideoStreaming/VideoReceiver.cc
View file @
d040b949
This diff is collapsed.
Click to expand it.
src/VideoStreaming/VideoReceiver.h
View file @
d040b949
...
...
@@ -85,6 +85,7 @@ protected slots:
virtual
void
_updateTimer
();
#if defined(QGC_GST_STREAMING)
GstElement
*
_makeSource
(
const
QString
&
uri
);
GstElement
*
_makeFileSink
(
const
QString
&
videoFile
,
unsigned
format
);
virtual
void
_restart_timeout
();
virtual
void
_tcp_timeout
();
virtual
void
_connected
();
...
...
@@ -101,7 +102,6 @@ protected:
{
GstPad
*
teepad
;
GstElement
*
queue
;
GstElement
*
mux
;
GstElement
*
filesink
;
gboolean
removing
;
}
Sink
;
...
...
@@ -122,13 +122,12 @@ protected:
static
GstPadProbeReturn
_videoSinkProbe
(
GstPad
*
pad
,
GstPadProbeInfo
*
info
,
gpointer
user_data
);
static
GstPadProbeReturn
_keyframeWatch
(
GstPad
*
pad
,
GstPadProbeInfo
*
info
,
gpointer
user_data
);
virtual
void
_
detach
RecordingBranch
(
GstPadProbeInfo
*
info
);
virtual
void
_
unlink
RecordingBranch
(
GstPadProbeInfo
*
info
);
virtual
void
_shutdownRecordingBranch
();
virtual
void
_shutdownPipeline
();
virtual
void
_cleanupOldVideos
();
GstElement
*
_pipeline
;
GstElement
*
_pipelineStopRec
;
GstElement
*
_videoSink
;
guint64
_lastFrameId
;
qint64
_lastFrameTime
;
...
...
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