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

gl/utils: also take care of the local GL context in query functions

Browse source 
Simplifies a deduplicates a lot of code in elements retrieving/setting
the local OpenGL context.
This commit is contained in:
Matthew Waters 2017-01-12 21:35:25 +11:00
parent f54fcb0349
commit cd9db288b2
2 changed files with 8 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
ext/qt/gstqtsink.cc
View file

@ -239,41 +239,9 @@ gst_qt_sink_query (GstBaseSink * bsink, GstQuery * query)
switch (GST_QUERY_TYPE (query)) { switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_CONTEXT: case GST_QUERY_CONTEXT:
{ {
const gchar *context_type; if (gst_gl_handle_context_query ((GstElement *) qt_sink, query,
GstContext *context, *old_context; qt_sink->display, qt_sink->context, qt_sink->qt_context))
gboolean ret; return TRUE;
ret = gst_gl_handle_context_query ((GstElement *) qt_sink, query,
&qt_sink->display, &qt_sink->qt_context);
if (qt_sink->display)
gst_gl_display_filter_gl_api (qt_sink->display, gst_gl_context_get_gl_api (qt_sink->qt_context));
gst_query_parse_context_type (query, &context_type);
if (g_strcmp0 (context_type, "gst.gl.local_context") == 0) {
GstStructure *s;
gst_query_parse_context (query, &old_context);
if (old_context)
context = gst_context_copy (old_context);
else
context = gst_context_new ("gst.gl.local_context", FALSE);
s = gst_context_writable_structure (context);
gst_structure_set (s, "context", GST_TYPE_GL_CONTEXT, qt_sink->context,
NULL);
gst_query_set_context (query, context);
gst_context_unref (context);
ret = qt_sink->context != NULL;
}
GST_LOG_OBJECT (qt_sink, "context query of type %s %i", context_type,
ret);
if (ret)
return ret;
/* fallthrough */ /* fallthrough */
} }

64
ext/qt/gstqtsrc.cc
View file

@ -283,10 +283,6 @@ gst_qt_src_query (GstBaseSrc * bsrc, GstQuery * query)
switch (GST_QUERY_TYPE (query)) { switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_CONTEXT: case GST_QUERY_CONTEXT:
{ {
const gchar *context_type;
GstContext *context, *old_context;
gboolean ret;
if (!qt_window_is_scenegraph_initialized (qt_src->window)) if (!qt_window_is_scenegraph_initialized (qt_src->window))
return FALSE; return FALSE;
@ -295,37 +291,9 @@ gst_qt_src_query (GstBaseSrc * bsrc, GstQuery * query)
qt_src->qt_context = qt_window_get_qt_context (qt_src->window); qt_src->qt_context = qt_window_get_qt_context (qt_src->window);
} }
ret = gst_gl_handle_context_query ((GstElement *) qt_src, query, if (gst_gl_handle_context_query ((GstElement *) qt_src, query,
&qt_src->display, &qt_src->qt_context); qt_src->display, qt_src->context, qt_src->qt_context))
return TRUE;
if (qt_src->display)
gst_gl_display_filter_gl_api (qt_src->display,
gst_gl_context_get_gl_api (qt_src->qt_context));
gst_query_parse_context_type (query, &context_type);
if (g_strcmp0 (context_type, "gst.gl.app_context") == 0) {
GstStructure *s;
gst_query_parse_context (query, &old_context);
if (old_context)
context = gst_context_copy (old_context);
else
context = gst_context_new ("gst.gl.app_context", FALSE);
s = gst_context_writable_structure (context);
gst_structure_set (s, "context", GST_TYPE_GL_CONTEXT,
qt_src->qt_context, NULL);
gst_query_set_context (query, context);
gst_context_unref (context);
ret = qt_src->qt_context != NULL;
}
GST_LOG_OBJECT (qt_src, "context query of type %s %i", context_type, ret);
if (ret)
return ret;
/* fallthrough */ /* fallthrough */
} }
@ -340,31 +308,9 @@ gst_qt_src_query (GstBaseSrc * bsrc, GstQuery * query)
static gboolean static gboolean
_find_local_gl_context (GstQtSrc * qt_src) _find_local_gl_context (GstQtSrc * qt_src)
{ {
GstQuery *query; if (gst_gl_query_local_gl_context (GST_ELEMENT (qt_src), GST_PAD_SRC,
GstContext *context; &qt_src->context))
const GstStructure *s;
if (qt_src->context)
return TRUE; return TRUE;
query = gst_query_new_context ("gst.gl.local_context");
if (!qt_src->context
&& gst_gl_run_query (GST_ELEMENT (qt_src), query, GST_PAD_SRC)) {
gst_query_parse_context (query, &context);
if (context) {
s = gst_context_get_structure (context);
gst_structure_get (s, "context", GST_TYPE_GL_CONTEXT, &qt_src->context,
NULL);
}
}
GST_DEBUG_OBJECT (qt_src, "found local context %p", qt_src->context);
gst_query_unref (query);
if (qt_src->context)
return TRUE;
return FALSE; return FALSE;
} }