mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-30 07:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: fix application context querying between elements

Browse source 
Fixes error introduced by:
a4e49ba8c9
https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/642

Using the application GL context as the local GL context is not going to
work very well.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/643>
This commit is contained in:
Matthew Waters 2020-04-24 22:38:32 +10:00
parent 989bbe29d8
commit 5d47b8e232
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/gl/gstglbasemixer.c
View file

@ -295,7 +295,7 @@ gst_gl_base_mixer_sink_query (GstAggregator * agg, GstAggregatorPad * bpad,
if (mix->context) if (mix->context)
local = gst_object_ref (mix->context); local = gst_object_ref (mix->context);
if (mix->priv->other_context) if (mix->priv->other_context)
local = gst_object_ref (mix->priv->other_context); other = gst_object_ref (mix->priv->other_context);
g_rec_mutex_unlock (&mix->priv->context_lock); g_rec_mutex_unlock (&mix->priv->context_lock);
ret = gst_gl_handle_context_query ((GstElement *) mix, query, ret = gst_gl_handle_context_query ((GstElement *) mix, query,
@ -545,7 +545,7 @@ gst_gl_base_mixer_src_query (GstAggregator * agg, GstQuery * query)
if (mix->context) if (mix->context)
local = gst_object_ref (mix->context); local = gst_object_ref (mix->context);
if (mix->priv->other_context) if (mix->priv->other_context)
local = gst_object_ref (mix->priv->other_context); other = gst_object_ref (mix->priv->other_context);
g_rec_mutex_unlock (&mix->priv->context_lock); g_rec_mutex_unlock (&mix->priv->context_lock);
ret = gst_gl_handle_context_query ((GstElement *) mix, query, ret = gst_gl_handle_context_query ((GstElement *) mix, query,

4
ext/gl/gstglstereosplit.c
View file

@ -721,7 +721,7 @@ stereosplit_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
if (split->context) if (split->context)
local = gst_object_ref (split->context); local = gst_object_ref (split->context);
if (split->other_context) if (split->other_context)
local = gst_object_ref (split->other_context); other = gst_object_ref (split->other_context);
g_rec_mutex_unlock (&split->context_lock); g_rec_mutex_unlock (&split->context_lock);
ret = gst_gl_handle_context_query ((GstElement *) split, query, ret = gst_gl_handle_context_query ((GstElement *) split, query,
@ -768,7 +768,7 @@ stereosplit_sink_query (GstPad * pad, GstObject * parent, GstQuery * query)
if (split->context) if (split->context)
local = gst_object_ref (split->context); local = gst_object_ref (split->context);
if (split->other_context) if (split->other_context)
local = gst_object_ref (split->other_context); other = gst_object_ref (split->other_context);
g_rec_mutex_unlock (&split->context_lock); g_rec_mutex_unlock (&split->context_lock);
ret = gst_gl_handle_context_query ((GstElement *) split, query, ret = gst_gl_handle_context_query ((GstElement *) split, query,

2
gst-libs/gst/gl/gstglbasefilter.c
View file

@ -288,7 +288,7 @@ gst_gl_base_filter_query (GstBaseTransform * trans, GstPadDirection direction,
if (filter->context) if (filter->context)
local = gst_object_ref (filter->context); local = gst_object_ref (filter->context);
if (filter->priv->other_context) if (filter->priv->other_context)
local = gst_object_ref (filter->priv->other_context); other = gst_object_ref (filter->priv->other_context);
g_rec_mutex_unlock (&filter->priv->context_lock); g_rec_mutex_unlock (&filter->priv->context_lock);
ret = gst_gl_handle_context_query ((GstElement *) filter, query, ret = gst_gl_handle_context_query ((GstElement *) filter, query,