Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
b41a6b9a
Commit
b41a6b9a
authored
May 12, 2019
by
Matej Frančeškin
Committed by
Matej Frančeškin
May 16, 2019
Browse files
Configure Video Stream: Add bit rate, frame rate and video encoding parameters
parent
9d255f45
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Camera/QGCCameraControl.cc
View file @
b41a6b9a
...
...
@@ -70,6 +70,9 @@ const char* QGCCameraControl::kCAM_SHUTTERSPD = "CAM_SHUTTERSPD";
const
char
*
QGCCameraControl
::
kCAM_APERTURE
=
"CAM_APERTURE"
;
const
char
*
QGCCameraControl
::
kCAM_WBMODE
=
"CAM_WBMODE"
;
const
char
*
QGCCameraControl
::
kCAM_MODE
=
"CAM_MODE"
;
const
char
*
QGCCameraControl
::
kCAM_BITRATE
=
"CAM_BITRATE"
;
const
char
*
QGCCameraControl
::
kCAM_FPS
=
"CAM_FPS"
;
const
char
*
QGCCameraControl
::
kCAM_ENC
=
"CAM_ENC"
;
//-----------------------------------------------------------------------------
QGCCameraOptionExclusion
::
QGCCameraOptionExclusion
(
QObject
*
parent
,
QString
param_
,
QString
value_
,
QStringList
exclusions_
)
...
...
@@ -2105,6 +2108,27 @@ QGCCameraControl::mode()
return
_paramComplete
?
getFact
(
kCAM_MODE
)
:
nullptr
;
}
//-----------------------------------------------------------------------------
Fact
*
QGCCameraControl
::
bitRate
()
{
return
_paramComplete
?
getFact
(
kCAM_BITRATE
)
:
nullptr
;
}
//-----------------------------------------------------------------------------
Fact
*
QGCCameraControl
::
frameRate
()
{
return
_paramComplete
?
getFact
(
kCAM_FPS
)
:
nullptr
;
}
//-----------------------------------------------------------------------------
Fact
*
QGCCameraControl
::
videoEncoding
()
{
return
_paramComplete
?
getFact
(
kCAM_ENC
)
:
nullptr
;
}
//-----------------------------------------------------------------------------
QGCVideoStreamInfo
::
QGCVideoStreamInfo
(
QObject
*
parent
,
const
mavlink_video_stream_information_t
*
si
)
:
QObject
(
parent
)
...
...
src/Camera/QGCCameraControl.h
View file @
b41a6b9a
...
...
@@ -167,6 +167,9 @@ public:
Q_PROPERTY
(
Fact
*
aperture
READ
aperture
NOTIFY
parametersReady
)
Q_PROPERTY
(
Fact
*
wb
READ
wb
NOTIFY
parametersReady
)
Q_PROPERTY
(
Fact
*
mode
READ
mode
NOTIFY
parametersReady
)
Q_PROPERTY
(
Fact
*
bitRate
READ
bitRate
NOTIFY
parametersReady
)
Q_PROPERTY
(
Fact
*
frameRate
READ
frameRate
NOTIFY
parametersReady
)
Q_PROPERTY
(
Fact
*
videoEncoding
READ
videoEncoding
NOTIFY
parametersReady
)
Q_PROPERTY
(
QStringList
activeSettings
READ
activeSettings
NOTIFY
activeSettingsChanged
)
Q_PROPERTY
(
VideoStatus
videoStatus
READ
videoStatus
NOTIFY
videoStatusChanged
)
...
...
@@ -252,6 +255,9 @@ public:
virtual
Fact
*
aperture
();
virtual
Fact
*
wb
();
virtual
Fact
*
mode
();
virtual
Fact
*
bitRate
();
virtual
Fact
*
frameRate
();
virtual
Fact
*
videoEncoding
();
//-- Stream names to show the user (for selection)
virtual
QStringList
streamLabels
()
{
return
_streamLabels
;
}
...
...
@@ -292,6 +298,9 @@ public:
static
const
char
*
kCAM_APERTURE
;
static
const
char
*
kCAM_WBMODE
;
static
const
char
*
kCAM_MODE
;
static
const
char
*
kCAM_BITRATE
;
static
const
char
*
kCAM_FPS
;
static
const
char
*
kCAM_ENC
;
signals:
void
infoChanged
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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