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
dac81965
Commit
dac81965
authored
Nov 07, 2018
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make RTSP UDP timeout into a (protected) variable so derived classes have access to it.
parent
7db9d47d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
VideoReceiver.cc
src/VideoStreaming/VideoReceiver.cc
+2
-1
VideoReceiver.h
src/VideoStreaming/VideoReceiver.h
+3
-0
No files found.
src/VideoStreaming/VideoReceiver.cc
View file @
dac81965
...
...
@@ -64,6 +64,7 @@ VideoReceiver::VideoReceiver(QObject* parent)
,
_socket
(
nullptr
)
,
_serverPresent
(
false
)
,
_rtspTestInterval_ms
(
5000
)
,
_udpReconnect_us
(
5000000
)
#endif
,
_videoSurface
(
nullptr
)
,
_videoRunning
(
false
)
...
...
@@ -287,7 +288,7 @@ VideoReceiver::start()
QUrl
url
(
_uri
);
g_object_set
(
G_OBJECT
(
dataSource
),
"host"
,
qPrintable
(
url
.
host
()),
"port"
,
url
.
port
(),
nullptr
);
}
else
{
g_object_set
(
G_OBJECT
(
dataSource
),
"location"
,
qPrintable
(
_uri
),
"latency"
,
17
,
"udp-reconnect"
,
1
,
"timeout"
,
static_cast
<
guint64
>
(
5000000
)
,
NULL
);
g_object_set
(
G_OBJECT
(
dataSource
),
"location"
,
qPrintable
(
_uri
),
"latency"
,
17
,
"udp-reconnect"
,
1
,
"timeout"
,
_udpReconnect_us
,
NULL
);
}
// Currently, we expect H264 when using anything except for TCP. Long term we may want this to be settable
...
...
src/VideoStreaming/VideoReceiver.h
View file @
dac81965
...
...
@@ -138,6 +138,9 @@ protected:
bool
_serverPresent
;
int
_rtspTestInterval_ms
;
//-- RTSP UDP reconnect timeout
uint64_t
_udpReconnect_us
;
#endif
QString
_uri
;
...
...
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