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
99070b9f
Commit
99070b9f
authored
Jun 26, 2019
by
Matej Frančeškin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added udp265 gstreamer pipeline
parent
e997db34
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
VideoReceiver.cc
src/VideoStreaming/VideoReceiver.cc
+10
-5
GeneralSettings.qml
src/ui/preferences/GeneralSettings.qml
+1
-0
No files found.
src/VideoStreaming/VideoReceiver.cc
View file @
99070b9f
...
...
@@ -200,6 +200,11 @@ VideoReceiver::start()
qCDebug
(
VideoReceiverLog
)
<<
"Already running!"
;
return
;
}
if
(
isUdp264
)
{
setVideoDecoder
(
H264_HW
);
}
else
if
(
isUdp265
)
{
setVideoDecoder
(
H265_HW
);
}
_starting
=
true
;
...
...
@@ -240,11 +245,11 @@ VideoReceiver::start()
}
g_object_set
(
static_cast
<
gpointer
>
(
dataSource
),
"uri"
,
qPrintable
(
_uri
),
"caps"
,
caps
,
nullptr
);
}
else
if
(
isUdp265
)
{
//-- TODO
if
((
caps
=
gst_caps_from_string
(
"application/x-rtp, media=(string)video, clock-rate=(int)90000, encoding-name=(string)H265"
))
==
nullptr
)
{
qCritical
()
<<
"VideoReceiver::start() failed. Error with gst_caps_from_string()"
;
break
;
}
g_object_set
(
static_cast
<
gpointer
>
(
dataSource
),
"uri"
,
qPrintable
(
_uri
.
replace
(
"udp265"
,
"udp"
)),
"caps"
,
caps
,
nullptr
);
#if defined(QGC_GST_TAISYNC_ENABLED) && (defined(__android__) || defined(__ios__))
}
else
if
(
isTaisyncUSB
)
{
QString
uri
=
QString
(
"0.0.0.0:%1"
).
arg
(
TAISYNC_VIDEO_UDP_PORT
);
...
...
src/ui/preferences/GeneralSettings.qml
View file @
99070b9f
...
...
@@ -47,6 +47,7 @@ Rectangle {
property
string
_videoSource
:
QGroundControl
.
settingsManager
.
videoSettings
.
videoSource
.
value
property
bool
_isGst
:
QGroundControl
.
videoManager
.
isGStreamer
property
bool
_isUDP264
:
_isGst
&&
_videoSource
===
QGroundControl
.
settingsManager
.
videoSettings
.
udp264VideoSource
property
bool
_isUDP265
:
_isGst
&&
_videoSource
===
QGroundControl
.
settingsManager
.
videoSettings
.
udp265VideoSource
property
bool
_isRTSP
:
_isGst
&&
_videoSource
===
QGroundControl
.
settingsManager
.
videoSettings
.
rtspVideoSource
property
bool
_isTCP
:
_isGst
&&
_videoSource
===
QGroundControl
.
settingsManager
.
videoSettings
.
tcpVideoSource
property
bool
_isMPEGTS
:
_isGst
&&
_videoSource
===
QGroundControl
.
settingsManager
.
videoSettings
.
mpegtsVideoSource
...
...
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