summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2021-08-27 13:30:57 +1000
committerMatthew Waters <matthew@centricular.com>2021-08-27 13:34:01 +1000
commit50661c1aa953c4b1c414f4b18d682548d7cb2054 (patch)
treef25b2ca7fca7149dfb4d921b8fd5fdf08b4112b7
parent547225268874abd103a4fd4c5cd105ddac5fa530 (diff)
downloadgstreamer-plugins-good-50661c1aa953c4b1c414f4b18d682548d7cb2054.tar.gz
qmlgl: don't critical on input events before input format has been set
Accessing the unset GstVideoInfo would result in criticals Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/1065>
-rw-r--r--ext/qt/qtitem.cc14
1 files changed, 14 insertions, 0 deletions
diff --git a/ext/qt/qtitem.cc b/ext/qt/qtitem.cc
index 31deedb08..e042b2f42 100644
--- a/ext/qt/qtitem.cc
+++ b/ext/qt/qtitem.cc
@@ -353,6 +353,7 @@ QtGLVideoItem::mapPointToStreamSize(QPointF pos)
stream_y = CLAMP(stream_y, 0., stream_height);
GST_TRACE ("transform %fx%f into %fx%f", x, y, stream_x, stream_y);
+
return QPointF(stream_x, stream_y);
}
@@ -397,6 +398,13 @@ QtGLVideoItem::hoverMoveEvent(QHoverEvent * event)
quint32 button = !!mousePressedButton;
g_mutex_lock (&this->priv->lock);
+
+ /* can't do anything when we don't have input format */
+ if (!this->priv->negotiated) {
+ g_mutex_unlock (&this->priv->lock);
+ return;
+ }
+
if (event->pos() != event->oldPos()) {
QPointF pos = mapPointToStreamSize(event->pos());
GstElement *element = GST_ELEMENT_CAST (g_weak_ref_get (&this->priv->sink));
@@ -430,6 +438,12 @@ QtGLVideoItem::sendMouseEvent(QMouseEvent * event, const gchar * type)
g_mutex_lock (&this->priv->lock);
+ /* can't do anything when we don't have input format */
+ if (!this->priv->negotiated) {
+ g_mutex_unlock (&this->priv->lock);
+ return;
+ }
+
QPointF pos = mapPointToStreamSize(event->pos());
gchar* event_type = g_strconcat ("mouse-button-", type, NULL);
GstElement *element = GST_ELEMENT_CAST (g_weak_ref_get (&this->priv->sink));