Skip to content

Q
qgroundcontrol
Commit 07820407 authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Revert "videonode: Do not finish if material is different" 

This reverts commit 3a18878b.
parent bf29df41
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
src/VideoStreaming/gstqtvideosink/painters/videonode.cpp
View file @ 07820407
...@@ -52,18 +52,14 @@ void VideoNode::setMaterialTypeSolidBlack() ...@@ -52,18 +52,14 @@ void VideoNode::setMaterialTypeSolidBlack()
void VideoNode::setCurrentFrame(GstBuffer* buffer) void VideoNode::setCurrentFrame(GstBuffer* buffer)
{ {
if (m_materialType != MaterialTypeVideo) { Q_ASSERT (m_materialType == MaterialTypeVideo);
return;
}
static_cast<VideoMaterial*>(material())->setCurrentFrame(buffer); static_cast<VideoMaterial*>(material())->setCurrentFrame(buffer);
markDirty(DirtyMaterial); markDirty(DirtyMaterial);
} }
void VideoNode::updateColors(int brightness, int contrast, int hue, int saturation) void VideoNode::updateColors(int brightness, int contrast, int hue, int saturation)
{ {
if (m_materialType != MaterialTypeVideo) { Q_ASSERT (m_materialType == MaterialTypeVideo);
return;
}
static_cast<VideoMaterial*>(material())->updateColors(brightness, contrast, hue, saturation); static_cast<VideoMaterial*>(material())->updateColors(brightness, contrast, hue, saturation);
markDirty(DirtyMaterial); markDirty(DirtyMaterial);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment