gluploadelement: Avoid race condition in propose_allocation().

[platform/upstream/gstreamer.git] / ext / gl / gstgluploadelement.c

diff --git a/ext/gl/gstgluploadelement.c b/ext/gl/gstgluploadelement.c
index 7de7bba..1cda4c2 100644 (file)
--- a/ext/gl/gstgluploadelement.c
+++ b/ext/gl/gstgluploadelement.c
@@ -212,19 +212,32 @@ _gst_gl_upload_element_propose_allocation (GstBaseTransform * bt,
     GstQuery * decide_query, GstQuery * query)
 {
   GstGLUploadElement *upload = GST_GL_UPLOAD_ELEMENT (bt);
-  GstGLContext *context = GST_GL_BASE_FILTER (bt)->context;
+  GstGLUpload *ul;
+  GstGLContext *context;
   gboolean ret;
 
-  if (!upload->upload)
+  GST_OBJECT_LOCK (upload);
+  if (!upload->upload) {
+    GST_OBJECT_UNLOCK (upload);
     return FALSE;
-  if (!context)
+  }
+  ul = gst_object_ref (upload->upload);
+  GST_OBJECT_UNLOCK (upload);
+
+  context = gst_gl_base_filter_get_gl_context (GST_GL_BASE_FILTER (bt));
+  if (!context) {
+    gst_object_unref (ul);
     return FALSE;
+  }
 
-  gst_gl_upload_set_context (upload->upload, context);
+  gst_gl_upload_set_context (ul, context);
 
   ret = GST_BASE_TRANSFORM_CLASS (parent_class)->propose_allocation (bt,
       decide_query, query);
-  gst_gl_upload_propose_allocation (upload->upload, decide_query, query);
+  gst_gl_upload_propose_allocation (ul, decide_query, query);
+
+  gst_object_unref (ul);
+  gst_object_unref (context);
 
   return ret;
 }