From 078204078403853eb03237da29ea663eb8951095 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Wed, 18 Apr 2018 21:43:54 -0400 Subject: [PATCH] Revert "videonode: Do not finish if material is different" This reverts commit 3a18878b62924dd28b5def6aff1378a8c357e47f. --- src/VideoStreaming/gstqtvideosink/painters/videonode.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/VideoStreaming/gstqtvideosink/painters/videonode.cpp b/src/VideoStreaming/gstqtvideosink/painters/videonode.cpp index 1a4cd1ab0..87b415c15 100644 --- a/src/VideoStreaming/gstqtvideosink/painters/videonode.cpp +++ b/src/VideoStreaming/gstqtvideosink/painters/videonode.cpp @@ -52,18 +52,14 @@ void VideoNode::setMaterialTypeSolidBlack() void VideoNode::setCurrentFrame(GstBuffer* buffer) { - if (m_materialType != MaterialTypeVideo) { - return; - } + Q_ASSERT (m_materialType == MaterialTypeVideo); static_cast(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(material())->updateColors(brightness, contrast, hue, saturation); markDirty(DirtyMaterial); } -- 2.22.0