mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

caps: When getting capsfeatures and none are there, store sysmem capsfeatures

Browse source 
... instead of returning a reference to a global instance. The caller might
want to change the global instance otherwise, which causes funny effects like
all global instances being changed and at the same time nothing in the caps
being changed.

As the caps might be immutable while we do this we have to do some magic
with atomic operations.

https://bugzilla.gnome.org/show_bug.cgi?id=723236
This commit is contained in:
Sebastian Dröge 2014-02-04 18:42:02 +01:00
parent e51e0cb0d3
commit 8d7e11e307
1 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gst/gstcaps.c
View file

@ -114,8 +114,10 @@ typedef struct _GstCapsImpl
* length check */ * length check */
#define gst_caps_get_structure_unchecked(caps, index) \ #define gst_caps_get_structure_unchecked(caps, index) \
(g_array_index (GST_CAPS_ARRAY (caps), GstCapsArrayElement, (index)).structure) (g_array_index (GST_CAPS_ARRAY (caps), GstCapsArrayElement, (index)).structure)
#define gst_caps_get_features_storage_unchecked(caps, index) \
(&g_array_index (GST_CAPS_ARRAY (caps), GstCapsArrayElement, (index)).features)
#define gst_caps_get_features_unchecked(caps, index) \ #define gst_caps_get_features_unchecked(caps, index) \
(g_array_index (GST_CAPS_ARRAY (caps), GstCapsArrayElement, (index)).features) (g_atomic_pointer_get (gst_caps_get_features_storage_unchecked (caps, index)))
/* quick way to append a structure without checking the args */ /* quick way to append a structure without checking the args */
#define gst_caps_append_structure_unchecked(caps, s, f) G_STMT_START{\ #define gst_caps_append_structure_unchecked(caps, s, f) G_STMT_START{\
GstCapsArrayElement __e={s, f}; \ GstCapsArrayElement __e={s, f}; \
@ -856,8 +858,25 @@ gst_caps_get_features (const GstCaps * caps, guint index)
g_return_val_if_fail (index < GST_CAPS_LEN (caps), NULL); g_return_val_if_fail (index < GST_CAPS_LEN (caps), NULL);
features = gst_caps_get_features_unchecked (caps, index); features = gst_caps_get_features_unchecked (caps, index);
if (!features) if (!features) {
features = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY; GstCapsFeatures **storage;
/* We have to do some atomic pointer magic here as the caps
* might not be writable and someone else calls this function
* at the very same time */
features = gst_caps_features_copy (GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY);
gst_caps_features_set_parent_refcount (features, &GST_CAPS_REFCOUNT (caps));
storage = gst_caps_get_features_storage_unchecked (caps, index);
if (!g_atomic_pointer_compare_and_exchange (storage, NULL, features)) {
/* Someone did the same we just tried in the meantime */
gst_caps_features_set_parent_refcount (features, NULL);
gst_caps_features_free (features);
features = gst_caps_get_features_unchecked (caps, index);
g_assert (features != NULL);
}
}
return features; return features;
} }
@ -881,9 +900,10 @@ gst_caps_set_features (GstCaps * caps, guint index, GstCapsFeatures * features)
g_return_if_fail (index <= gst_caps_get_size (caps)); g_return_if_fail (index <= gst_caps_get_size (caps));
g_return_if_fail (IS_WRITABLE (caps)); g_return_if_fail (IS_WRITABLE (caps));
storage = &gst_caps_get_features_unchecked (caps, index); storage = gst_caps_get_features_storage_unchecked (caps, index);
old = *storage; /* Not much problem here as caps are writable */
*storage = features; old = g_atomic_pointer_get (storage);
g_atomic_pointer_set (storage, features);
if (features) if (features)
gst_caps_features_set_parent_refcount (features, &GST_CAPS_REFCOUNT (caps)); gst_caps_features_set_parent_refcount (features, &GST_CAPS_REFCOUNT (caps));