mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

qmlgloverlay: fix usage without an qmlglsink in the pipeline

Browse source 
Without a qmlglsink, we need to retrieve the window system display
ourselves rather than relying solely on qmlglsink to have priority on
the choice of display.
This commit is contained in:
Matthew Waters 2020-03-24 12:55:27 +11:00 committed by GStreamer Merge Bot
parent 6e1758d509
commit 8be5c780bb
1 changed files with 61 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
ext/qt/gstqtoverlay.cc
View file

@ -29,6 +29,9 @@
#include "gstqtoverlay.h" #include "gstqtoverlay.h"
#include "qtglrenderer.h" #include "qtglrenderer.h"
#include "gstqtglutility.h"
#include <QtGui/QGuiApplication>
#include <gst/gl/gstglfuncs.h> #include <gst/gl/gstglfuncs.h>
@ -51,6 +54,9 @@ static GstFlowReturn gst_qt_overlay_prepare_output_buffer (GstBaseTransform * bt
static GstFlowReturn gst_qt_overlay_transform (GstBaseTransform * btrans, static GstFlowReturn gst_qt_overlay_transform (GstBaseTransform * btrans,
GstBuffer * inbuf, GstBuffer * outbuf); GstBuffer * inbuf, GstBuffer * outbuf);
static GstStateChangeReturn gst_qt_overlay_change_state (GstElement * element,
GstStateChange transition);
enum enum
{ {
PROP_0, PROP_0,
@ -80,12 +86,14 @@ gst_qt_overlay_class_init (GstQtOverlayClass * klass)
GstBaseTransformClass *btrans_class; GstBaseTransformClass *btrans_class;
GstGLBaseFilterClass *glbasefilter_class; GstGLBaseFilterClass *glbasefilter_class;
GstGLFilterClass *glfilter_class; GstGLFilterClass *glfilter_class;
GstElementClass *element_class;
gobject_class = (GObjectClass *) klass; gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass; gstelement_class = (GstElementClass *) klass;
glbasefilter_class = (GstGLBaseFilterClass *) klass; glbasefilter_class = (GstGLBaseFilterClass *) klass;
glfilter_class = (GstGLFilterClass *) klass; glfilter_class = (GstGLFilterClass *) klass;
btrans_class = (GstBaseTransformClass *) klass; btrans_class = (GstBaseTransformClass *) klass;
element_class = (GstElementClass *) klass;
gobject_class->set_property = gst_qt_overlay_set_property; gobject_class->set_property = gst_qt_overlay_set_property;
gobject_class->get_property = gst_qt_overlay_get_property; gobject_class->get_property = gst_qt_overlay_get_property;
@ -123,6 +131,8 @@ gst_qt_overlay_class_init (GstQtOverlayClass * klass)
glbasefilter_class->gl_start = gst_qt_overlay_gl_start; glbasefilter_class->gl_start = gst_qt_overlay_gl_start;
glbasefilter_class->gl_stop = gst_qt_overlay_gl_stop; glbasefilter_class->gl_stop = gst_qt_overlay_gl_stop;
glbasefilter_class->gl_set_caps = gst_qt_overlay_gl_set_caps; glbasefilter_class->gl_set_caps = gst_qt_overlay_gl_set_caps;
element_class->change_state = gst_qt_overlay_change_state;
} }
static void static void
@ -310,3 +320,54 @@ gst_qt_overlay_transform (GstBaseTransform * btrans, GstBuffer * inbuf,
{ {
return GST_FLOW_OK; return GST_FLOW_OK;
} }
static GstStateChangeReturn
gst_qt_overlay_change_state (GstElement * element,
GstStateChange transition)
{
GstQtOverlay *qt_overlay = GST_QT_OVERLAY (element);
GstGLBaseFilter *filter = GST_GL_BASE_FILTER (element);
GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
GST_DEBUG_OBJECT (filter, "changing state: %s => %s",
gst_element_state_get_name (GST_STATE_TRANSITION_CURRENT (transition)),
gst_element_state_get_name (GST_STATE_TRANSITION_NEXT (transition)));
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY: {
QGuiApplication *app;
GstGLDisplay *display = NULL;
app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
if (!app) {
GST_ELEMENT_ERROR (element, RESOURCE, NOT_FOUND,
("%s", "Failed to connect to Qt"),
("%s", "Could not retrieve QGuiApplication instance"));
return GST_STATE_CHANGE_FAILURE;
}
display = gst_qt_get_gl_display ();
if (display != filter->display)
/* always propagate. The application may need to choose between window
* system display connections */
gst_gl_element_propagate_display_context (GST_ELEMENT (qt_overlay), display);
gst_object_unref (display);
break;
}
default:
break;
}
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
if (ret == GST_STATE_CHANGE_FAILURE)
return ret;
switch (transition) {
default:
break;
}
return ret;
}