glsyncmeta: make context to wait and set sync explicit

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

diff --git a/ext/gl/gstglmixer.c b/ext/gl/gstglmixer.c
index a1da5f4..51bd517 100644 (file)
--- a/ext/gl/gstglmixer.c
+++ b/ext/gl/gstglmixer.c
@@ -112,19 +112,14 @@ static gboolean
 _negotiated_caps (GstVideoAggregator * vagg, GstCaps * caps)
 {
   GstGLMixer *mix = GST_GL_MIXER (vagg);
-  GstGLMixerClass *mix_class = GST_GL_MIXER_GET_CLASS (mix);
-  GstGLBaseMixerClass *base_mix_class = GST_GL_BASE_MIXER_GET_CLASS (mix);
   gboolean ret;
 
   mix->priv->negotiated = TRUE;
-  base_mix_class->supported_gl_api = mix_class->supported_gl_api;
 
   gst_caps_replace (&mix->out_caps, caps);
 
   ret = GST_VIDEO_AGGREGATOR_CLASS (parent_class)->negotiated_caps (vagg, caps);
 
-  mix->context = GST_GL_BASE_MIXER (mix)->context;
-
   return ret;
 }
 
@@ -389,7 +384,6 @@ gst_gl_mixer_class_init (GstGLMixerClass * klass)
   g_type_class_ref (GST_TYPE_GL_MIXER_PAD);
 
   klass->set_caps = NULL;
-  klass->supported_gl_api = GST_GL_API_ANY;
 }
 
 static void
@@ -537,7 +531,6 @@ gst_gl_mixer_decide_allocation (GstGLBaseMixer * base_mix, GstQuery * query)
 
   gst_query_parse_allocation (query, &caps, NULL);
 
-  mix->context = context;
   if (mixer_class->set_caps)
     mixer_class->set_caps (mix, caps);
 
@@ -638,7 +631,7 @@ gst_gl_mixer_process_textures (GstGLMixer * mix, GstBuffer * outbuf)
 
       sync_meta = gst_buffer_get_gl_sync_meta (vaggpad->buffer);
       if (sync_meta)
-        gst_gl_sync_meta_wait (sync_meta);
+        gst_gl_sync_meta_wait (sync_meta, GST_GL_BASE_MIXER (mix)->context);
 
       if (gst_video_frame_map (&gl_frame, &gl_info, vaggpad->buffer,
               GST_MAP_READ | GST_MAP_GL)) {