mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstqmlgl: refactoring: rename ambiguous variables, clean up unused and duplicated ones

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/1032>
This commit is contained in:
Dmitry Shusharin 2021-07-30 17:21:46 +07:00 committed by GStreamer Marge Bot
parent 5dca098f6a
commit 0bb37c5135
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ext/qt/qtitem.cc
View file

@ -97,7 +97,7 @@ QtGLVideoItem::QtGLVideoItem()
GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget"); GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget");
g_once_init_leave (&_debug, 1); g_once_init_leave (&_debug, 1);
} }
this->m_openGlContextInitialized = false;
this->setFlag (QQuickItem::ItemHasContents, true); this->setFlag (QQuickItem::ItemHasContents, true);
this->priv = g_new0 (QtGLVideoItemPrivate, 1); this->priv = g_new0 (QtGLVideoItemPrivate, 1);
@ -106,6 +106,8 @@ QtGLVideoItem::QtGLVideoItem()
this->priv->par_n = DEFAULT_PAR_N; this->priv->par_n = DEFAULT_PAR_N;
this->priv->par_d = DEFAULT_PAR_D; this->priv->par_d = DEFAULT_PAR_D;
this->priv->initted = FALSE;
g_mutex_init (&this->priv->lock); g_mutex_init (&this->priv->lock);
g_weak_ref_init (&priv->sink, NULL); g_weak_ref_init (&priv->sink, NULL);
@ -196,7 +198,7 @@ QtGLVideoItem::getForceAspectRatio()
bool bool
QtGLVideoItem::itemInitialized() QtGLVideoItem::itemInitialized()
{ {
return m_openGlContextInitialized; return this->priv->initted;
} }
QSGNode * QSGNode *
@ -206,9 +208,8 @@ QtGLVideoItem::updatePaintNode(QSGNode * oldNode,
GstBuffer *old_buffer; GstBuffer *old_buffer;
gboolean was_bound = FALSE; gboolean was_bound = FALSE;
if (!m_openGlContextInitialized) { if (!this->priv->initted)
return oldNode; return oldNode;
}
QSGSimpleTextureNode *texNode = static_cast<QSGSimpleTextureNode *> (oldNode); QSGSimpleTextureNode *texNode = static_cast<QSGSimpleTextureNode *> (oldNode);
GstVideoRectangle src, dst, result; GstVideoRectangle src, dst, result;
@ -378,22 +379,23 @@ QtGLVideoItem::wheelEvent(QWheelEvent * event)
void void
QtGLVideoItem::hoverEnterEvent(QHoverEvent *) QtGLVideoItem::hoverEnterEvent(QHoverEvent *)
{ {
m_hovering = true; mouseHovering = true;
} }
void void
QtGLVideoItem::hoverLeaveEvent(QHoverEvent *) QtGLVideoItem::hoverLeaveEvent(QHoverEvent *)
{ {
m_hovering = false; mouseHovering = false;
} }
void void
QtGLVideoItem::hoverMoveEvent(QHoverEvent * event) QtGLVideoItem::hoverMoveEvent(QHoverEvent * event)
{ {
if (!m_hovering) if (!mouseHovering)
return; return;
int button = !!m_mousePressedButton; quint32 button = !!mousePressedButton;
g_mutex_lock (&this->priv->lock); g_mutex_lock (&this->priv->lock);
if (event->pos() != event->oldPos()) { if (event->pos() != event->oldPos()) {
QPointF pos = mapPointToStreamSize(event->pos()); QPointF pos = mapPointToStreamSize(event->pos());
@ -411,7 +413,8 @@ QtGLVideoItem::hoverMoveEvent(QHoverEvent * event)
void void
QtGLVideoItem::sendMouseEvent(QMouseEvent * event, const gchar * type) QtGLVideoItem::sendMouseEvent(QMouseEvent * event, const gchar * type)
{ {
int button = 0; quint32 button = 0;
switch (event->button()) { switch (event->button()) {
case Qt::LeftButton: case Qt::LeftButton:
button = 1; button = 1;
@ -422,7 +425,9 @@ QtGLVideoItem::sendMouseEvent(QMouseEvent * event, const gchar * type)
default: default:
break; break;
} }
m_mousePressedButton = button;
mousePressedButton = button;
g_mutex_lock (&this->priv->lock); g_mutex_lock (&this->priv->lock);
QPointF pos = mapPointToStreamSize(event->pos()); QPointF pos = mapPointToStreamSize(event->pos());
@ -462,7 +467,6 @@ _reset (QtGLVideoItem * qt_item)
gst_caps_replace (&qt_item->priv->caps, NULL); gst_caps_replace (&qt_item->priv->caps, NULL);
qt_item->priv->negotiated = FALSE; qt_item->priv->negotiated = FALSE;
qt_item->priv->initted = FALSE;
while ((tmp_buffer = (GstBuffer*) g_queue_pop_head (&qt_item->priv->potentially_unbound_buffers))) { while ((tmp_buffer = (GstBuffer*) g_queue_pop_head (&qt_item->priv->potentially_unbound_buffers))) {
GST_TRACE ("old buffer %p should be unbound now, unreffing", tmp_buffer); GST_TRACE ("old buffer %p should be unbound now, unreffing", tmp_buffer);
@ -528,7 +532,7 @@ QtGLVideoItem::onSceneGraphInitialized ()
return; return;
} }
m_openGlContextInitialized = gst_qt_get_gl_wrapcontext (this->priv->display, this->priv->initted = gst_qt_get_gl_wrapcontext (this->priv->display,
&this->priv->other_context, &this->priv->context); &this->priv->other_context, &this->priv->context);
GST_DEBUG ("%p created wrapped GL context %" GST_PTR_FORMAT, this, GST_DEBUG ("%p created wrapped GL context %" GST_PTR_FORMAT, this,
@ -610,6 +614,7 @@ QtGLVideoItem::handleWindowChanged(QQuickWindow *win)
connect(win, SIGNAL(sceneGraphInvalidated()), this, SLOT(onSceneGraphInvalidated()), Qt::DirectConnection); connect(win, SIGNAL(sceneGraphInvalidated()), this, SLOT(onSceneGraphInvalidated()), Qt::DirectConnection);
} else { } else {
this->priv->qt_context = NULL; this->priv->qt_context = NULL;
this->priv->initted = FALSE;
} }
} }

7
ext/qt/qtitem.h
View file

@ -113,10 +113,9 @@ private:
QPointF mapPointToStreamSize(QPointF); QPointF mapPointToStreamSize(QPointF);
void sendMouseEvent(QMouseEvent * event, const gchar * type); void sendMouseEvent(QMouseEvent * event, const gchar * type);
QSize m_viewportSize;
bool m_openGlContextInitialized; quint32 mousePressedButton;
bool m_hovering; bool mouseHovering;
uint32_t m_mousePressedButton;
QSharedPointer<QtGLVideoItemInterface> proxy; QSharedPointer<QtGLVideoItemInterface> proxy;
}; };