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
8d523f9a
Commit
8d523f9a
authored
Jan 29, 2020
by
Andrew Voznytsa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove not needed parse element for file recording
parent
07e26df1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
15 deletions
+6
-15
VideoReceiver.cc
src/VideoStreaming/VideoReceiver.cc
+6
-12
VideoReceiver.h
src/VideoStreaming/VideoReceiver.h
+0
-3
No files found.
src/VideoStreaming/VideoReceiver.cc
View file @
8d523f9a
...
@@ -911,12 +911,11 @@ VideoReceiver::startRecording(const QString &videoFile)
...
@@ -911,12 +911,11 @@ VideoReceiver::startRecording(const QString &videoFile)
_sink
=
new
Sink
();
_sink
=
new
Sink
();
_sink
->
teepad
=
gst_element_get_request_pad
(
_tee
,
"src_%u"
);
_sink
->
teepad
=
gst_element_get_request_pad
(
_tee
,
"src_%u"
);
_sink
->
queue
=
gst_element_factory_make
(
"queue"
,
nullptr
);
_sink
->
queue
=
gst_element_factory_make
(
"queue"
,
nullptr
);
_sink
->
parse
=
gst_element_factory_make
(
_parserName
,
nullptr
);
_sink
->
mux
=
gst_element_factory_make
(
kVideoMuxes
[
muxIdx
],
nullptr
);
_sink
->
mux
=
gst_element_factory_make
(
kVideoMuxes
[
muxIdx
],
nullptr
);
_sink
->
filesink
=
gst_element_factory_make
(
"filesink"
,
nullptr
);
_sink
->
filesink
=
gst_element_factory_make
(
"filesink"
,
nullptr
);
_sink
->
removing
=
false
;
_sink
->
removing
=
false
;
if
(
!
_sink
->
teepad
||
!
_sink
->
queue
||
!
_sink
->
mux
||
!
_sink
->
filesink
||
!
_sink
->
parse
)
{
if
(
!
_sink
->
teepad
||
!
_sink
->
queue
||
!
_sink
->
mux
||
!
_sink
->
filesink
)
{
qCritical
()
<<
"VideoReceiver::startRecording() failed to make _sink elements"
;
qCritical
()
<<
"VideoReceiver::startRecording() failed to make _sink elements"
;
return
;
return
;
}
}
...
@@ -937,15 +936,13 @@ VideoReceiver::startRecording(const QString &videoFile)
...
@@ -937,15 +936,13 @@ VideoReceiver::startRecording(const QString &videoFile)
qCDebug
(
VideoReceiverLog
)
<<
"New video file:"
<<
_videoFile
;
qCDebug
(
VideoReceiverLog
)
<<
"New video file:"
<<
_videoFile
;
gst_object_ref
(
_sink
->
queue
);
gst_object_ref
(
_sink
->
queue
);
gst_object_ref
(
_sink
->
parse
);
gst_object_ref
(
_sink
->
mux
);
gst_object_ref
(
_sink
->
mux
);
gst_object_ref
(
_sink
->
filesink
);
gst_object_ref
(
_sink
->
filesink
);
gst_bin_add_many
(
GST_BIN
(
_pipeline
),
_sink
->
queue
,
_sink
->
parse
,
_sink
->
mux
,
nullptr
);
gst_bin_add_many
(
GST_BIN
(
_pipeline
),
_sink
->
queue
,
_sink
->
mux
,
nullptr
);
gst_element_link_many
(
_sink
->
queue
,
_sink
->
parse
,
_sink
->
mux
,
nullptr
);
gst_element_link_many
(
_sink
->
queue
,
_sink
->
mux
,
nullptr
);
gst_element_sync_state_with_parent
(
_sink
->
queue
);
gst_element_sync_state_with_parent
(
_sink
->
queue
);
gst_element_sync_state_with_parent
(
_sink
->
parse
);
gst_element_sync_state_with_parent
(
_sink
->
mux
);
gst_element_sync_state_with_parent
(
_sink
->
mux
);
// Install a probe on the recording branch to drop buffers until we hit our first keyframe
// Install a probe on the recording branch to drop buffers until we hit our first keyframe
...
@@ -999,7 +996,6 @@ void
...
@@ -999,7 +996,6 @@ void
VideoReceiver
::
_shutdownRecordingBranch
()
VideoReceiver
::
_shutdownRecordingBranch
()
{
{
gst_bin_remove
(
GST_BIN
(
_pipelineStopRec
),
_sink
->
queue
);
gst_bin_remove
(
GST_BIN
(
_pipelineStopRec
),
_sink
->
queue
);
gst_bin_remove
(
GST_BIN
(
_pipelineStopRec
),
_sink
->
parse
);
gst_bin_remove
(
GST_BIN
(
_pipelineStopRec
),
_sink
->
mux
);
gst_bin_remove
(
GST_BIN
(
_pipelineStopRec
),
_sink
->
mux
);
gst_bin_remove
(
GST_BIN
(
_pipelineStopRec
),
_sink
->
filesink
);
gst_bin_remove
(
GST_BIN
(
_pipelineStopRec
),
_sink
->
filesink
);
...
@@ -1008,12 +1004,10 @@ VideoReceiver::_shutdownRecordingBranch()
...
@@ -1008,12 +1004,10 @@ VideoReceiver::_shutdownRecordingBranch()
_pipelineStopRec
=
nullptr
;
_pipelineStopRec
=
nullptr
;
gst_element_set_state
(
_sink
->
filesink
,
GST_STATE_NULL
);
gst_element_set_state
(
_sink
->
filesink
,
GST_STATE_NULL
);
gst_element_set_state
(
_sink
->
parse
,
GST_STATE_NULL
);
gst_element_set_state
(
_sink
->
mux
,
GST_STATE_NULL
);
gst_element_set_state
(
_sink
->
mux
,
GST_STATE_NULL
);
gst_element_set_state
(
_sink
->
queue
,
GST_STATE_NULL
);
gst_element_set_state
(
_sink
->
queue
,
GST_STATE_NULL
);
gst_object_unref
(
_sink
->
queue
);
gst_object_unref
(
_sink
->
queue
);
gst_object_unref
(
_sink
->
parse
);
gst_object_unref
(
_sink
->
mux
);
gst_object_unref
(
_sink
->
mux
);
gst_object_unref
(
_sink
->
filesink
);
gst_object_unref
(
_sink
->
filesink
);
...
@@ -1038,7 +1032,7 @@ VideoReceiver::_detachRecordingBranch(GstPadProbeInfo* info)
...
@@ -1038,7 +1032,7 @@ VideoReceiver::_detachRecordingBranch(GstPadProbeInfo* info)
Q_UNUSED
(
info
)
Q_UNUSED
(
info
)
// Also unlinks and unrefs
// Also unlinks and unrefs
gst_bin_remove_many
(
GST_BIN
(
_pipeline
),
_sink
->
queue
,
_sink
->
parse
,
_sink
->
mux
,
_sink
->
filesink
,
nullptr
);
gst_bin_remove_many
(
GST_BIN
(
_pipeline
),
_sink
->
queue
,
_sink
->
mux
,
_sink
->
filesink
,
nullptr
);
// Give tee its pad back
// Give tee its pad back
gst_element_release_request_pad
(
_tee
,
_sink
->
teepad
);
gst_element_release_request_pad
(
_tee
,
_sink
->
teepad
);
...
@@ -1048,8 +1042,8 @@ VideoReceiver::_detachRecordingBranch(GstPadProbeInfo* info)
...
@@ -1048,8 +1042,8 @@ VideoReceiver::_detachRecordingBranch(GstPadProbeInfo* info)
_pipelineStopRec
=
gst_pipeline_new
(
"pipeStopRec"
);
_pipelineStopRec
=
gst_pipeline_new
(
"pipeStopRec"
);
// Put our elements from the recording branch into the temporary pipeline
// Put our elements from the recording branch into the temporary pipeline
gst_bin_add_many
(
GST_BIN
(
_pipelineStopRec
),
_sink
->
queue
,
_sink
->
parse
,
_sink
->
mux
,
_sink
->
filesink
,
nullptr
);
gst_bin_add_many
(
GST_BIN
(
_pipelineStopRec
),
_sink
->
queue
,
_sink
->
mux
,
_sink
->
filesink
,
nullptr
);
gst_element_link_many
(
_sink
->
queue
,
_sink
->
parse
,
_sink
->
mux
,
_sink
->
filesink
,
nullptr
);
gst_element_link_many
(
_sink
->
queue
,
_sink
->
mux
,
_sink
->
filesink
,
nullptr
);
// Add handler for EOS event
// Add handler for EOS event
GstBus
*
bus
=
gst_pipeline_get_bus
(
GST_PIPELINE
(
_pipelineStopRec
));
GstBus
*
bus
=
gst_pipeline_get_bus
(
GST_PIPELINE
(
_pipelineStopRec
));
...
...
src/VideoStreaming/VideoReceiver.h
View file @
8d523f9a
...
@@ -103,7 +103,6 @@ protected:
...
@@ -103,7 +103,6 @@ protected:
GstElement
*
queue
;
GstElement
*
queue
;
GstElement
*
mux
;
GstElement
*
mux
;
GstElement
*
filesink
;
GstElement
*
filesink
;
GstElement
*
parse
;
gboolean
removing
;
gboolean
removing
;
}
Sink
;
}
Sink
;
...
@@ -153,7 +152,5 @@ protected:
...
@@ -153,7 +152,5 @@ protected:
bool
_videoRunning
;
bool
_videoRunning
;
bool
_showFullScreen
;
bool
_showFullScreen
;
VideoSettings
*
_videoSettings
;
VideoSettings
*
_videoSettings
;
const
char
*
_depayName
;
const
char
*
_parserName
;
};
};
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