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

glfiter: Protect GstGLContext access

Browse source 
The propose and decide allocation vfuncs are called directly from
basetransform and need to use the locked accessor function for
retrieving a reliable reference to the GstGLContext (if available)

Fixes spurious crashes on shutdown during pad reconfiguration

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5437>
This commit is contained in:
Jan Schmidt 2023-10-05 13:49:16 +11:00 committed by GStreamer Marge Bot
parent 41f478e97d
commit 23097e35e6
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
subprojects/gst-plugins-base/gst-libs/gst/gl/gstglfilter.c
View file

@ -804,7 +804,12 @@ gst_gl_filter_propose_allocation (GstBaseTransform * trans,
GstQuery * decide_query, GstQuery * query) GstQuery * decide_query, GstQuery * query)
{ {
GstGLFilter *filter = GST_GL_FILTER (trans); GstGLFilter *filter = GST_GL_FILTER (trans);
GstGLContext *context = GST_GL_BASE_FILTER (filter)->context; GstGLContext *context =
gst_gl_base_filter_get_gl_context (GST_GL_BASE_FILTER (filter));
if (context == NULL) {
return FALSE;
}
GstCaps *caps; GstCaps *caps;
GstVideoInfo info; GstVideoInfo info;
guint size; guint size;
@ -844,22 +849,26 @@ gst_gl_filter_propose_allocation (GstBaseTransform * trans,
if (context->gl_vtable->FenceSync) if (context->gl_vtable->FenceSync)
gst_query_add_allocation_meta (query, GST_GL_SYNC_META_API_TYPE, 0); gst_query_add_allocation_meta (query, GST_GL_SYNC_META_API_TYPE, 0);
gst_object_unref (context);
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */
no_caps: no_caps:
{ {
GST_DEBUG_OBJECT (trans, "no caps specified"); GST_DEBUG_OBJECT (trans, "no caps specified");
gst_object_unref (context);
return FALSE; return FALSE;
} }
invalid_caps: invalid_caps:
{ {
GST_DEBUG_OBJECT (trans, "invalid caps specified"); GST_DEBUG_OBJECT (trans, "invalid caps specified");
gst_object_unref (context);
return FALSE; return FALSE;
} }
config_failed: config_failed:
{ {
GST_DEBUG_OBJECT (trans, "failed setting config"); GST_DEBUG_OBJECT (trans, "failed setting config");
gst_object_unref (context);
return FALSE; return FALSE;
} }
} }
@ -867,7 +876,6 @@ config_failed:
static gboolean static gboolean
gst_gl_filter_decide_allocation (GstBaseTransform * trans, GstQuery * query) gst_gl_filter_decide_allocation (GstBaseTransform * trans, GstQuery * query)
{ {
GstGLContext *context;
GstBufferPool *pool = NULL; GstBufferPool *pool = NULL;
GstStructure *config; GstStructure *config;
GstCaps *caps; GstCaps *caps;
@ -883,7 +891,11 @@ gst_gl_filter_decide_allocation (GstBaseTransform * trans, GstQuery * query)
query)) query))
return FALSE; return FALSE;
context = GST_GL_BASE_FILTER (trans)->context; GstGLContext *context =
gst_gl_base_filter_get_gl_context (GST_GL_BASE_FILTER (trans));
if (context == NULL) {
return FALSE;
}
if (gst_query_get_n_allocation_pools (query) > 0) { if (gst_query_get_n_allocation_pools (query) > 0) {
gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max); gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
@ -921,6 +933,7 @@ gst_gl_filter_decide_allocation (GstBaseTransform * trans, GstQuery * query)
gst_query_add_allocation_pool (query, pool, size, min, max); gst_query_add_allocation_pool (query, pool, size, min, max);
gst_object_unref (pool); gst_object_unref (pool);
gst_object_unref (context);
return TRUE; return TRUE;
} }