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
1ece58f8
Commit
1ece58f8
authored
Mar 31, 2020
by
Andrew Voznytsa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Taisync support
parent
dc71f43f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
VideoManager.cc
src/VideoManager/VideoManager.cc
+7
-3
No files found.
src/VideoManager/VideoManager.cc
View file @
1ece58f8
...
...
@@ -607,7 +607,7 @@ VideoManager::_updateVideoUri(const QString& uri)
#if defined(QGC_GST_TAISYNC_ENABLED) && (defined(__android__) || defined(__ios__))
//-- Taisync on iOS or Android sends a raw h.264 stream
if
(
isTaisync
())
{
uri
=
QString
(
"tsusb://0.0.0.0:%1"
).
arg
(
TAISYNC_VIDEO_UDP_PORT
);
return
_updateVideoUri
(
QString
(
"tsusb://0.0.0.0:%1"
).
arg
(
TAISYNC_VIDEO_UDP_PORT
)
);
}
#endif
if
(
uri
==
_videoUri
)
{
...
...
@@ -626,8 +626,12 @@ VideoManager::_updateThermalVideoUri(const QString& uri)
//-- Taisync on iOS or Android sends a raw h.264 stream
if
(
isTaisync
())
{
// FIXME: AV: TAISYNC_VIDEO_UDP_PORT is used by video stream, thermal stream should go via its own proxy
_thermalVideoUri
=
QString
(
"tsusb://0.0.0.0:%1"
).
arg
(
TAISYNC_VIDEO_UDP_PORT
);
return
;
if
(
!
_thermalVideoUri
.
isEmpty
())
{
_thermalVideoUri
.
clear
();
return
true
;
}
else
{
return
false
;
}
}
#endif
if
(
uri
==
_thermalVideoUri
)
{
...
...
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