mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-01 03:52:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: avoid overwriting display and context to NULL

Browse source 
It happens when the application provides display
and/or context.
This commit is contained in:
Julien Isorce 2015-03-13 15:34:55 +00:00 committed by Tim-Philipp Müller
parent 15fd4e164a
commit a51680b1b3
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst-libs/gst/gl/gstglutils.c
View file

@ -577,8 +577,8 @@ _gst_context_query (GstElement * element,
static void static void
gst_gl_display_context_query (GstElement * element, GstGLDisplay ** display_ptr) gst_gl_display_context_query (GstElement * element, GstGLDisplay ** display_ptr)
{ {
GstContext *ctxt; GstContext *ctxt = NULL;
GstQuery *query; GstQuery *query = NULL;
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
if (!GST_CAT_CONTEXT) if (!GST_CAT_CONTEXT)
@ -588,8 +588,12 @@ gst_gl_display_context_query (GstElement * element, GstGLDisplay ** display_ptr)
query = query =
_gst_context_query (element, display_ptr, GST_GL_DISPLAY_CONTEXT_TYPE); _gst_context_query (element, display_ptr, GST_GL_DISPLAY_CONTEXT_TYPE);
gst_query_parse_context (query, &ctxt); gst_query_parse_context (query, &ctxt);
if (ctxt && gst_context_has_context_type (ctxt, GST_GL_DISPLAY_CONTEXT_TYPE))
gst_context_get_gl_display (ctxt, display_ptr); if (ctxt && gst_context_has_context_type (ctxt, GST_GL_DISPLAY_CONTEXT_TYPE)) {
GstGLDisplay *tmp_disp = NULL;
if (gst_context_get_gl_display (ctxt, &tmp_disp) && tmp_disp)
*display_ptr = tmp_disp;
}
if (*display_ptr) if (*display_ptr)
goto out; goto out;
@ -633,7 +637,10 @@ gst_gl_context_query (GstElement * element, GstGLContext ** context_ptr)
gst_query_parse_context (query, &ctxt); gst_query_parse_context (query, &ctxt);
if (ctxt && gst_context_has_context_type (ctxt, "gst.gl.app_context")) { if (ctxt && gst_context_has_context_type (ctxt, "gst.gl.app_context")) {
const GstStructure *s = gst_context_get_structure (ctxt); const GstStructure *s = gst_context_get_structure (ctxt);
gst_structure_get (s, "context", GST_GL_TYPE_CONTEXT, context_ptr, NULL); GstGLContext *tmp_ctx = NULL;
if (gst_structure_get (s, "context", GST_GL_TYPE_CONTEXT, &tmp_ctx, NULL)
&& tmp_ctx)
*context_ptr = tmp_ctx;
} }
gst_query_unref (query); gst_query_unref (query);