mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

autoconvert: Remove not thread safe use of ->current_subelement

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
This commit is contained in:
Thibault Saunier 2021-05-20 17:37:47 -04:00 committed by GStreamer Marge Bot
parent 7fae06604e
commit 1409826232
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
subprojects/gst-plugins-bad/gst/autoconvert/gstautoconvert.c
View file

@ -218,9 +218,11 @@ gst_auto_convert_dispose (GObject * object)
{ {
GstAutoConvert *autoconvert = GST_AUTO_CONVERT (object); GstAutoConvert *autoconvert = GST_AUTO_CONVERT (object);
GST_AUTOCONVERT_LOCK (autoconvert);
g_clear_object (&autoconvert->current_subelement); g_clear_object (&autoconvert->current_subelement);
g_clear_object (&autoconvert->current_internal_sinkpad); g_clear_object (&autoconvert->current_internal_sinkpad);
g_clear_object (&autoconvert->current_internal_srcpad); g_clear_object (&autoconvert->current_internal_srcpad);
GST_AUTOCONVERT_UNLOCK (autoconvert);
for (;;) { for (;;) {
GList *factories = g_atomic_pointer_get (&autoconvert->factories); GList *factories = g_atomic_pointer_get (&autoconvert->factories);
@ -716,6 +718,8 @@ gst_auto_convert_sink_setcaps (GstAutoConvert * autoconvert, GstCaps * caps)
GstCaps *other_caps = NULL; GstCaps *other_caps = NULL;
GList *factories; GList *factories;
GstCaps *current_caps; GstCaps *current_caps;
gboolean res = FALSE;
GstElement *current_subelement;
g_return_val_if_fail (autoconvert != NULL, FALSE); g_return_val_if_fail (autoconvert != NULL, FALSE);
@ -728,7 +732,8 @@ gst_auto_convert_sink_setcaps (GstAutoConvert * autoconvert, GstCaps * caps)
gst_caps_unref (current_caps); gst_caps_unref (current_caps);
} }
if (autoconvert->current_subelement) { current_subelement = gst_auto_convert_get_subelement (autoconvert);
if (current_subelement) {
if (gst_pad_peer_query_accept_caps (autoconvert->current_internal_srcpad, if (gst_pad_peer_query_accept_caps (autoconvert->current_internal_srcpad,
caps)) { caps)) {
/* If we can set the new caps on the current element, /* If we can set the new caps on the current element,
@ -788,23 +793,23 @@ gst_auto_convert_sink_setcaps (GstAutoConvert * autoconvert, GstCaps * caps)
continue; continue;
/* And make it the current child */ /* And make it the current child */
if (gst_auto_convert_activate_element (autoconvert, element, caps)) if (gst_auto_convert_activate_element (autoconvert, element, caps)) {
res = TRUE;
break; break;
else } else {
gst_object_unref (element); gst_object_unref (element);
}
} }
get_out: get_out:
if (other_caps) gst_clear_object (&current_subelement);
gst_caps_unref (other_caps); gst_clear_caps (&other_caps);
if (autoconvert->current_subelement) { if (!res)
return TRUE;
} else {
GST_WARNING_OBJECT (autoconvert, GST_WARNING_OBJECT (autoconvert,
"Could not find a matching element for caps"); "Could not find a matching element for caps: %" GST_PTR_FORMAT, caps);
return FALSE;
} return res;
} }
/* /*