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
07820407
Commit
07820407
authored
Apr 18, 2018
by
Gus Grubba
Browse files
Revert "videonode: Do not finish if material is different"
This reverts commit
3a18878b
.
parent
bf29df41
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/VideoStreaming/gstqtvideosink/painters/videonode.cpp
View file @
07820407
...
...
@@ -52,18 +52,14 @@ void VideoNode::setMaterialTypeSolidBlack()
void
VideoNode
::
setCurrentFrame
(
GstBuffer
*
buffer
)
{
if
(
m_materialType
!=
MaterialTypeVideo
)
{
return
;
}
Q_ASSERT
(
m_materialType
==
MaterialTypeVideo
);
static_cast
<
VideoMaterial
*>
(
material
())
->
setCurrentFrame
(
buffer
);
markDirty
(
DirtyMaterial
);
}
void
VideoNode
::
updateColors
(
int
brightness
,
int
contrast
,
int
hue
,
int
saturation
)
{
if
(
m_materialType
!=
MaterialTypeVideo
)
{
return
;
}
Q_ASSERT
(
m_materialType
==
MaterialTypeVideo
);
static_cast
<
VideoMaterial
*>
(
material
())
->
updateColors
(
brightness
,
contrast
,
hue
,
saturation
);
markDirty
(
DirtyMaterial
);
}
...
...
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